stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 06:46:05 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the modified with a local fix for Kohana ticket #2298

Browse Source
This commit is contained in:
Tim Almdal
2009-11-01 09:32:42 -08:00
parent 488b67014b
commit 808fd4d3a0
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/tests/Database_Test.php
+17 -5
View File
@@ -99,7 +99,7 @@ class Database_Test extends Unit_Test_Case {
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} " .
@@ -116,12 +116,16 @@ class Database_Test extends Unit_Test_Case {
$this->assert_same($expected, $sql);
}
public function setup() {
}
function prefix_no_replacement_test() {
$update = Database_For_Test::instance()->from("test_tables")
->where("1 = 1")
->set(array("name" => "Test Name"))
->update();
public function teardown() {
}
$expected = "UPDATE `g3test_test_tables` SET `name` = 'Test Name' WHERE 1 = 1";
$this->assert_same($expected, $update);
}
}
class Database_For_Test extends Database {
@@ -131,4 +135,12 @@ class Database_For_Test extends Database {
$db->config["table_prefix"] = "g3test_";
return $db;
}
public function query($sql = '') {
if (!empty($sql)) {
print " query($sql)\n";
$sql = $this->add_table_prefixes($sql);
}
return $sql;
}
}