From 642b17b28fdbf05e69d6304d6463a81610360a14 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 28 Feb 2012 20:53:16 -0500 Subject: [PATCH] Fix backup_data method for Firebird driver --- databases/firebird.php | 8 ++++---- tests/databases/firebird.php | 2 -- tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes tests/test_dbs/test_sqlite.db | Bin 2048 -> 2048 bytes 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/databases/firebird.php b/databases/firebird.php index 7892ebf..e8bcef3 100644 --- a/databases/firebird.php +++ b/databases/firebird.php @@ -365,11 +365,11 @@ SQL; $output_sql = ''; // Get the data for each object - foreach($table as $r) + foreach($tables as $t) { - $sql = 'SELECT * FROM "'.$r['name'].'"'; + $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); @@ -389,7 +389,7 @@ SQL; $row[$i] = (is_numeric($row[$i])) ? $row[$i] : $this->quote($row[$i]); } - $row_string = 'INSERT INTO "'.$r['name'].'" ("'.implode('","', $columns).'") VALUES ('.implode(',', $row).');'; + $row_string = 'INSERT INTO "'.trim($t).'" ("'.implode('","', $columns).'") VALUES ('.implode(',', $row).');'; unset($row); diff --git a/tests/databases/firebird.php b/tests/databases/firebird.php index 16f082c..6d9cb5d 100644 --- a/tests/databases/firebird.php +++ b/tests/databases/firebird.php @@ -118,8 +118,6 @@ SQL; function TestDeleteTable() { - ?>
db->backup_data(); ?>
db->manip->delete_table('create_test'); $this->db->query($sql); diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB index f7adb982ffeef746212b4334b7e56678204a8122..c89a7cc82598c094db40990f26b14e5b8b669ee6 100755 GIT binary patch delta 5224 zcmchbZEzdK8ONWMZcoxlvgJ65P4l7)jcO9dQ@vW!Fn|LN1xjLzgd_%1l$v}XokCjd z59!cKouO>;0P9|GvO3$u zs^eK(!7S_Xs;s4!SxYUmF7vDtk*~?R%(G5}zb5Ol$T~ec>oU)}Vul%(dDayZtBz-F z1+%Q#YpG?{B{9~iugSV3#yVM@H4b-4WNlq!Io2gH*0vdDShBLdHEx?= zoxI>ONvUO$Qdg2>XX&lXsQ+z-)XbeBW?rSc(%XN@=JKqK;B3s+ES^;Z(1oMRH#|_L z$r~5As??(<|C|Bx#s{FR>sYtuW4)s)=8qT5$J*%M{JFB-AcNkqgGzQA2TfX_kM&Bu zjG44!id8Xhi7NT(o0yRWTD6a@Ywz z)+-G%Xu=NatqOWefGYJe<}Ev>yDH{Q5mTubG2bL_+Ci1;htadH>v$(sbn-GjK+VP- z^h(e=G#dNqS-L%|XZ3RCTeW)!sY144m*9IUKA~X71(1YJhZB^N^mHwt;Yh?oEW5+YOI{MW6t+%39yI!18#t|R?aoYt(@A->_!w!*|}h`a7O>aIrIs#M4?kbtJ;W?P{cy9ieWeP#eHedERA@irILcs%kxk zc)NeRZEMfAhkLd?(etZz?`|{lI-OiWHewp{j!?iClm}m#Z0HF1&YLTz=|-~rRFFo_ z25IzwPGcpV#*gYWaV$hzM?*AehG^+Pv1c3}VyM%e*F)@;^jmE6TQ5?8$`b|~oUZv_{T0ZhF*EI1OwvZpj3=}- zmHbR6`NcQHQjg(p< zrItvkB~ogMEOKO#Ba0kaNYH4EN47T(C=x6tfvKj<@f*w~hv}1imNbA0ZTiUi%Js=Db3KMw3IVNM}*x8FXGvDi~C*b z?^o%qLgNDaA#I@}5ive|Kx@Ed^j1rTjk*W5dX%fTXbW$T;|h8hKQ*oaaj}mMYaz`j zTZ9X{8JK>kNEo0bemBgautzVWtPw6!w^!*qgw6>{E2rcHCBZ2RYSyEkgGSN{mx_1trQUy@GC4?M8IXc*M)FW;B))v>4WF|3rY*|IoiTwsbJJ}b`|f84M}KW*b) z73a(zvdpAbjDAU&wAv=8qzV4kV40+BlW}3fo}tV{6DCDrlCVw2qzV2wWSJywld>>j zk4R=hg-Jn}#BGz~(xf0vT5Xe~+ys}PINmsUVs?-pgRY;`7T~?H;G(vvmYg(xIHfJY c5#BwewUANc^pu7-&QtGBY393A-lop~0=$DYsQ>@~ delta 3025 zcmc&$U2GIp6h3!$?(FU?-Q8|mwn!HiBGw{kXIp8T4PlWkT0{4zU9k|M>rbPN(Nw7q zP1G*Gl|aI-4P24GMUY}*OiN8i5{>N(n!XfcOu)p@M2$XF+Q#@O@yy)4yJdXWX>Mn} zbMAM(@7$TaGntH*$!IYGE%mS1pmca$83B!RLIQXO2Y^J*{0NY0nyKwHF@P5&{7V~2 zAUG1z_?qlB&--4vY_Eaw_zcIDT+%N^7RNR3jAuCFwOddS#H0)qjg0p*K329BPbqIF@d<@aC)GVl#V z3UgK&bN&RIz$OQ|0@oP%UxKbM8z@lV%|`1y+9o46281v$f{Z$`{qOU^ac@@b1T zfrT}Jg|%qGn#Qd~`SOM8g@jl>T)}8z`ON#qmyeKW!Kb#wXSCq6SOk6kzxUjI|2@|; z3O&@~-)DJP3ErxHsL3UF>HQHpS2kEzoPet;FOVZsJWz@wCVwpgIWh}!EFO#g8eC`L z94>H5altuUC|z;gm;O6x>xIX9w7Zd#4RNUrHUVPdvCS9_vhXY;B9Bx@EX0 z%Oqw`v8Fs7SoX1(HjH>_<0oGFxc=}(ddrwLK~mpb6R4ZtvXHnTob|Z{M-?Nu?F+hM*P-jkGEaS6h|Fkrzg(L+MHld%S4& zLwnJzUOh<_r2;9g7vIEab6;>=Bvcjf~B{VeXhuP;?rqfxuR@TT8XdsC0tjdI5DadEN{o?t33mj zs6)SXMcLpqUKf5=GpdwJy%GJfQRRmj(uF2ib;iEu0YBVl^eni}f$KcDE`WX_V}Hw2 zn3}bBx)~^EK{*G?c~CCE&_LF%4`dz3X2{FA6e2tD2hc1_}8a=HfWHc-ZWz zrBn6S7oDe8ReV&;^9vsYncu6nHO)FVLmo#OM-a!XV>8@z{QKoLiLp@}c^p|sSuR^rdl0jZ0z#d(Y3+5AtQRsD^X>aa|9 zG8$Ab6VF(3r)Q#Gm4g+yu@(;*uOxVs`4j5(v5s$@`Ukt!1JpJRplfMz$32#o$wZ&( z^^$3QO@!RRPgw6nRwcpZ_?2Bbd5>KNjx z5aQ_MJ5aj9W7!;}C?HZ}0keyno5aJpUqM)NtmY4%! zYQpShe#d+d#vY|dLtr!nhC>MOF|ja+i7PbyBFmb G7Xtuw4>ffF delta 58 zcmZn=Xb_knEvUl4z`z8>j6hmwqK+}Y3WM$=C0-zpfrWvAdD3P<7IkLEJRo(Jd1Av{ E0O6Mjxc~qF