From 1fd0e14359a7c7164573e4aa897c07680339e713 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 12:09:04 -0800
Subject: Convert all DB where() calls to take 3 arguments. Convert all
 open_paren() calls to and_open() or or_open() as appropriate.

---
 modules/gallery/tests/Database_Test.php | 49 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'modules/gallery/tests/Database_Test.php')

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 98bd4046..4f5a1da2 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -20,8 +20,8 @@
 class Database_Test extends Unit_Test_Case {
   function simple_where_test() {
     $sql = Database::instance()
-      ->where("a", 1)
-      ->where("b", 2)
+      ->where("a", "=", 1)
+      ->where("b", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same("SELECT * WHERE `a` = 1 AND `b` = 2", $sql);
@@ -29,12 +29,12 @@ class Database_Test extends Unit_Test_Case {
 
   function compound_where_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere("inner2", 2)
-      ->close_paren()
-      ->where("outer2", 2)
+      ->where("outer1", "=", 1)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->close()
+      ->where("outer2", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -44,12 +44,12 @@ class Database_Test extends Unit_Test_Case {
 
   function group_first_test() {
     $sql = Database::instance()
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere("inner2", 2)
-      ->close_paren()
-      ->where("outer1", 1)
-      ->where("outer2", 2)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->close()
+      ->where("outer1", "=", 1)
+      ->where("outer2", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -59,11 +59,12 @@ class Database_Test extends Unit_Test_Case {
 
   function where_array_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere(array("inner2" => 2, "inner3" => 3))
-      ->close_paren()
+      ->where("outer1", "=", 1)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->orwhere("inner3", "=", 3))
+      ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -73,10 +74,10 @@ class Database_Test extends Unit_Test_Case {
 
   function notlike_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->ornotlike("inner1", 1)
-      ->close_paren()
+      ->where("outer1", "=", 1)
+      ->or_open()
+      ->where("inner1", "NOT LIKE", 1)
+      ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -118,7 +119,7 @@ class Database_Test extends Unit_Test_Case {
 
   function prefix_no_replacement_test() {
     $update = Database_For_Test::instance()->from("test_tables")
-      ->where("1 = 1")
+      ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
       ->update();
 
-- 
cgit v1.2.3


From dee3ee81e2013f0b38e0f84123dec2ce12574bd7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 20:25:32 -0800
Subject: Database::orwhere() is now Database_Builder::or_where()

---
 modules/exif/helpers/exif.php           | 2 +-
 modules/exif/helpers/exif_task.php      | 2 +-
 modules/gallery/controllers/albums.php  | 2 +-
 modules/gallery/controllers/movies.php  | 2 +-
 modules/gallery/controllers/photos.php  | 2 +-
 modules/gallery/helpers/album.php       | 2 +-
 modules/gallery/helpers/movie.php       | 2 +-
 modules/gallery/helpers/photo.php       | 2 +-
 modules/gallery/tests/Database_Test.php | 8 ++++----
 modules/search/helpers/search.php       | 2 +-
 modules/search/helpers/search_task.php  | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'modules/gallery/tests/Database_Test.php')

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index b4241e89..a8b12a8b 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -146,7 +146,7 @@ class exif_Core {
       ->where("type", "=", "photo")
       ->and_open()
       ->where("exif_records.item_id", "=", null)
-      ->orwhere("exif_records.dirty", "=", 1)
+      ->or_where("exif_records.dirty", "=", 1)
       ->close()
       ->get()
       ->count();
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 1a449fc7..66f69790 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -47,7 +47,7 @@ class exif_task_Core {
                ->where("type", "=", "photo")
                ->and_open()
                ->where("exif_records.item_id", "=", null)
-               ->orwhere("exif_records.dirty", "=", 1)
+               ->or_where("exif_records.dirty", "=", 1)
                ->close()
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 431d98a0..32db48d4 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -130,7 +130,7 @@ class Albums_Controller extends Items_Controller {
             ->where("id", "<>", $album->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->dirname->value)
-            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
             ->get()
             ->current()) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 157c388f..e017b8c8 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -78,7 +78,7 @@ class Movies_Controller extends Items_Controller {
             ->where("id <>", $movie->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->filename->value)
-            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
             ->get()
             ->current()) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 478447b1..5431fcfe 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -78,7 +78,7 @@ class Photos_Controller extends Items_Controller {
             ->where("id", "<>", $photo->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->filename->value)
-            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
             ->get()
             ->current()) {
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index cd8777e2..0ffb0fc6 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -71,7 +71,7 @@ class album_Core {
            ->where("parent_id", "=", $parent->id)
            ->and_open()
            ->where("name", "=", $album->name)
-           ->orwhere("slug", "=", $album->slug)
+           ->or_where("slug", "=", $album->slug)
            ->close()
            ->find()->id) {
       $rand = rand();
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 82247eb0..96dafe11 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -93,7 +93,7 @@ class movie_Core {
            ->where("parent_id", "=", $parent->id)
            ->and_open()
            ->where("name", "=", $movie->name)
-           ->orwhere("slug", "=", $movie->slug)
+           ->or_where("slug", "=", $movie->slug)
            ->close()
            ->find()->id) {
       $rand = rand();
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 2a563043..cc309e28 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -92,7 +92,7 @@ class photo_Core {
            ->where("parent_id", "=", $parent->id)
            ->and_open()
            ->where("name", "=", $photo->name)
-           ->orwhere("slug", "=", $photo->slug)
+           ->or_where("slug", "=", $photo->slug)
            ->close()
            ->find()->id) {
       $rand = rand();
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 4f5a1da2..9b428379 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -32,7 +32,7 @@ class Database_Test extends Unit_Test_Case {
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
-      ->orwhere("inner2", "=", 2)
+      ->or_where("inner2", "=", 2)
       ->close()
       ->where("outer2", "=", 2)
       ->compile();
@@ -46,7 +46,7 @@ class Database_Test extends Unit_Test_Case {
     $sql = Database::instance()
       ->and_open()
       ->where("inner1", "=", 1)
-      ->orwhere("inner2", "=", 2)
+      ->or_where("inner2", "=", 2)
       ->close()
       ->where("outer1", "=", 1)
       ->where("outer2", "=", 2)
@@ -62,8 +62,8 @@ class Database_Test extends Unit_Test_Case {
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
-      ->orwhere("inner2", "=", 2)
-      ->orwhere("inner3", "=", 3))
+      ->or_where("inner2", "=", 2)
+      ->or_where("inner3", "=", 3))
       ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index c0bb1b32..1fd5175f 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -78,7 +78,7 @@ class search_Core {
       ->join("search_records", "items.id", "search_records.item_id", "left")
       ->and_open()
       ->where("search_records.item_id", "=", null)
-      ->orwhere("search_records.dirty", "=", 1)
+      ->or_where("search_records.dirty", "=", 1)
       ->close()
       ->get()
       ->count();
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 061f4084..6b35cabc 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -46,7 +46,7 @@ class search_task_Core {
       foreach (ORM::factory("item")
                ->join("search_records", "items.id", "search_records.item_id", "left")
                ->where("search_records.item_id", "=", null)
-               ->orwhere("search_records.dirty", "=", 1)
+               ->or_where("search_records.dirty", "=", 1)
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
-- 
cgit v1.2.3


From bfcd99f3f2a7d1b2c5ed0b6593c202ff07058b68 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 21 Dec 2009 11:30:34 -0800
Subject: Updated for K24

---
 modules/akismet/tests/Akismet_Helper_Test.php |  2 +-
 modules/comment/tests/Comment_Helper_Test.php |  7 ++++---
 modules/gallery/tests/Database_Test.php       | 25 +++++++++++++++----------
 modules/gallery/tests/Item_Model_Test.php     | 15 +++++++++++----
 4 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'modules/gallery/tests/Database_Test.php')

diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php
index 745b455c..d8605d5c 100644
--- a/modules/akismet/tests/Akismet_Helper_Test.php
+++ b/modules/akismet/tests/Akismet_Helper_Test.php
@@ -22,7 +22,7 @@ class Akismet_Helper_Test extends Unit_Test_Case {
 
   public function setup() {
     Input::instance()->ip_address = "1.1.1.1";
-    Kohana::$user_agent = "Akismet_Helper_Test";
+    request::set_user_agent("Akismet_Helper_Test");
 
     $root = ORM::factory("item", 1);
     $this->_comment = comment::create(
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 82b7ebd2..8e726869 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -23,7 +23,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
 
   public function setup() {
     $this->_ip_address = Input::instance()->ip_address;
-    $this->_user_agent = Kohana::$user_agent;
+    $this->_user_agent = request::user_agent();
     $this->_save = $_SERVER;
 
     $_SERVER["HTTP_ACCEPT"] = "HTTP_ACCEPT";
@@ -33,16 +33,17 @@ class Comment_Helper_Test extends Unit_Test_Case {
     $_SERVER["HTTP_CONNECTION"] = "HTTP_CONNECTION";
     $_SERVER["HTTP_HOST"] = "HTTP_HOST";
     $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
-    $_SERVER["HTTP_USER_AGENT"] = "HTTP_USER_AGENT";
     $_SERVER["QUERY_STRING"] = "QUERY_STRING";
     $_SERVER["REMOTE_ADDR"] = "REMOTE_ADDR";
     $_SERVER["REMOTE_HOST"] = "REMOTE_HOST";
     $_SERVER["REMOTE_PORT"] = "REMOTE_PORT";
+
+    request::set_user_agent("HTTP_USER_AGENT");
   }
 
   public function teardown() {
     Input::instance()->ip_address = $this->_ip_address;
-    Kohana::$user_agent = $this->_user_agent;
+    request::set_user_agent($this->_user_agent);
     $_SERVER = $this->_save;
   }
 
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 9b428379..4259961e 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -19,7 +19,7 @@
  */
 class Database_Test extends Unit_Test_Case {
   function simple_where_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("a", "=", 1)
       ->where("b", "=", 2)
       ->compile();
@@ -28,7 +28,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function compound_where_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
@@ -43,7 +43,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function group_first_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->and_open()
       ->where("inner1", "=", 1)
       ->or_where("inner2", "=", 2)
@@ -58,12 +58,12 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function where_array_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
       ->or_where("inner2", "=", 2)
-      ->or_where("inner3", "=", 3))
+      ->or_where("inner3", "=", 3)
       ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
@@ -73,7 +73,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function notlike_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("outer1", "=", 1)
       ->or_open()
       ->where("inner1", "NOT LIKE", 1)
@@ -86,7 +86,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function prefix_replacement_test() {
-    $db = Database_For_Test::instance();
+    $db = Database::instance();
     $converted = $db->add_table_prefixes("CREATE TABLE IF NOT EXISTS {test_tables} (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
@@ -118,7 +118,8 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function prefix_no_replacement_test() {
-    $update = Database_For_Test::instance()->from("test_tables")
+    $update = Database_Builder_For_Test::instance()
+      ->from("test_tables")
       ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
       ->update();
@@ -129,9 +130,9 @@ class Database_Test extends Unit_Test_Case {
   }
 }
 
-class Database_For_Test extends Database {
+class Database_Builder_For_Test extends Database_Builder {
   static function instance() {
-    $db = new Database_For_Test();
+    $db = new Database_Builder_For_Test();
     $db->_table_names["{items}"] = "g3test_items";
     $db->config["table_prefix"] = "g3test_";
     return $db;
@@ -143,4 +144,8 @@ class Database_For_Test extends Database {
     }
     return $sql;
   }
+
+  public function compile() {
+    return parent::compile();
+  }
 }
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index e7dce893..bf5fca1a 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -35,8 +35,12 @@ class Item_Model_Test extends Unit_Test_Case {
     $item = self::_create_random_item();
 
     // Force the creation date to something well known
-    $db = Database::instance();
-    $db->update("items", array("created" => 0, "updated" => 0), array("id" => $item->id));
+    db::build()
+      ->update("items")
+      ->set("created", 0)
+      ->set("updated", 0)
+      ->where("id", "=", $item->id)
+      ->execute();
     $item->reload();
     $item->title = "foo";  // force a change
     $item->save();
@@ -51,8 +55,11 @@ class Item_Model_Test extends Unit_Test_Case {
     $this->assert_same(0, $item->view_count);
 
     // Force the updated date to something well known
-    $db = Database::instance();
-    $db->update("items", array("updated" => 0), array("id" => $item->id));
+    db::build()
+      ->update("items")
+      ->set("updated", 0)
+      ->where("id", "=", $item->id)
+      ->execute();
     $item->reload();
     $item->view_count++;
     $item->save();
-- 
cgit v1.2.3


From cc4d7c672c863185bab5d654222e205d6517e98a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 21 Dec 2009 15:40:28 -0800
Subject: Update database tests for K24.  Use a mock database that we load
 through the framework so that we're properly testing the Database_Builder,
 it's a lot cleaner than what we had before.

---
 modules/gallery/tests/Database_Test.php            | 105 +++++++++++++--------
 .../libraries/MY_Database_Builder.php              |   4 +
 2 files changed, 72 insertions(+), 37 deletions(-)

(limited to 'modules/gallery/tests/Database_Test.php')

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 4259961e..6aa186e5 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -18,17 +18,27 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Database_Test extends Unit_Test_Case {
+  function setup() {
+    $config = Kohana_Config::instance();
+    $config->set("database.mock.connection.type", "mock");
+    $config->set("database.mock.cache", false);
+    $config->set("database.mock.table_prefix", "g_");
+  }
+
   function simple_where_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select("some_column")
+      ->from("some_table")
       ->where("a", "=", 1)
       ->where("b", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
-    $this->assert_same("SELECT * WHERE `a` = 1 AND `b` = 2", $sql);
+    $this->assert_same("SELECT [some_column] FROM [some_table] WHERE [a] = [1] AND [b] = [2]", $sql);
   }
 
   function compound_where_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
@@ -38,12 +48,13 @@ class Database_Test extends Unit_Test_Case {
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE `outer1` = 1 AND (`inner1` = 1 OR `inner2` = 2) AND `outer2` = 2",
+      "SELECT [*] WHERE [outer1] = [1] AND ([inner1] = [1] OR [inner2] = [2]) AND [outer2] = [2]",
       $sql);
   }
 
   function group_first_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->and_open()
       ->where("inner1", "=", 1)
       ->or_where("inner2", "=", 2)
@@ -53,12 +64,13 @@ class Database_Test extends Unit_Test_Case {
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE (`inner1` = 1 OR `inner2` = 2) AND `outer1` = 1 AND `outer2` = 2",
+      "SELECT [*] WHERE ([inner1] = [1] OR [inner2] = [2]) AND [outer1] = [1] AND [outer2] = [2]",
       $sql);
   }
 
   function where_array_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
@@ -68,32 +80,33 @@ class Database_Test extends Unit_Test_Case {
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE `outer1` = 1 AND (`inner1` = 1 OR `inner2` = 2 OR `inner3` = 3)",
+      "SELECT [*] WHERE [outer1] = [1] AND ([inner1] = [1] OR [inner2] = [2] OR [inner3] = [3])",
       $sql);
   }
 
   function notlike_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->where("outer1", "=", 1)
       ->or_open()
-      ->where("inner1", "NOT LIKE", 1)
+      ->where("inner1", "NOT LIKE", "%1%")
       ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE `outer1` = 1 OR ( `inner1` NOT LIKE '%1%')",
+      "SELECT [*] WHERE [outer1] = [1] OR ([inner1] NOT LIKE [%1%])",
       $sql);
   }
 
   function prefix_replacement_test() {
-    $db = Database::instance();
-    $converted = $db->add_table_prefixes("CREATE TABLE IF NOT EXISTS {test_tables} (
+    $db = Database::instance("mock");
+    $converted = $db->add_table_prefixes("CREATE TABLE IF NOT EXISTS {test} (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8");
-    $expected = "CREATE TABLE IF NOT EXISTS g3test_test_tables (
+    $expected = "CREATE TABLE IF NOT EXISTS g_test (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
                    PRIMARY KEY (`id`),
@@ -101,16 +114,16 @@ class Database_Test extends Unit_Test_Case {
                  ENGINE=InnoDB DEFAULT CHARSET=utf8";
     $this->assert_same($expected, $converted);
 
-    $sql = "UPDATE {test_tables} SET `name` = '{test string}' " .
+    $sql = "UPDATE {test} SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
-        "  (SELECT `id` FROM {items} " .
+        "  (SELECT `id` FROM {test} " .
         "  WHERE `left_ptr` >= 1 " .
         "  AND `right_ptr` <= 6)";
     $sql = $db->add_table_prefixes($sql);
 
-    $expected = "UPDATE g3test_test_tables SET `name` = '{test string}' " .
+    $expected = "UPDATE g_test SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
-        "  (SELECT `id` FROM g3test_items " .
+        "  (SELECT `id` FROM g_test " .
         "  WHERE `left_ptr` >= 1 " .
         "  AND `right_ptr` <= 6)";
 
@@ -118,34 +131,52 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function prefix_no_replacement_test() {
-    $update = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
       ->from("test_tables")
       ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
-      ->update();
+      ->update()
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same("UPDATE [test_tables] SET [name] = [Test Name] WHERE [1] = [1]", $sql);
+  }
+}
 
-    $expected = "UPDATE `g3test_test_tables` SET `name` = 'Test Name' WHERE 1 = 1";
+class Database_Mock extends Database {
+  public function connect() {
+  }
 
-    $this->assert_same($expected, $update);
+  public function disconnect() {
   }
-}
 
-class Database_Builder_For_Test extends Database_Builder {
-  static function instance() {
-    $db = new Database_Builder_For_Test();
-    $db->_table_names["{items}"] = "g3test_items";
-    $db->config["table_prefix"] = "g3test_";
-    return $db;
+  public function set_charset($charset) {
   }
 
-  public function query($sql = '') {
-    if (!empty($sql)) {
-      $sql = $this->add_table_prefixes($sql);
-    }
-    return $sql;
+  public function query_execute($sql) {
   }
 
-  public function compile() {
-    return parent::compile();
+  public function escape($val) {
   }
-}
+
+  public function list_constraints($table) {
+  }
+
+  public function list_fields($table) {
+  }
+
+  public function list_tables() {
+    return array("test");
+  }
+
+  public function quote_column($val) {
+    return "[$val]";
+  }
+
+  public function quote_table($val) {
+    return "[$val]";
+  }
+
+  public function quote($val) {
+    return "[$val]";
+  }
+}
\ No newline at end of file
diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index 974f9c6d..54a10860 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -28,4 +28,8 @@ class Database_Builder extends Database_Builder_Core {
     }
     return $this;
   }
+
+  public function compile() {
+    return parent::compile();
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3