From 80b77487ebc3cbe610bea67ec0f5ec1130020a0d Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 8 Mar 2012 13:29:30 -0500 Subject: [PATCH] Various cleanup --- sys/db/drivers/firebird-ibase.php | 14 ++++++------ sys/db/query_builder.php | 36 +++++++++++------------------- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/sys/db/drivers/firebird-ibase.php b/sys/db/drivers/firebird-ibase.php index a54789b..b33cae4 100644 --- a/sys/db/drivers/firebird-ibase.php +++ b/sys/db/drivers/firebird-ibase.php @@ -83,18 +83,18 @@ class firebird extends DB_PDO { if (isset($this->trans)) { - $this->statement = ibase_query($this->trans, $sql); + $this->statement = @ibase_query($this->trans, $sql); } else { - $this->statement = ibase_query($this->conn, $sql); + $this->statement = @ibase_query($this->conn, $sql); } // Throw the error as a exception - /*if ($this->statement === FALSE) + if ($this->statement === FALSE) { throw new PDOException(ibase_errmsg()); - }*/ + } return $this->statement; } @@ -157,13 +157,13 @@ class firebird extends DB_PDO { */ public function prepare($query, $options=NULL) { - $this->statement = ibase_prepare($this->conn, $query); + $this->statement = @ibase_prepare($this->conn, $query); // Throw the error as an exception - /*if ($this->statement === FALSE) + if ($this->statement === FALSE) { throw new PDOException(ibase_errmsg()); - }*/ + } return $this->statement; } diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php index f2eac8d..f6cd0a4 100644 --- a/sys/db/query_builder.php +++ b/sys/db/query_builder.php @@ -59,28 +59,6 @@ class Query_Builder { // -------------------------------------------------------------------------- - /** - * Shortcut to directly call database methods - * - * @param string $name - * @param array $params - * @return mixed - */ - public function __call($name, $params) - { - if (method_exists($this->db, $name)) - { - if (is_callable($this->db->$name)) - { - return call_user_func_array($this->db->$name, $params); - } - } - - return NULL; - } - - // -------------------------------------------------------------------------- - /** * Select and retrieve all records from the current table, and/or * execute current compiled query @@ -93,7 +71,7 @@ class Query_Builder { public function get($table='', $limit=FALSE, $offset=FALSE) { // @todo Only add in the table name when using the select method - // @tood Only execute combined query when using other query methods and empty parameters + // @todo Only execute combined query when using other query methods and empty parameters $sql = 'SELECT * FROM ' . $this->db->quote_ident($table); @@ -172,4 +150,16 @@ class Query_Builder { // @todo Implement from method return $this; } + + // -------------------------------------------------------------------------- + + /** + * String together the sql statements for sending to the db + * + * @return $string + */ + private function _compile() + { + // @todo Implement _compile method + } } \ 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 24b583a355e0325c1d3b85c14300ff7429372cbd..f7e36f7a9317dbe2eb2c90346d85c0872db07c28 100755 GIT binary patch delta 4553 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 o*%Z^8&@>r|>3*gT#`I