From 6fc5d5d9dbd670bf8ed26358536f38ed8a810464 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 6 Mar 2012 16:20:59 -0500 Subject: [PATCH] Revert "Firebird refactoring" This reverts commit 46771a7725b74316a4488b773f813c05014399ea. --- sys/common/db_pdo.php | 2 +- sys/common/query_builder.php | 9 +-------- sys/databases/firebird.php | 10 +++++----- tests/databases/firebird.php | 6 +++--- tests/index.php | 7 +------ tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/common/db_pdo.php b/sys/common/db_pdo.php index 70a69c2..011b7b3 100644 --- a/sys/common/db_pdo.php +++ b/sys/common/db_pdo.php @@ -105,7 +105,7 @@ abstract class DB_PDO extends PDO { */ public function get_query_data($statement) { - $this->statement =& $statement; + $this->statement = $statement; // Execute the query $this->statement->execute(); diff --git a/sys/common/query_builder.php b/sys/common/query_builder.php index 371199d..be95e2b 100644 --- a/sys/common/query_builder.php +++ b/sys/common/query_builder.php @@ -64,14 +64,7 @@ class Query_Builder { break; case "firebird": - if(in_array('firebird', pdo_drivers())) - { - $this->db = new $dbtype("host={$params->host};dbname={$params->file}", $params->user, $params->pass); - } - else - { - $this->db = new $dbtype("{$params->host}:{$params->file}", $params->user, $params->pass); - } + $this->db = new $dbtype("{$params->host}:{$params->file}", $params->user, $params->pass); break; } } diff --git a/sys/databases/firebird.php b/sys/databases/firebird.php index 1412df2..1461b91 100644 --- a/sys/databases/firebird.php +++ b/sys/databases/firebird.php @@ -21,7 +21,7 @@ class Firebird extends DB_PDO { */ public function __construct($dbpath, $user='sysdba', $pass='masterkey') { - parent::__construct("firebird:dbname={$dbpath}", $user, $pass); + parent::__construct("firebird:{$dbpath}", $user, $pass); $class = __CLASS__."_sql"; $this->sql = new $class; @@ -60,7 +60,7 @@ SQL; $tables = array(); - while($row = $this->statement->fetch(PDO::FETCH_ASSOC)) + while($row = $this->fetch(PDO::FETCH_ASSOC)) { $tables[] = $row['RDB$RELATION_NAME']; } @@ -87,7 +87,7 @@ SQL; $tables = array(); - while($row = $this->statement->fetch(PDO::FETCH_ASSOC)) + while($row = $this->fetch(PDO::FETCH_ASSOC)) { $tables[] = $row['RDB$RELATION_NAME']; } @@ -111,7 +111,7 @@ SQL; } //Fetch all the rows for the result - $this->result = $this->statement->fetchAll(); + $this->result = $this->fetchAll(); return count($this->result); } @@ -163,7 +163,7 @@ SQL; { $sql = 'SELECT * FROM "'.trim($t).'"'; $res = $this->query($sql); - $obj_res = $res->fetchAll(PDO::FETCH_ASSOC); + $obj_res = $this->fetchAll(PDO::FETCH_ASSOC); unset($res); diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php index 8a7a07b..507a6eb 100644 --- a/tests/databases/firebird.php +++ b/tests/databases/firebird.php @@ -38,7 +38,7 @@ class FirebirdTest extends UnitTestCase { function tearDown() { - //unset($this->db); + unset($this->db); unset($this->tables); } @@ -98,8 +98,8 @@ class FirebirdTest extends UnitTestCase { INSERT INTO "create_test" ("id", "key", "val") VALUES (?,?,?) SQL; - $query = $this->db->prepare($sql); - $query->execute(array(1,"booger's", "Gross")); + $this->db->prepare($sql); + $this->db->execute(array(1,"booger's", "Gross")); } diff --git a/tests/index.php b/tests/index.php index b1d8f62..99dc92a 100644 --- a/tests/index.php +++ b/tests/index.php @@ -41,11 +41,6 @@ $test_path = "./databases/"; foreach(pdo_drivers() as $d) { - if($d === 'firebird') - { - continue; - } - $src_file = "{$src_path}{$d}.php"; if(is_file($src_file)) @@ -57,7 +52,7 @@ foreach(pdo_drivers() as $d) } // Load Firebird if there is support -if(function_exists('ibase_connect'))// && ! in_array('firebird', pdo_drivers())) +if(function_exists('ibase_connect') && ! in_array('firebird', pdo_drivers())) { require_once("{$src_path}firebird-ibase.php"); require_once("{$src_path}firebird_sql.php"); diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index 9372beeb746a6d874689614a04540058f7c2769c..7e44e4f69ad61400dedec4c4a9d767f43bc62d92 100755 GIT binary patch delta 3852 zcmcgve{2)y8GgU>-Pu0du|o_=+t4^_sM8s*cEXY{ff71rYu6~mEUlt#5@rLb)6$Vb zwElw@YohrS9{xb#p5yXH+N)Y%>;`;N;tKQvBK`T7Ja5e*Np;Q?uQz&1M|%PHwU zbX-+_UHy*SLI>onv<0zI_E0UtEqji?rqoM08}F8s#w{%^w*pB@(x2!Gj!zGIevpi# zzzTSM8LqYPB^$q@D2=wJmT&PmQ>r8onwlpz@w7#JAB3-^+3?5`V;q5De`R2yGw44M zlg7wkzlqtvZn9WrvSye08H_IH%eoX;bSbdta<0&2li4K*tIMd_B?z<2NNJZ~tuC8N zx&&)=87=7&tl4FL2BXWXWnBs^x)fM+iL+rH%Qmx15Js0ZO)ag$=rgk6DmrQWqiVLC zKY8YXC4;qEZY#FD1lDM|qhzKrDxBP}d$KW$v5W5F6sDElX46h32h- z2FK7^OwF5?W~f*YqBjeoFNDTw?hQ*+e+ioDRAD`-9_)10+5Mc&d3 zv9kryLYe4{B`Wg5=uAO#rA%|$(iC~2IbG1?aF>cjZ+Jqv@i6-rp33%{AXVC@*9|B; zBwxTzuAlDPvukkA&cQwV2LsvokY_fj$UbxM#{A&-d0k4Gb_VQBdUhf(fk6*@Uzt#3 zHjW8fPdbgu`eUrOQ;#H*dPdq2d#s_US$037d}n)iZ)acc&ZoES*eNT&wD)ZLUgu7k zz2|&de{w?kOj>igQfWO~skEK1R5sfyWvMx$-#DuT-08%4-XaYPUNfa^bv3oLOvcpK z3o*5AGBKq%>_@%6fG>b>FQeh}|!h;@E< z+f!Y=n|SMr^1S}ZiZaDyow=Lz_x_=L+mlZ0zNpF*>@i)LP`~mTFRSV*2Q}hA1gS%! z0FgtQe|AEDbV|LJW1}$AYm)XQZ$2HVN!j(9lw&E!csl+74Dc_ug^d7p^GT&1kgw(*R@lX#XIdmPIc}d;dqOLwfu{=`L~Ar~QzR`n1NX1&4>` z5mSf>M9Sew$2Y`{m+5ItwJzVW`Mfpo+A{1f!&PN?jfF4qs9$Smm-ut$CTni)n49QY zt^En(%~xtEu&@+ZSPCpG1zyAJhc!Rn>ergtoar~m^L}$Y?>EN{zxZsKpTNRTVBsgQ z@Do_vePGkofM#RNn~ndoVm6|&o+13U50u=6#_wo}64dYY(2o&ah!4F% z%6Pv)2fSf=yTU^k5GN1~;8!a`bh#o-GVtdf58XrzR0Jso-VeS9xC0SEyyFQ{$`hi5 zCrrO_duSXnbO0*{3XAR#W!z!9<$@vNGNRWVq(<`=?fKxh(*LR_8@Hm?*{)ka2ui#aZwG@s2ZX^HB848 z7$OD{1pcZLqI1f9VY-12g$2YsqDu)<0EHDfoQ*$Xs zN+(`K=6?}c*Eq7v$X+>&(Ytu`Fh(C6$LNb7c;qm~Jo6H=n?_c91lfs~kS!o%n|bsn z7{2?6)<2ul?vL1)^Osguub zecae$VaD7}i4=N%@4lb!zl1jwz73^&sPn(HyXqXf`uFc`$A>Kc1rS>v`KaBcM>^Po K*IcI)!~X@3L?254 delta 7131 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 Sb9HQH^V@Yn`|Y|=!@mLFy_P@#