From 7859c6ff2dd7fb23e2ba03a53f738e8967a90523 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Mon, 5 Mar 2012 13:02:39 -0500 Subject: [PATCH] Fix tests broken by bad reference placement --- sys/common/db_pdo.php | 2 +- sys/databases/firebird.php | 20 ++++++++++---------- tests/databases/sqlite.php | 2 +- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/common/db_pdo.php b/sys/common/db_pdo.php index 0bcb850..a28f178 100644 --- a/sys/common/db_pdo.php +++ b/sys/common/db_pdo.php @@ -89,7 +89,7 @@ abstract class DB_PDO extends PDO { */ public function prepare_execute($sql, $params) { - $this->statement =& $this->prepare_query($sql, $params); + $this->statement = $this->prepare_query($sql, $params); $this->statement->execute(); return $this->statement; diff --git a/sys/databases/firebird.php b/sys/databases/firebird.php index e8eed63..0aa4db2 100644 --- a/sys/databases/firebird.php +++ b/sys/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, 'utf-8'); + $this->conn = ibase_connect($dbpath, $user, $pass, 'utf-8'); $class = __CLASS__."_sql"; $this->sql = new $class; @@ -73,7 +73,7 @@ class firebird extends DB_PDO { public function query($sql) { $this->count = 0; - $this->statement =& ibase_query($this->conn, $sql); + $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; } } @@ -133,9 +133,9 @@ class firebird extends DB_PDO { * @param string $query * @return $this */ - public function prepare($query) + public function prepare($query, $options=NULL) { - $this->statement =& ibase_prepare($this->conn, $query); + $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(); @@ -200,7 +200,7 @@ SQL; * * @return int */ - public function affected_rows() + public function affected_rows($statement="") { return ibase_affected_rows($this->conn); } @@ -221,7 +221,7 @@ SQL; } //Fetch all the rows for the result - $this->result =& $this->fetchAll(); + $this->result = $this->fetchAll(); return count($this->result); } @@ -312,7 +312,7 @@ SQL; * @param string $str * @return string */ - public function quote($str) + public function quote($str, $param_type=NULL) { if(is_numeric($str)) { diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite.php index 3e9fe89..4a8d92f 100644 --- a/tests/databases/sqlite.php +++ b/tests/databases/sqlite.php @@ -71,7 +71,7 @@ class SQLiteTest extends UnitTestCase { INSERT INTO "create_test" ("id", "key", "val") VALUES (?,?,?) SQL; - $statement =& $this->db->prepare_query($sql, array(1,"boogers", "Gross")); + $statement = $this->db->prepare_query($sql, array(1,"boogers", "Gross")); $statement->execute(); diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index 139e6fe616cd5237ea29cacd253650b48be69159..08ff3cb6c559ee2b5a7b3cacfb4f796b09e7aa09 100755 GIT binary patch delta 8355 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 RI(g5l=d|jp=jxi9{tM2K%Z~s6 delta 3866 zcmai%TWl0n7{||<&e`eCF5TJEcDMAhOGHYE*j;X=(MXY&gjm{csY)Qo60Ff6DG#9W zLAnnlgg~I%(jIELl$a<{qP>_7gmBXbj6SqPiKdAl5fexn*a9XRQ|mV~=bKrFCQh?6 z`~RQw`@a9qoY|eGQt?zO-bhJJY_Uw7P4lI4gffo#unU=nMEfTQX{{csU}AzsB=}33 zv#B|EWPayxpi7hI3>X@=L3o`_C&Ki`NL(8Wbk}Oia8!=b3nQ#~Z!SAGP3S~-$EFZF zYrGrj-}FuemD7p2%mbBKcUh`rsP*T(?%>0RBQr_yjIkj?DJNty$bX@1ah_A`py8d#F+97-K|+E(*I4BX7Mmj1iQg3( zHHJowp%p81Y}G8G6>f%(RX-K_I#EREm06*|G($VZAfRG}c8VCD5&FfL$r_<0S7_82 z8a0NVmiS9Ds|>|f%#s=g_nCvspNj3<0fU!iwn&RD%gzn%Eoxi>yB?fvFrR0JY1e_| zU^Yr@(K3rSvg7Lc-_^ypzoi!N^)f3D#g@8rE9Y-N#@x7m>@^bg?SMfecV5iA_SPby zL{E9x{+gn0YrWcg3XAHAU!PaYmU=rb+cqp~IYUohvkb=vP5+o8^z^SpZft6-|2=x% z#hen1<0Es*W`k|#QppOLP z_y~PuH-ei}Y}T3U6O7{{(`PeXh``sGakh_l2*?>g=(r6XazR`$j*kqtnf)%NS1^um zF&%{V+R%qCs7FAKkBxe4<~Ao(1$7F@@sa7YnT;;ys9+o)nWHw-XfR7m&{_;f1Y{1FKJ3g} z?}&i(M-43h8F~YL-SqHoHW@MB@^B}+#CFz3YokMng@N7yCesgKO2yh-0_*HP>{pX! z_>yE_OD%OTFIXXaG`4PieM8+gnYJk{deZ>=n-=IATY5ob%Pwkc`6Z35xT3L@`pS>l zcm8zpo>_Ds6s_E<5yHr3D7wKcn)iiS)T-CGW<$M9CDttan)sSQR_Kq_sC7(=$3Cy~ z#P#GLlXEGg>{INNdiW}vtfE_?cBH~Xh?lH|uls7KO^N@Ov@y}Jpss%1npYcIt9f;X zRp_5(*d8hmQ-554?GbyI8uc#uzw*cfv`S|Ko|%C0SPWxU_; zt5aV2S>sp!G)$Qzo(_Vbtqm?}j#BW?Z}1?)6I0$&DPF_dr@Y0LbFw~D&GH9PN~ei~ z0i2_>{s+?m>nW#WoN4OCgwgQ~%qkKcQ5U*&flJSI>3pGsJQ!40(;!b+hqQILVI6|` z>gt5?RFK^gHMT^JEm31j)Yww7S}Imcg_|uEZnlImXt~AsP0wzL8e5{qmZ-5MYHT?T zm&4j5e!E;P<<&v8*q7}-EK`g5o}gOlc1yWF>)a>qxnmKdZoXQ)-uTtePLCSXqsH{8 zF+J*h>#5*QxjN4Zj1Ql1V{<34%N2oLZZS6lXS;UbEe~9QQDb1#7#KAMMvbTY{;a1v z+jY{rT#?@8iuBp8lm4zNJ!(vk8q=f3^r$iY_^j!(T_?TE73p2BNT2Q6>0kL?qz{Q3 z5;dkrjpPUJ_~3LrJxV4z=u-^wKxgyCuh@c?$d!3EP+Y{91ZD&^xYby4I;? zs)8OULCrC1H(||4C$+9-d2T3c#3=41t9WQ!y))Dj_UPJAY9@CyqYek)t9N8ZO>jA* zYIH&`)O@c8XaV09@s+{Qp@?q@&F2>)z9^kIFcI