From c61df13fbc0db582a77ac48d096d1b4b1ab7bb2f Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Fri, 9 Mar 2012 12:52:35 -0500 Subject: [PATCH] Fix get-where tests --- sys/db/query_builder.php | 8 ++++++-- tests/databases/firebird.php | 15 +++++++++++++++ tests/databases/sqlite.php | 11 +++++++++-- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php index 5942d56..f8435f6 100644 --- a/sys/db/query_builder.php +++ b/sys/db/query_builder.php @@ -137,6 +137,8 @@ class Query_Builder { // Quote the identifiers $safe_array = array_map(array($this->db, 'quote_ident'), $fields_array); + + unset($fields_array); // Join the strings back together for($i = 0, $c = count($safe_array); $i < $c; $i++) @@ -149,7 +151,7 @@ class Query_Builder { $this->select_string = implode(', ', $safe_array); - //echo $this->select_string."
"; + unset($safe_array); return $this; } @@ -207,8 +209,10 @@ class Query_Builder { // Create the where portion of the string $this->where_string = ' WHERE '.implode(', ', $kv_array); + + unset($kv_array); + unset($fields); - // @todo Implement where method return $this; } diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php index e96b275..1fcfe4f 100644 --- a/tests/databases/firebird.php +++ b/tests/databases/firebird.php @@ -154,6 +154,21 @@ class FirebirdTest extends UnitTestCase { $this->assertTrue(is_resource($query)); } + function TestQBSelectWhereGet() + { + $query = $this->qb->select('id, key as k, val')->where('id >', 1)->get('create_test', 2, 1); + + $this->assertTrue(is_resource($query)); + } + + function TestQBSelectWhereGet2() + { + $query = $this->qb->select('id, key as k, val')->where(' id ', 1)->get('create_test', 2, 1); + + $this->assertTrue(is_resource($query)); + } + + function TestQBSelectGet() { $query = $this->qb->select('id, key as k, val')->get('create_test', 2, 1); diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite.php index 5274e29..b82c0d4 100644 --- a/tests/databases/sqlite.php +++ b/tests/databases/sqlite.php @@ -154,7 +154,14 @@ SQL; function TestQBSelectWhereGet() { - $query = $this->qb->select('id, key as k, val')->where('id >', 1)->get('create_test, 2, 1'); + $query = $this->qb->select('id, key as k, val')->where('id >', 1)->get('create_test', 2, 1); + + $this->assertIsA($query, 'PDOStatement'); + } + + function TestQBSelectWhereGet2() + { + $query = $this->qb->select('id, key as k, val')->where('id', 1)->get('create_test', 2, 1); $this->assertIsA($query, 'PDOStatement'); } @@ -179,7 +186,7 @@ SQL; //Check $dbs = $this->db->get_tables(); - $this->assertTrue(empty($dbs['create_test'])); + $this->assertFalse(in_array('create_test', $dbs)); } } \ No newline at end of file diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index 7dcb545a1e43af859a8cd1e4faee5f7765c23c5a..9499e067cc0ed163b170b89eea29bcc9384d91b3 100755 GIT binary patch delta 10941 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

Y6xIMF{Q=cpoJxh#MaVjf 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