From fde790b8cb24cd23e460d6009214123a512458a0 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 28 Feb 2012 22:45:32 -0500 Subject: [PATCH] Fixed firebird driver --- databases/firebird.php | 20 ++++++++++---------- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes tests/test_dbs/test_sqlite.db | Bin 2048 -> 2048 bytes 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/databases/firebird.php b/databases/firebird.php index 1b7af4b..aa73f01 100644 --- a/databases/firebird.php +++ b/databases/firebird.php @@ -30,7 +30,7 @@ class firebird extends DB_PDO { */ public function __construct($dbpath, $user="sysdba", $pass="masterkey") { - $this->conn = ibase_connect($dbpath, $user, $pass); + $this->conn =& ibase_connect($dbpath, $user, $pass); $class = __CLASS__."_manip"; $this->manip = new $class; @@ -73,8 +73,8 @@ class firebird extends DB_PDO { public function query($sql) { $this->count = 0; - $this->statement = ibase_query($this->conn, $sql); - return $this; + $this->statement =& ibase_query($this->conn, $sql); + return $this->statement; } // -------------------------------------------------------------------------- @@ -98,7 +98,7 @@ class firebird extends DB_PDO { break; default: - return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS); + return ibase_fetch_assoc(&$this->statement, IBASE_FETCH_BLOBS); break; } } @@ -135,8 +135,8 @@ class firebird extends DB_PDO { */ public function prepare($query) { - $this->statement = ibase_prepare($this->conn, $query); - return $this; + $this->statement =& ibase_prepare($this->conn, $query); + return $this->statement; } // -------------------------------------------------------------------------- @@ -154,7 +154,7 @@ class firebird extends DB_PDO { AND "RDB\$RELATION_NAME" NOT LIKE 'MON$%' SQL; - $this->statement = $this->query($sql); + $this->statement =& $this->query($sql); $tables = array(); @@ -181,7 +181,7 @@ SQL; OR "RDB\$RELATION_NAME" LIKE 'MON$%'; SQL; - $this->statement = $this->query($sql); + $this->statement =& $this->query($sql); $tables = array(); @@ -221,7 +221,7 @@ SQL; } //Fetch all the rows for the result - $this->result = $this->fetchAll(); + $this->result =& $this->fetchAll(); return count($this->result); } @@ -235,7 +235,7 @@ SQL; */ public function beginTransaction() { - if(($this->trans = ibase_trans($this->conn)) !== NULL) + if(($this->trans =& ibase_trans($this->conn)) !== NULL) { return TRUE; } diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index c89a7cc82598c094db40990f26b14e5b8b669ee6..1a28212c3793646935769402feabaa9f8e6a4c7a 100755 GIT binary patch delta 6359 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 diff --git a/tests/test_dbs/test_sqlite.db b/tests/test_dbs/test_sqlite.db index 92e22a778048b92bba59c44db974142e46115c42..446fc0724e726e3af8e59dd9b334a92b393b50b8 100755 GIT binary patch delta 33 icmZn=Xb_knEx3Szfq@B%8G&@bL>*(s1sf9G{RSHV delta 33 hcmZn=Xb_knEf~PSz`z8>j6hmrqK+|Rz{Z3H>;O@{1ycY3