From f335fa744dcc48826b7eb27ef151463a0d66a7df Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 22 Feb 2012 09:37:14 -0500 Subject: [PATCH] Fixed misnamed tests --- src/databases/firebird.php | 11 +++-------- tests/databases/firebird.php | 6 +++--- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes tests/test_dbs/test_sqlite.db | Bin 4096 -> 4096 bytes 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/databases/firebird.php b/src/databases/firebird.php index b216980..beb2125 100644 --- a/src/databases/firebird.php +++ b/src/databases/firebird.php @@ -19,7 +19,7 @@ */ class firebird extends DB_PDO { - protected $conn, $statement, $trans, $count; + protected $conn, $statement, $trans, $count, $result; private $esc_char = "''"; /** @@ -90,13 +90,6 @@ class firebird extends DB_PDO { return ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS); break; - case PDO::FETCH_BOTH: - return array_merge( - ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS), - ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS) - ); - break; - default: return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS); break; @@ -117,6 +110,8 @@ class firebird extends DB_PDO { { $all[] = $row; } + + $this->result = $all; return $all; } diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php index 1842f9a..1562fb3 100644 --- a/tests/databases/firebird.php +++ b/tests/databases/firebird.php @@ -69,13 +69,13 @@ class FirebirdTest extends UnitTestCase { $this->assertTrue($only_system); } - function TestCreateDatabase() + function TestCreateTable() { //Attempt to create the table $sql = $this->db->manip->create_table('create_test', array('id' => 'SMALLINT')); $this->db->query($sql); - //This test fails for an unknown reason, when clearly the database exists + //This test fails for an unknown reason, when clearly the table exists //Reset /*$this->tearDown(); $this->setUp(); @@ -88,7 +88,7 @@ class FirebirdTest extends UnitTestCase { $this->assertTrue($table_exists);*/ } - function TestDeleteDatabase() + function TestDeleteTable() { //Attempt to delete the table $sql = $this->db->manip->delete_table('create_test'); diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index dca512f8117e32706c5bf6f2f3760347074d19c3..bf379a66dc75a0fc4f5a29910c1e0838dcbe513f 100755 GIT binary patch delta 1328 zcmZWpZ)hV$6o0eX**}w{*)(kvy?EJztyeuUwJxD*Og(x^^=x;|fhXK?EfT~JLOfHY z;Gg}VEvV3>qGKDyE2l;+2MMt^_(e}YsGJ|FAA~~=tVpRsITJ94QYy}Fa@R|J%WvPj zH@}(p_RZU|?Lpffd<4O8+$+GYXkOdXvK)Pd<8Rj%Q1NGgqlvX!Za__f1_FO3UBhu* zsrKfpfdx(U|I#GDr(Aznu)@^?+NBgqSFt&xpwgQ!AKQmY)#9dd``mSPo6KwsMrpfnon!Vf>7|g$%fa`~|CbwTusa;nib(WnFZcpb#? ziSff5`sHhLymDdm50bfRE|SR{+LV(ySe^7spJU0>HLR)65_(^y2q zoDus@1YXHg62RSH3IeD#;nC4UH$O0T8CYhxRGu7#ElUE?-QpoQ@PB^ zT;|!_B6yd;TLiC-*t{)I2U^s;obGrBq(zXHKq`V{qq&*9%x3b+>uYGVVC|#&q^hWi zR#|W35mjHyNHA+st-ZzIva-@AMU??{3eF>5;qI z5_qnz_M;*8UR`~1f9QDY3$Ch8=%rzejNM}@NzgcckdwUKl3;Q;G9vpS&Y^Q?9RCxU zw|gHuuaObSa`IZ{=yCGma@FqMV|VSbLwoGbmffJiAW5MHwVJBXR6n|kSrJl|(LWUH z#taUc-!id%!{uwxzB^P4+gukCB!=bM0;yHJg3WGG9Cza4eWe`Rb zKfJ)TsT_o|(pRxEvK#voPK@uy&XK6^uA$5NHXwBe1Ro79kp%zjV3G9rcv3At5$MD; P8J_bk66Ra<{`Jv+L&7g& delta 1142 zcmZ8hU1$_n6h3!$@14KI-DDGYX<~K+wOJ92niy>j@h2+LNOrP;rdG+S1ogqPY15W~ zZHH14`UBZf^eQGMg4qXA*=5yhU&=zof_+GQ@TKG-A`%~h*#+N3@yzUMOb&ea+;h%1 z=bky|&REta%i45^!1e}@1dHO=El5ckJ!;N}u!Q3HnITYxMOBJMO)hV1E0E!b54=q|r8D4z;OKe37QNd~QAw z%2CD$72${Ud4xpp2swijQsFlq&eOm6OrDO4vjzGq=2Px4Z-VULG{JtrM}ADO;Z~>J zL0+3?l_V!NrrDDz(uhfT$dZqK5(LmseA9Pqps#nJ@7sY<(8oZ(3i>#R5ljBgSE456 z*a{A86xbNBtH8!#crYo8!KCuX6xm~&HQb1+in_Jb)Ae|wT2?Z)3Nx-|N60Un=G9oW z)7%f@k-OhM1Crur@@g$<~D z!GnISy?It`feAz$VIXFe7MNDbm(c-o=u0Ce5J?5^Y((Vz+D>LZM(Q=hN~b22_jdI% zyK0#oSY}t2>}g(6p|z4}ZWfhYRF7RH%#fCqNr6*CJ1Dvg?Y8gy+fEj!bB``A&gU;d z9S=5WgPE@SGI4*0c052*q9WmW?mM^BU)(PE?j^KGVI0_hBii;rcrdAD SGF@%TaM@)|lwH