From 69563972e58c02d676dc91b8a3f5447927c3b1c5 Mon Sep 17 00:00:00 2001 From: Geoff Munn Date: Thu, 17 Sep 2009 00:18:43 +0000 Subject: [PATCH] MINOR FIX: columns quoted properly git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86528 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/TableListField.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/forms/TableListField.php b/forms/TableListField.php index 6b97c9124..5b543187c 100755 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -460,9 +460,9 @@ JS if($this->customQuery) { $query = clone $this->customQuery; $baseClass = ClassInfo::baseDataClass($this->sourceClass); - $query->select[] = "{$baseClass}.ID AS \"ID\""; - $query->select[] = "{$baseClass}.ClassName AS \"ClassName\""; - $query->select[] = "{$baseClass}.ClassName AS \"RecordClassName\""; + $query->select[] = "\"{$baseClass}\".\"ID\" AS \"ID\""; + $query->select[] = "\"{$baseClass}\".\"ClassName\" AS \"ClassName\""; + $query->select[] = "\"{$baseClass}\".\"ClassName\" AS \"RecordClassName\""; } else { $query = singleton($this->sourceClass)->extendedSQL($this->sourceFilter(), $this->sourceSort, null, $this->sourceJoin); } @@ -483,14 +483,14 @@ JS $baseClass = ClassInfo::baseDataClass($this->sourceClass); if($this->customCsvQuery) { $query = $this->customCsvQuery; - $query->select[] = "{$baseClass}.ID AS ID"; - $query->select[] = "{$baseClass}.ClassName AS ClassName"; - $query->select[] = "{$baseClass}.ClassName AS \"RecordClassName\""; + $query->select[] = "\"{$baseClass}\".\"ID\" AS \"ID\""; + $query->select[] = "\"{$baseClass}\".\"ClassName\" AS \"ClassName\""; + $query->select[] = "\"{$baseClass}\".\"ClassName\" AS \"RecordClassName\""; } else if($this->customQuery) { $query = $this->customQuery; - $query->select[] = "{$baseClass}.ID AS ID"; - $query->select[] = "{$baseClass}.ClassName AS ClassName"; - $query->select[] = "{$baseClass}.ClassName AS \"RecordClassName\""; + $query->select[] = "\"{$baseClass}\".\"ID\" AS \"ID\""; + $query->select[] = "\"{$baseClass}\".\"ClassName\" AS \"ClassName\""; + $query->select[] = "\"{$baseClass}\".\"ClassName\" AS \"RecordClassName\""; } else { $query = singleton($this->sourceClass)->extendedSQL($this->sourceFilter(), $this->sourceSort, null, $this->sourceJoin); }