From 338bb01f1a5e713cef434fa6a8a4a45295770238 Mon Sep 17 00:00:00 2001 From: Geoff Munn Date: Wed, 18 Feb 2009 03:12:39 +0000 Subject: [PATCH] API CHANGE: Column names escaped git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71983 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/Versioned.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/model/Versioned.php b/core/model/Versioned.php index 8e05d98d9..d7a2cc990 100755 --- a/core/model/Versioned.php +++ b/core/model/Versioned.php @@ -194,7 +194,6 @@ class Versioned extends DataObjectDecorator { // Version fields on each root table (including Stage) if(isset($rootTable)) { $stageTable = ($stage == $this->defaultStage) ? $table : "{$table}_$stage"; - //DB::requireField($stageTable, "Version", "int(11) not null default '0'"); $parts=Array('datatype'=>'int', 'precision'=>11, 'null'=>'not null', 'default'=>(int)0); $values=Array('type'=>'int', 'parts'=>$parts); DB::requireField($stageTable, 'Version', $values); @@ -605,7 +604,7 @@ class Versioned extends DataObjectDecorator { } // get version as performance-optimized SQL query (gets called for each page in the sitetree) - $version = DB::query("SELECT Version FROM `$stageTable` WHERE ID = $id")->value(); + $version = DB::query("SELECT \"Version\" FROM \"$stageTable\" WHERE \"ID\" = $id")->value(); // cache value (if required) if($cache) { @@ -626,13 +625,13 @@ class Versioned extends DataObjectDecorator { if($idList) { // Validate the ID list foreach($idList as $id) if(!is_numeric($id)) user_error("Bad ID passed to Versioned::prepopulate_versionnumber_cache() in \$idList: " . $id, E_USER_ERROR); - $filter = "WHERE ID IN(" .implode(", ", $idList) . ")"; + $filter = "WHERE \"ID\" IN(" .implode(", ", $idList) . ")"; } $baseClass = ClassInfo::baseDataClass($class); $stageTable = ($stage == 'Stage') ? $baseClass : "{$baseClass}_{$stage}"; - $versions = DB::query("SELECT ID, Version FROM `$stageTable` $filter")->map(); + $versions = DB::query("SELECT \"ID\", \"Version\" FROM \"$stageTable\" $filter")->map(); foreach($versions as $id => $version) { self::$cache_versionnumber[$baseClass][$stage][$id] = $version; }