From c4818279353de146f02c29cfde0a38fc7d1b2e5a Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Mon, 5 Mar 2012 15:18:17 -0500 Subject: [PATCH] Fixed a path issue --- index.php | 9 +-------- tests/index.php | 2 +- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 969464d..f3bb420 100644 --- a/index.php +++ b/index.php @@ -90,13 +90,6 @@ $path = BASE_DIR . "/databases/"; foreach(pdo_drivers() as $d) { - - // Use the ibase_functions over PDO::Firebird, at least for now - if($d == 'firebird') - { - continue; - } - $file = "{$path}{$d}.php"; if(is_file($file)) @@ -109,7 +102,7 @@ foreach(pdo_drivers() as $d) // Load Firebird if there is support if(function_exists('ibase_connect')) { - require_once("{$path}firebird.php"); + require_once("{$path}firebird-ibase.php"); require_once("{$path}firebird_sql.php"); } diff --git a/tests/index.php b/tests/index.php index 4bb1aa3..b37570d 100644 --- a/tests/index.php +++ b/tests/index.php @@ -55,7 +55,7 @@ foreach(pdo_drivers() as $d) // Load Firebird if there is support if(function_exists('ibase_connect') && ! in_array('firebird', pdo_drivers())) { - require_once("{$src_path}firebird-base.php"); + require_once("{$src_path}firebird-ibase.php"); require_once("{$src_path}firebird_sql.php"); require_once("{$test_path}firebird.php"); } \ No newline at end of file diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index 08ff3cb6c559ee2b5a7b3cacfb4f796b09e7aa09..7e44e4f69ad61400dedec4c4a9d767f43bc62d92 100755 GIT binary patch delta 1684 zcmZ8hZ){Ul6hG(n-S_(5Yu9dNw8)?j10!RMQ5M?GNMP7$Fu3)NiG0BobsvZt`7=zG z7=0gffGnZa%on0SL4%88(lXc;|KNxL{nn{q$b_)O7%^F~lYmBp^Srk*=5BlLdB1zl z{oQl!J@=Sq#55zV2u&+*h;YC8HPcl>wjQDGvNIsyyQ2UdvHa3($-oZ+{gRF~I<|w0 zQm1@x`9<$d8&f+)ax!g%25bC3t;OquEYah}!rQNHnU96RceiZ+6|bd@N~`Zxx5mRo zwa=GMw)G~kHzD*UTtf*_%m)5;h^9J)6oUu*gKTHh7h)7%5!b-OB+ErFRFQZ{X0~sI z8A$r{>R*KO{pVSY5RIN0XSyqLiDF5R(L%62M!1I;%)(VAoVRiUtHnmkKo-EfH9@E{ zc0)JeD?q#jE(APe|MOPF#g>&t?Wr71Swx?=t|6=SHkQnV{V<-lj=5N^HqEdf`fsra zI!u=8n!QtX_V(KC9^sP?^+VIuaC#p*+J z4+31Hz6}zB2-0z(J-&YNss_#(B-uvV zv%9*sb$4}kckS-p8`t*n$VK);4elVKiv2Qx0@o?j7&(aGxoIscGE@9~1(AJJWG7Ml za)q~nZ~lWF_nwx-46f%aBb|`yq&QY=e~ymRW=ESIiC?DC=ev4ljk@`j6Vh_UPT`^+bUgLDL>qac~M zwyv^;6d!NSW)?UiJiemY07J7EPdZk z2D)&UJm=q^0SlHfp)8;*erZCPS68;l*tj^}@@Vsu8#^MAhTnC>yRf@^{QgR!bIBbu zS8`g}zc6sSNGQ`SI+BuS!^jJem)Ll2C&y)aCYCCQMa+}^aYgb(}G z5!tXkKSoS*owo+gTeNZIEIelx4$Q(8C7id)%hk2?NR26#o>JdUsqzYSt-Wyyd3L_q zA>xmm>8gOP$w^<%xKlQ?QWX;c{a$3GB@(K4JZP%hF*ruGW`tyzWFuP&I;(}ESeG+u zrmD&SS$EFx%*Id8!ds_3jXa~y6{3w+bGsTOkGDB6X6K)bSZOlSRcvO<*xb!<;TL@n4!)+?LD_I?sFU8`#^Pd*1Kf zbAIP{|LJ-_*8@F3TKE1alC9=abz2S@eigf~%mD#rHwfu(S=%$83vdwue-Sep%-B?Q zY{~hKODz1uz}S}17UEi2s?K$_4X&kVc+>&u$u|bdA)T5X82%Nm#4UvJ{hb5-gO7Lg4T|&y zd${A_&Os3_@JAE$cYz;xmtHK0M+!`~7_zalMH=+TA!0WTazPHrT#Lx56Ywmf8Tr%QU*d94<5Zz> z+wuEzv~0t(x7kbn{h2_TX`6B-w6MdQ^3H~$gIae@sPmzY$GZCifyO`m0RNC