Page MenuHomePhabricator
Files F15428303

D11822.id.diff
No OneTemporary
Actions

D11822.id.diff
View Options

diff --git a/resources/sql/autopatches/20150219.scratch.nonmutable.sql b/resources/sql/autopatches/20150219.scratch.nonmutable.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20150219.scratch.nonmutable.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_scratchtable
+ ADD nonmutableData VARCHAR(64) COLLATE {$COLLATE_TEXT};
diff --git a/src/applications/config/option/PhabricatorSecurityConfigOptions.php b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
--- a/src/applications/config/option/PhabricatorSecurityConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
@@ -241,7 +241,7 @@
"\n\n".
'Do not enable this option if you serve (or plan to ever serve) '.
'unsecured content over plain HTTP. It is very difficult to '.
- 'undo this change once users browsers have accepted the '.
+ 'undo this change once users\' browsers have accepted the '.
'setting.')),
$this->newOption('security.allow-conduit-act-as-user', 'bool', false)
->setBoolOptions(
diff --git a/src/applications/harbormaster/storage/HarbormasterScratchTable.php b/src/applications/harbormaster/storage/HarbormasterScratchTable.php
--- a/src/applications/harbormaster/storage/HarbormasterScratchTable.php
+++ b/src/applications/harbormaster/storage/HarbormasterScratchTable.php
@@ -10,18 +10,23 @@
protected $data;
protected $bigData;
+ protected $nonmutableData;
protected function getConfiguration() {
return array(
self::CONFIG_COLUMN_SCHEMA => array(
'data' => 'text64',
'bigData' => 'text?',
+ 'nonmutableData' => 'text64?',
),
self::CONFIG_KEY_SCHEMA => array(
'data' => array(
'columns' => array('data'),
),
),
+ self::CONFIG_NO_MUTATE => array(
+ 'nonmutableData',
+ ),
) + parent::getConfiguration();
}
diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php
--- a/src/infrastructure/storage/lisk/LiskDAO.php
+++ b/src/infrastructure/storage/lisk/LiskDAO.php
@@ -172,6 +172,7 @@
const CONFIG_COLUMN_SCHEMA = 'col-schema';
const CONFIG_KEY_SCHEMA = 'key-schema';
const CONFIG_NO_TABLE = 'no-table';
+ const CONFIG_NO_MUTATE = 'no-mutate';
const SERIALIZATION_NONE = 'id';
const SERIALIZATION_JSON = 'json';
@@ -356,6 +357,13 @@
* Allows you to specify that this object does not actually have a table in
* the database.
*
+ * CONFIG_NO_MUTATE
+ * Provide a map of columns which should not be included in UPDATE statements.
+ * If you have some columns which are always written to explicitly and should
+ * never be overwritten by a save(), you can specify them here. This is an
+ * advanced, specialized feature and there are usually better approaches for
+ * most locking/contention problems.
+ *
* @return dictionary Map of configuration options to values.
*
* @task config
@@ -1084,6 +1092,15 @@
$this->willSaveObject();
$data = $this->getAllLiskPropertyValues();
+
+ // Remove colums flagged as nonmutable from the update statement.
+ $no_mutate = $this->getConfigOption(self::CONFIG_NO_MUTATE);
+ if ($no_mutate) {
+ foreach ($no_mutate as $column) {
+ unset($data[$column]);
+ }
+ }
+
$this->willWriteData($data);
$map = array();
diff --git a/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
--- a/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
+++ b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
@@ -137,4 +137,30 @@
}
}
+ public function testNonmutableColumns() {
+ $object = id(new HarbormasterScratchTable())
+ ->setData('val1')
+ ->setNonmutableData('val1')
+ ->save();
+
+ $object->reload();
+
+ $this->assertEqual('val1', $object->getData());
+ $this->assertEqual('val1', $object->getNonmutableData());
+
+ $object
+ ->setData('val2')
+ ->setNonmutableData('val2')
+ ->save();
+
+ $object->reload();
+
+ $this->assertEqual('val2', $object->getData());
+
+ // NOTE: This is the important test: the nonmutable column should not have
+ // been affected by the update.
+ $this->assertEqual('val1', $object->getNonmutableData());
+ }
+
+
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 24, 7:04 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7443584
Default Alt Text
D11822.id.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility