From a3beb2cf05aa6e5ffa3ecf3fd27a0819638a0841 Mon Sep 17 00:00:00 2001
From: Geoff Munn <geoff@silverstripe.com>
Date: Tue, 27 Oct 2009 01:44:19 +0000
Subject: [PATCH] BUGFIX: column names now double quoted

---
 code/FileSubsites.php     |  2 +-
 code/GroupSubsites.php    |  2 +-
 code/SiteTreeSubsites.php |  2 +-
 code/Subsite.php          | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/FileSubsites.php b/code/FileSubsites.php
index 2d84459..1fbe801 100755
--- a/code/FileSubsites.php
+++ b/code/FileSubsites.php
@@ -41,7 +41,7 @@ class FileSubsites extends DataObjectDecorator {
 	 */
 	function augmentSQL(SQLQuery &$query) {
 		// If you're querying by ID, ignore the sub-site - this is a bit ugly...
-		if(strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false) {
+		if(strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".\"ID\" = ") === false) {
 
 			if($context = DataObject::context_obj()) $subsiteID = (int) $context->SubsiteID;
 			else $subsiteID = (int) Subsite::currentSubsiteID();
diff --git a/code/GroupSubsites.php b/code/GroupSubsites.php
index 99f80e6..52339e0 100644
--- a/code/GroupSubsites.php
+++ b/code/GroupSubsites.php
@@ -70,7 +70,7 @@ class GroupSubsites extends DataObjectDecorator {
 		if(Subsite::$disable_subsite_filter) return;
 
 		// If you're querying by ID, ignore the sub-site - this is a bit ugly...
-		if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false)) {
+		if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".\"ID\" = ") === false)) {
 
 			if($context = DataObject::context_obj()) $subsiteID = (int) $context->SubsiteID;
 			else $subsiteID = (int) Subsite::currentSubsiteID();
diff --git a/code/SiteTreeSubsites.php b/code/SiteTreeSubsites.php
index 06237d1..0b38004 100644
--- a/code/SiteTreeSubsites.php
+++ b/code/SiteTreeSubsites.php
@@ -55,7 +55,7 @@ class SiteTreeSubsites extends DataObjectDecorator {
 		if(Subsite::$disable_subsite_filter) return;
 		
 		// If you're querying by ID, ignore the sub-site - this is a bit ugly...
-		if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false && strpos($query->where[0], "ID = ") !== 0)) {
+		if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], "\"ID\" = ") !== 0)) {
 
 			$context = DataObject::context_obj();
 			if($context && is_numeric($context->SubsiteID)) $subsiteID = (int) $context->SubsiteID;
diff --git a/code/Subsite.php b/code/Subsite.php
index 06711e9..9719432 100644
--- a/code/Subsite.php
+++ b/code/Subsite.php
@@ -353,11 +353,11 @@ JS;
 		
 		return DataObject::get(
 			'Member',
-			"`Group`.`SubsiteID` = $this->ID AND `Permission`.`Code` IN ('$SQL_permissionCodes')",
+			"\"Group\".\"SubsiteID\" = $this->ID AND \"Permission\".\"Code\" IN ('$SQL_permissionCodes')",
 			'',
-			"LEFT JOIN `Group_Members` ON `Member`.`ID` = `Group_Members`.`MemberID`
-			LEFT JOIN `Group` ON `Group`.`ID` = `Group_Members`.`GroupID`
-			LEFT JOIN `Permission` ON `Permission`.`GroupID` = `Group`.`ID`"
+			"LEFT JOIN \"Group_Members\" ON \"Member\".\"ID\" = \"Group_Members\".\"MemberID\"
+			LEFT JOIN \"Group\" ON \"Group\".\"ID\" = \"Group_Members\".\"GroupID\"
+			LEFT JOIN \"Permission\" ON \"Permission\".\"GroupID\" = \"Group\".\"ID\""
 		);
 	}
 
@@ -508,13 +508,13 @@ JS;
 
 		return DataObject::get(
 			'Subsite',
-			"`Group_Members`.`MemberID` = $member->ID
-			AND `Permission`.`Code` IN ($SQL_codes, 'ADMIN')
-			AND (Subdomain IS NOT NULL OR `Subsite`.ClassName IN ($templateClassList)) AND `Subsite`.Title != ''",
+			"\"Group_Members\".\"MemberID\" = $member->ID
+			AND \"Permission\".\"Code\" IN ($SQL_codes, 'ADMIN')
+			AND (\"Subdomain\" IS NOT NULL OR \"Subsite\".\"ClassName\" IN ($templateClassList)) AND \"Subsite\".\"Title\" != ''",
 			'',
-			"LEFT JOIN `Group` ON (`SubsiteID`=`Subsite`.`ID` OR `SubsiteID` = 0)
-			LEFT JOIN `Group_Members` ON `Group_Members`.`GroupID`=`Group`.`ID`
-			LEFT JOIN `Permission` ON `Group`.`ID`=`Permission`.`GroupID`"
+			"LEFT JOIN \"Group\" ON (\"SubsiteID\"=\"Subsite\".\"ID\" OR \"SubsiteID\" = 0)
+			LEFT JOIN \"Group_Members\" ON \"Group_Members\".\"GroupID\"=\"Group\".\"ID\"
+			LEFT JOIN \"Permission\" ON \"Group\".\"ID\"=\"Permission\".\"GroupID\""
 		);
 	}