Restructure things so that the application is now just another module.

Kohana makes this type of transition fairly straightforward in that
all controllers/helpers/etc are still located in the cascading
filesystem without any extra effort, except that I've temporarily
added a hack to force modules/gallery into the module path.

Rename what's left of "core" to be "application" so that it conforms
more closely to the Kohana standard (basically, just
application/config/config.php which is the minimal thing that you need
in the application directory)

There's still considerable work left to be done here.

1 files changed, 134 insertions, 0 deletions

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
new file mode 100644
index 00000000..bd3d2f53
--- /dev/null
+++ b/modules/gallery/tests/Database_Test.php
@@ -0,0 +1,134 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Database_Test extends Unit_Test_Case {
+  function simple_where_test() {
+    $sql = Database::instance()
+      ->where("a", 1)
+      ->where("b", 2)
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same("SELECT * WHERE `a` = 1 AND `b` = 2", $sql);
+  }
+
+  function compound_where_test() {
+    $sql = Database::instance()
+      ->where("outer1", 1)
+      ->open_paren()
+      ->where("inner1", 1)
+      ->orwhere("inner2", 2)
+      ->close_paren()
+      ->where("outer2", 2)
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same(
+      "SELECT * WHERE `outer1` = 1 AND (`inner1` = 1 OR `inner2` = 2) AND `outer2` = 2",
+      $sql);
+  }
+
+  function group_first_test() {
+    $sql = Database::instance()
+      ->open_paren()
+      ->where("inner1", 1)
+      ->orwhere("inner2", 2)
+      ->close_paren()
+      ->where("outer1", 1)
+      ->where("outer2", 2)
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same(
+      "SELECT * WHERE (`inner1` = 1 OR `inner2` = 2) AND `outer1` = 1 AND `outer2` = 2",
+      $sql);
+  }
+
+  function where_array_test() {
+    $sql = Database::instance()
+      ->where("outer1", 1)
+      ->open_paren()
+      ->where("inner1", 1)
+      ->orwhere(array("inner2" => 2, "inner3" => 3))
+      ->close_paren()
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same(
+      "SELECT * WHERE `outer1` = 1 AND (`inner1` = 1 OR `inner2` = 2 OR `inner3` = 3)",
+      $sql);
+  }
+
+  function notlike_test() {
+    $sql = Database::instance()
+      ->where("outer1", 1)
+      ->open_paren()
+      ->ornotlike("inner1", 1)
+      ->close_paren()
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same(
+      "SELECT * WHERE `outer1` = 1 OR ( `inner1` NOT LIKE '%1%')",
+      $sql);
+  }
+
+  function prefix_replacement_test() {
+    $db = Database_For_Test::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,
+                   PRIMARY KEY (`id`),
+                   UNIQUE KEY(`name`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8");
+    $expected = "CREATE TABLE IF NOT EXISTS g3test_test_tables (
+                   `id` int(9) NOT NULL auto_increment,
+                   `name` varchar(32) NOT NULL,
+                   PRIMARY KEY (`id`),
+                   UNIQUE KEY(`name`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8";
+    $this->assert_same($expected, $converted);
+   
+    $sql = "UPDATE {test_tables} SET `name` = '{test string}' " .
+        "WHERE `item_id` IN " .
+        "  (SELECT `id` FROM {items} " .
+        "  WHERE `left` >= 1 " .
+        "  AND `right` <= 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)";
+
+    $this->assert_same($expected, $sql);
+  }
+
+  public function setup() {
+  }
+
+  public function teardown() {
+  }
+
+}
+
+class Database_For_Test extends Database {
+  static function instance() {
+    $db = new Database_For_Test();
+    $db->_table_names["{items}"] = "g3test_items";
+    $db->config["table_prefix"] = "g3test_";
+    return $db;
+  }
+}