Merge pull request #197 from kendru/issue176

Correct issue #176: Ensure database setup before building select

2 files changed, 9 insertions, 2 deletions

diff --git a/idiorm.php b/idiorm.php
index ed22d8b..ae97e01 100644
--- a/idiorm.php
+++ b/idiorm.php
@@ -233,6 +233,7 @@
          * @return ORM
          */
         public static function for_table($table_name, $connection_name = self::DEFAULT_CONNECTION) {
+            self::_setup_db($connection_name);
             return new self($table_name, array(), $connection_name);
         }
 
diff --git a/test/QueryBuilderTest.php b/test/QueryBuilderTest.php
index 3a4a997..3f71bb3 100644
--- a/test/QueryBuilderTest.php
+++ b/test/QueryBuilderTest.php
@@ -631,8 +631,14 @@ class QueryBuilderTest extends PHPUnit_Framework_TestCase {
     }
 
     public function testIssue176LimitDoesntWorkFirstTime() {
-        $rs = ORM::for_table('position')->limit(1)->find_array();
-        $expected = "SELECT * FROM `position` LIMIT 1";
+        ORM::reset_config();
+        ORM::reset_db();
+
+        ORM::configure('logging', true);
+        ORM::configure('connection_string', 'sqlite::memory:');
+
+        ORM::for_table('sqlite_master')->limit(1)->find_array();
+        $expected = "SELECT * FROM `sqlite_master` LIMIT 1";
         $this->assertEquals($expected, ORM::get_last_query());
     }
 }