From 4c0afd2564ceb4e768dcf1b8156f1c075934796c Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 19 Oct 2010 03:03:19 +0000 Subject: [PATCH] BUGFIX Fixed double quotes around column names in Versioned::augmentDatabase() (from r110914) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112867 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/Versioned.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/model/Versioned.php b/core/model/Versioned.php index a50ea6af2..d96a5fb5c 100755 --- a/core/model/Versioned.php +++ b/core/model/Versioned.php @@ -319,20 +319,20 @@ class Versioned extends DataObjectDecorator { $count = DB::query(" SELECT COUNT(*) FROM \"{$table}_versions\" LEFT JOIN \"{$child}_versions\" - ON \"{$child}_versions\".RecordID = \"{$table}_versions\".RecordID - AND \"{$child}_versions\".Version = \"{$table}_versions\".Version - WHERE \"{$child}_versions\".ID IS NULL + ON \"{$child}_versions\".\"RecordID\" = \"{$table}_versions\".\"RecordID\" + AND \"{$child}_versions\".\"Version\" = \"{$table}_versions\".\"Version\" + WHERE \"{$child}_versions\".\"ID\" IS NULL ")->value(); if($count > 0) { DB::alteration_message("Removing orphaned versioned records", "deleted"); $effectedIDs = DB::query(" - SELECT \"{$table}_versions\".ID FROM \"{$table}_versions\" + SELECT \"{$table}_versions\".\"ID\" FROM \"{$table}_versions\" LEFT JOIN \"{$child}_versions\" - ON \"{$child}_versions\".RecordID = \"{$table}_versions\".RecordID - AND \"{$child}_versions\".Version = \"{$table}_versions\".Version - WHERE \"{$child}_versions\".ID IS NULL + ON \"{$child}_versions\".\"RecordID\" = \"{$table}_versions\".\"RecordID\" + AND \"{$child}_versions\".\"Version\" = \"{$table}_versions\".\"Version\" + WHERE \"{$child}_versions\".\"ID\" IS NULL ")->column(); if(is_array($effectedIDs)) {