From 37a0e9a710254602ab7f0f3bc29cdfb7ba6f130e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 11 Jun 2012 13:47:00 -0700
Subject: Follow-on to 3caf3cc323cd25b002aa8e44d871d4677da7a029 for #1866 -
 harden one more place and update the test.

---
 modules/gallery/libraries/MY_Database.php | 2 +-
 modules/gallery/tests/Database_Test.php   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index fb54bfcd..4fbd62fd 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -58,7 +58,7 @@ abstract class Database extends Database_Core {
       $open_brace = strpos($sql, "{") + 1;
       $close_brace = strpos($sql, "}", $open_brace);
       $name = substr($sql, $open_brace, $close_brace - $open_brace);
-      $this->_table_names["{{$name}}"] = "{$prefix}$name";
+      $this->_table_names["{{$name}}"] = "`{$prefix}$name`";
     } else if (strpos($sql, "RENAME TABLE") === 0) {
       // Renaming a table; add it to the table cache.
       // You must use the form "TO {new_table_name}" exactly for this to work.
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 55006abc..fa9e5370 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -106,7 +106,7 @@ class Database_Test extends Gallery_Unit_Test_Case {
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8");
-    $expected = "CREATE TABLE IF NOT EXISTS g_test (
+    $expected = "CREATE TABLE IF NOT EXISTS `g_test` (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
                    PRIMARY KEY (`id`),
@@ -121,9 +121,9 @@ class Database_Test extends Gallery_Unit_Test_Case {
         "  AND `right_ptr` <= 6)";
     $sql = $db->add_table_prefixes($sql);
 
-    $expected = "UPDATE g_test SET `name` = '{test string}' " .
+    $expected = "UPDATE `g_test` SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
-        "  (SELECT `id` FROM g_test " .
+        "  (SELECT `id` FROM `g_test` " .
         "  WHERE `left_ptr` >= 1 " .
         "  AND `right_ptr` <= 6)";
 
@@ -133,7 +133,7 @@ class Database_Test extends Gallery_Unit_Test_Case {
   function prefix_replacement_for_rename_table_test() {
     $db = Database::instance("mock");
     $this->assert_same(
-      "RENAME TABLE g_test TO g_new_test",
+      "RENAME TABLE `g_test` TO `g_new_test`",
       $db->add_table_prefixes("RENAME TABLE {test} TO {new_test}"));
   }
 
-- 
cgit v1.2.3