Rename columns that use reserved SQL words : items.left and items.right

4 files changed, 18 insertions, 18 deletions

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index bd3d2f53..d83212ad 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -103,15 +103,15 @@ class Database_Test extends Unit_Test_Case {
     $sql = "UPDATE {test_tables} SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
         "  (SELECT `id` FROM {items} " .
-        "  WHERE `left` >= 1 " .
-        "  AND `right` <= 6)";
+        "  WHERE `left_ptr` >= 1 " .
+        "  AND `right_ptr` <= 6)";
     $sql = $db->add_table_prefixes($sql);
 
     $expected = "UPDATE g3test_test_tables SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
         "  (SELECT `id` FROM g3test_items " .
-        "  WHERE `left` >= 1 " .
-        "  AND `right` <= 6)";
+        "  WHERE `left_ptr` >= 1 " .
+        "  AND `right_ptr` <= 6)";
 
     $this->assert_same($expected, $sql);
   }
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 27157d6e..36ced2bb 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -34,13 +34,13 @@ class Gallery_Installer_Test extends Unit_Test_Case {
   }
 
   public function install_creates_root_item_test() {
-    $max_right = ORM::factory("item")
-      ->select("MAX(`right`) AS `right`")
-      ->find()->right;
+    $max_right_ptr = ORM::factory("item")
+      ->select("MAX(`right_ptr`) AS `right_ptr`")
+      ->find()->right_ptr;
     $root = ORM::factory('item')->find(1);
     $this->assert_equal("Gallery", $root->title);
-    $this->assert_equal(1, $root->left);
-    $this->assert_equal($max_right, $root->right);
+    $this->assert_equal(1, $root->left_ptr);
+    $this->assert_equal($max_right_ptr, $root->right_ptr);
     $this->assert_equal(null, $root->parent_id);
     $this->assert_equal(1, $root->level);
   }
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 200c8a74..943810c3 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -33,8 +33,8 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album->sort_order = "ASC";
     $album->add_to_parent($root);
 
-    $this->assert_equal($album->parent()->right - 2, $album->left);
-    $this->assert_equal($album->parent()->right - 1, $album->right);
+    $this->assert_equal($album->parent()->right_ptr - 2, $album->left_ptr);
+    $this->assert_equal($album->parent()->right_ptr - 1, $album->right_ptr);
     $this->assert_equal($album->parent()->level + 1, $album->level);
     $this->assert_equal($album->parent()->id, $album->parent_id);
   }
@@ -48,10 +48,10 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1_1_2 = self::create_item_and_add_to_parent($album1_1);
 
     $album1->reload();
-    $this->assert_equal(9, $album1->right - $album1->left);
+    $this->assert_equal(9, $album1->right_ptr - $album1->left_ptr);
 
     $album1_1->reload();
-    $this->assert_equal(5, $album1_1->right - $album1_1->left);
+    $this->assert_equal(5, $album1_1->right_ptr - $album1_1->left_ptr);
   }
 
   public function delete_hierarchy_test() {
@@ -66,7 +66,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1->reload();
 
     // Now album1 contains only album1_2
-    $this->assert_equal(3, $album1->right - $album1->left);
+    $this->assert_equal(3, $album1->right_ptr - $album1->left_ptr);
   }
 
   public function move_to_test() {
@@ -85,8 +85,8 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1_1->reload();
     $album1_2->reload();
 
-    $this->assert_equal(3, $album1_1->right - $album1_1->left);
-    $this->assert_equal(3, $album1_2->right - $album1_2->left);
+    $this->assert_equal(3, $album1_1->right_ptr - $album1_1->left_ptr);
+    $this->assert_equal(3, $album1_2->right_ptr - $album1_2->left_ptr);
 
     $this->assert_equal(
       array($album1_1_2->id => "move_to_test_1_1_2"),
diff --git a/modules/gallery/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
index cc1f20da..c0641ef4 100644
--- a/modules/gallery/tests/Photo_Helper_Test.php
+++ b/modules/gallery/tests/Photo_Helper_Test.php
@@ -43,8 +43,8 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $this->assert_equal($image_info[0], $photo->width);
     $this->assert_equal($image_info[1], $photo->height);
 
-    $this->assert_equal($photo->parent()->right - 2, $photo->left);
-    $this->assert_equal($photo->parent()->right - 1, $photo->right);
+    $this->assert_equal($photo->parent()->right_ptr - 2, $photo->left_ptr);
+    $this->assert_equal($photo->parent()->right_ptr - 1, $photo->right_ptr);
   }
 
   public function create_conflicting_photo_test() {