mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-07-25 17:24:10 -04:00
Rename columns that use reserved SQL words : items.left and items.right
This commit is contained in:
@@ -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"),
|
||||
|
||||
Reference in New Issue
Block a user