From 13aa64d24dabd2c7100de38717d5db79420a67d4 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Fri, 6 Apr 2012 16:41:45 -0400 Subject: [PATCH] Minor Firebird fixes --- sys/db/drivers/firebird.php | 6 +++--- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/db/drivers/firebird.php b/sys/db/drivers/firebird.php index 00871a0..c1bb196 100644 --- a/sys/db/drivers/firebird.php +++ b/sys/db/drivers/firebird.php @@ -519,6 +519,7 @@ class Firebird_Result { // Let php do all the hard stuff in converting // the array of arguments into a list of arguments + // Then pass the resource to the constructor $this->__construct(call_user_func_array('fbird_execute', $args)); return $this; @@ -531,10 +532,9 @@ class Firebird_Result { * * @return int */ - public function rowCount($statement="") + public function rowCount() { - $statement = $statement OR $this->statement; - return fbird_affected_rows($statement); + return fbird_affected_rows(); } // -------------------------------------------------------------------------- diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index 0b007b2cef48c690f6199eaa6bc64af82179faf4..c578805548e490cb1ef66b503d29c377ce8365cb 100755 GIT binary patch delta 1667 zcmai!Pe>F|9LIm}xjN&%w1;6xIJUN{8&c-PN~D2824Z9hVL=fdDk(%k5~B`n9p(@e zM2C0i-k}a@f!zdyE>YQ`gGq&dBEr?BLxe>O{pQX4=`<+4-M2H}nYW+c?>Fx|ziigc zX5DTE2b(5qV0}oDEi%eKjyM34xyf$4NvRj@z;$4{RY41Y(QXSID#x89PT zWS-=nEb?T`lf|Aa@ucNR+modeG9Husy7Rmw5qGWo?Xs1%jrZKKy{7m?lZcJAc2M*n z2K2HxR9kggZL!K=z)nD?y$e!y68>1bVa7_r7~b!&>hJZ`sgFydif?z+xjB(iJ90uY zP{;G4l2FF)llmINYt2B~SB$L|Nc;c5`^-kv z7m-jcdC|ZvN4;G{e#}wji^5UUc~R%`2$3`qNfYt6y16K7RpW|iV87JVf;h^4Dz+eM z)Z-lDepLUPAZfypCfu@O%ZSMNq?GzFFVgIr8qbTv?$-#3G?7RX>2oNtPeEd{p~Pk) zIMRe8O}KYKV$-3-UI&T2ijYVXi8PU3tR+@|!}qDbf5AO&eCunj_YX>APz?P;{R0q^cT`=2)U->it}}a`xf}=t-m`O|faJZ4Vx5A;sC$JyaP;~CyiI#`Il{Xge90I zxFvj+@LOV&B?6Xcu|&`kn`cDGFZd(lbs!QlTbS=f_D#@AhGvrJpN_rdu9(iJSR3R+ zy$+6sTH#(O{y4iMI*k#S!YGVk42G}|40Zj{9A=Nr8S+*cd*pf@<2-A~jRlO!?`2Hz z5ksbH*eM?_VY@tA#ck#ZHMf$whXVr^1|U|X4s(zg98SS8`Lv3?a(NNsY*<$2RGFU@ zOt2xD{fbd}sfJr!@llVMn8d^+K4^=(a^Q+Z2wo0x~B*+6(Ob~bInOq^hwPAe-d9jeq!Nl;SZdBIVejN z?BMtHeQ7oKWk&5S^RB+W>SkgmI$LWHH>0zgcH?B&4XtOc+dVUEUiFxW$wW-1g4@>b z=G7j&?6&nqx2>IEV;&tb>4-^}cY~eNf}L@Lo&L)NKujiLGUeQ0&ch+=1{-mM{eF@? HTgA~|#dJ>1