summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJamie Matthews <[email protected]>2011-01-30 20:52:31 +0000
committerJamie Matthews <[email protected]>2011-01-30 20:52:31 +0000
commitc956f1c8250cfb07c29f5b14a43e2ca30747e2d6 (patch)
tree9c5af8c196321d5e8ae6cd8b9cf89b1acb82ccfa /test
parentd06ff35527d03e6d64a2184f6beb46e3d4eada03 (diff)
parentc5c67a38552b8773767157b4204fae6343afe168 (diff)
Merge branch 'develop'
* develop: Update changelog Issue #12: Fix incorrect quoting of column wildcard. Thanks pewterfish. Add MySQL-specific connection example in README Fix out-of-date comment and typo in README
Diffstat (limited to 'test')
-rw-r--r--test/test_queries.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/test_queries.php b/test/test_queries.php
index e227e27..329ebc9 100644
--- a/test/test_queries.php
+++ b/test/test_queries.php
@@ -210,6 +210,14 @@
$expected = "DELETE FROM `widget` WHERE `id` = '1'";
Tester::check_equal("Delete data", $expected);
+ // Regression tests
+
+ $widget = ORM::for_table('widget')->select('widget.*')->find_one();
+ $expected = "SELECT `widget`.* FROM `widget` LIMIT 1";
+ Tester::check_equal("Issue #12 - incorrect quoting of column wildcard", $expected);
+
+ // Tests that alter Idiorm's config are done last
+
ORM::configure('id_column', 'primary_key');
ORM::for_table('widget')->find_one(5);
$expected = "SELECT * FROM `widget` WHERE `primary_key` = '5' LIMIT 1";