tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Add a unique index to SiteTree_versions.RecordID+Version. Fix saving methods to support this. (from r106079)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112514 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-15 02:55:15 +00:00
parent ee0d4c5197
commit 03c3d59ba0
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/model/Versioned.php
View File

@ -287,7 +287,7 @@ class Versioned extends DataObjectDecorator {
$versionIndexes = array_merge( $versionIndexes = array_merge(
array( array(
'RecordID_Version' => '(RecordID, Version)', 'RecordID_Version' => 'unique (RecordID, Version)',
'RecordID' => true, 'RecordID' => true,
'Version' => true, 'Version' => true,
), ),
@ -295,6 +295,21 @@ class Versioned extends DataObjectDecorator {
); );
} }
// Fix data that lacks the uniqueness constraint (since this was added later and
// bugs meant that the constraint was validated)
if(DB::getConn()->hasTable("{$table}_versions")) {
$duplications = DB::query("SELECT MIN(\"ID\") AS \"ID\", \"RecordID\", \"Version\"
FROM \"{$table}_versions\" GROUP BY \"RecordID\", \"Version\"
HAVING COUNT(*) > 1");
foreach($duplications as $dup) {
DB::alteration_message("Removing {$table}_versions duplicate data for "
."{$dup['RecordID']}/{$dup['Version']}" ,"deleted");
DB::query("DELETE FROM \"{$table}_versions\" WHERE \"RecordID\" = {$dup['RecordID']}
AND \"Version\" = {$dup['Version']} AND \"ID\" != {$dup['ID']}");
}
}
DB::requireTable("{$table}_versions", $versionFields, $versionIndexes); DB::requireTable("{$table}_versions", $versionFields, $versionIndexes);
} else { } else {
DB::dontRequireTable("{$table}_versions"); DB::dontRequireTable("{$table}_versions");
@ -334,7 +349,6 @@ class Versioned extends DataObjectDecorator {
if($this->migratingVersion) { if($this->migratingVersion) {
$manipulation[$table]['fields']['Version'] = $this->migratingVersion; $manipulation[$table]['fields']['Version'] = $this->migratingVersion;
$this->migrateVersion(null);
} }
// If we haven't got a version #, then we're creating a new version. // If we haven't got a version #, then we're creating a new version.
@ -388,6 +402,9 @@ class Versioned extends DataObjectDecorator {
} }
} }
// Clear the migration flag
if($this->migratingVersion) $this->migrateVersion(null);
// Add the new version # back into the data object, for accessing after this write // Add the new version # back into the data object, for accessing after this write
if(isset($thisVersion)) $this->owner->Version = str_replace("'","",$thisVersion); if(isset($thisVersion)) $this->owner->Version = str_replace("'","",$thisVersion);
} }
@ -559,7 +576,6 @@ class Versioned extends DataObjectDecorator {
$query->where[] = "\"{$baseTable}_versions\".\"RecordID\" = '{$this->owner->ID}'"; $query->where[] = "\"{$baseTable}_versions\".\"RecordID\" = '{$this->owner->ID}'";
$query->orderby = ($sort) ? $sort : "\"{$baseTable}_versions\".\"LastEdited\" DESC, \"{$baseTable}_versions\".\"Version\" DESC"; $query->orderby = ($sort) ? $sort : "\"{$baseTable}_versions\".\"LastEdited\" DESC, \"{$baseTable}_versions\".\"Version\" DESC";
$records = $query->execute(); $records = $query->execute();
$versions = new DataObjectSet(); $versions = new DataObjectSet();