From d29d433d3c9772bed8b35ab8ecd16297629f0224 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 28 Feb 2012 12:28:56 -0500
Subject: [PATCH] Various db class improvements, more SQLite tests

---
 src/common/db_pdo.php          |  21 +++++++++++++++++-
 src/databases/sqlite.php       |   4 ++--
 src/databases/sqlite_manip.php |   2 +-
 tests/databases/sqlite.php     |  38 +++++++++++++++++++++++++++++++--
 tests/test_dbs/FB_TEST_DB.FDB  | Bin 802816 -> 802816 bytes
 tests/test_dbs/test_sqlite.db  | Bin 4096 -> 4096 bytes
 6 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/common/db_pdo.php b/src/common/db_pdo.php
index bf2c8b6..100c505 100644
--- a/src/common/db_pdo.php
+++ b/src/common/db_pdo.php
@@ -61,6 +61,11 @@ abstract class DB_PDO extends PDO {
 		// Bind the parameters
 		foreach($data as $k => $value)
 		{
+			if(is_numeric($k))
+			{
+				$k++;
+			}
+		
 			$res = $query->bindValue($k, $value);
 			
 			if( ! $res)
@@ -83,7 +88,7 @@ abstract class DB_PDO extends PDO {
 	 */
 	public function prepare_execute($sql, $params)
 	{	
-		$this->prepare_query($sql, $params);
+		$this->statement =& $this->prepare_query($sql, $params);
 		$this->statement->execute();
 
 		return $this->statement;
@@ -126,6 +131,20 @@ abstract class DB_PDO extends PDO {
 		// Return number of rows affected
 		return $this->statement->rowCount;
 	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Return the last error for the current database connection
+	 *
+	 * @return string
+	 */
+	public function get_last_error()
+	{
+		$info = $this->errorInfo();
+		
+		echo "Error: <pre>{$info[0]}:{$info[1]}\n{$info[2]}</pre>";
+	}
 
 	// -------------------------------------------------------------------------
 
diff --git a/src/databases/sqlite.php b/src/databases/sqlite.php
index 2b56ed0..49cb114 100644
--- a/src/databases/sqlite.php
+++ b/src/databases/sqlite.php
@@ -26,10 +26,10 @@ class SQLite extends DB_PDO {
 	 * 
 	 * @param string $dsn 
 	 */
-	public function __construct($dsn)
+	public function __construct($dsn, $user=NULL, $pass=NULL)
 	{
 		// DSN is simply `sqlite:/path/to/db`
-		parent::__construct("sqlite:{$dsn}");
+		parent::__construct("sqlite:{$dsn}", $user, $pass);
 
 		$class = __CLASS__."_manip";
 		$this->manip = new $class;
diff --git a/src/databases/sqlite_manip.php b/src/databases/sqlite_manip.php
index 8048c9c..b3cedd3 100644
--- a/src/databases/sqlite_manip.php
+++ b/src/databases/sqlite_manip.php
@@ -68,7 +68,7 @@ class SQLite_manip extends db_manip {
 
 		// Generate the sql for the creation of the table
 		$sql = "CREATE TABLE \"{$name}\" (";
-		$sql .= implode(",", $columns);
+		$sql .= implode(", ", $columns);
 		$sql .= ")";
 
 		return $sql;
diff --git a/tests/databases/sqlite.php b/tests/databases/sqlite.php
index f4c5a53..4c417d6 100644
--- a/tests/databases/sqlite.php
+++ b/tests/databases/sqlite.php
@@ -53,14 +53,47 @@ class SQLiteTest extends UnitTestCase {
 	function TestCreateTable()
 	{
 		//Attempt to create the table
-		$sql = $this->db->manip->create_table('create_test', array('id' => 'INTEGER'), array('id' => 'PRIMARY KEY'));
+		$sql = $this->db->manip->create_table('create_test', 
+			array(
+				'id' => 'INTEGER',
+				'key' => 'TEXT',
+				'val' => 'TEXT',
+			), 
+			array(
+				'id' => 'PRIMARY KEY'
+			)
+		);
 		$this->db->query($sql);
 
 		//Check
 		$dbs = $this->db->get_tables();
-		$this->assertEqual($dbs['create_test'], 'CREATE TABLE "create_test" (id INTEGER PRIMARY KEY)');
+		$this->assertEqual($dbs['create_test'], 'CREATE TABLE "create_test" (id INTEGER PRIMARY KEY, key TEXT , val TEXT )');
 	}
+	
+	function TestPreparedStatements()
+	{
+		$sql = <<<SQL
+			INSERT INTO "create_test" ("id", "key", "val") 
+			VALUES (?,?,?)
+SQL;
+		$statement =& $this->db->prepare_query($sql, array(1,"boogers", "Gross"));
+		
+		$statement->execute();
 
+	}
+	
+	function TestPrepareExecute()
+	{
+		$sql = <<<SQL
+			INSERT INTO "create_test" ("id", "key", "val") 
+			VALUES (?,?,?)
+SQL;
+		$this->db->prepare_execute($sql, array(
+			2, "works", 'also?'
+		));
+	
+	}
+	
 	function TestDeleteTable()
 	{
 		//Make sure the table exists to delete
@@ -75,4 +108,5 @@ class SQLiteTest extends UnitTestCase {
 		$dbs = $this->db->get_tables();
 		$this->assertTrue(empty($dbs['create_test']));
 	}
+
 }
\ 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 8687efd4c3a7cc0b0b39d10b86bbff9cc668a6e2..111bfce6e91db904e6d787ccd44d7d7ffe8d6650 100755
GIT binary patch
delta 5443
zcmdT|ZEO_B8J^kO+4Jq4y>~v_=QF<J_{P*IcmBAKHV6YI4QdNMW2H#YV$`@v8j_mC
zs6|EfMU6yAh_FNOHX?x|fFU6S8<T950ye}cQWa!S)4FMquvJ<j84<h1{YYxucXnrP
z?-u{<kFNFl?wOhQd7t@ucji*5NGcUsi%}w6X+!4YcBVL_pG5*felUateBh4=HN}P&
z1$2y%8wv2&Oe+xvD-!zVbevIMaf|s6Q4G(!VBMWbpHMf^7jX|M`|8~GGa)gIU+yCf
z+w;hYDTD|2wQul|Zu+h7z=kIl?Gp!z`~;Xqa880Xf~^NT0(Pu7d86RC`!vRV?vA^s
z@k^b_Vs+2Y^PJl3l)OjjY+m<%0~Xy_>P&ip#G#X<!SOiQTVQX4oy?Hza<^hI0nDbk
zTgAJ3y$7HHe;n|Ipt<{fWZRk=TNK?DmZ7s?M}>U!D%kU2)<=ZVX@J529TVw;8yuHY
zyt%DqTD?Zd{BnC^{mS`~aQO333iTr_{2kda5?+Im6sFZ}Hd5hDByJgXSg*scp=tG$
zjVyL2;<Ta{VXRWlX>|(_7Fh{*)0!kE6^cm&Wl*>qlf@4jBq?+mp)Y}iDh?WouXC*T
z02Fhq_W%M<(jHXQBx0qktGXj-=U8{Ne{h{+-LYkJn^#cpU@|Yjq(-fMZ@V3WCIyn&
zq?R?w48i<F44S-aBXdg_OAT#e3`Qafbq579uh<%4H@XE?LD8(rFz-gaQ1v1vb5~|F
z(vd01?jH;g$9n&6hMXMh{gWE&9l8Chw)QVkbqktg_pi#@KbU@KlHI?E**}b-F1vr3
z2r#iwmEFG#vr$F+w}SOgXQch(OH-de=pV=bv!$z8madkP$ny!`V-P$0!LShD!R5Wl
zPTcNg$wsfolM@JkJc7iv>(;LROURL_gD>JZ9=vF<nB{<VpTUgJG%R-GF?>E^K4v-h
z`H1?o>wzXMPM4UIS<am<Wde;^d@eE{vz+@}%=nC2d<HJI8(Pf@?lh2b8n!s~vp{A!
z_vz30T(S6EU_NF!^U*3+kv~;p71F6z+DdNE*1xKy9ppTDJQYfXdXo#4t~3$xBhciL
zD+FE?=v#J#R-*<%K&~4C&2#mu*RN_^)6gW!50HixjVr#hx@mRe=3)gAJqz|LBz&Yy
z3Lh_%BIg29)%k!_oeoMhhl5h>n?Wh6txJ<S{EfH#B>J|W#7_E2{Is7W&MRV~$4|n&
zeiC`lPpaPclWNURYJTM>wdbJid1!mMjKtq8Bibv6iLXG{xe;{Y@2mbEQsa~A5#RI2
z>!sQg^-}amy%^OV?ICGJ?~ztIKqScv4V^!Dre#YTWU-cK+jiAEU(h1ICcmw~-vm1Q
zJ0k2q)UM4QCw?6Ku$08l1xNx1MIj#U4wA^pAgSsJlIr(@q~>^hg5c1(Qdjgsz!f_Z
zbj42uU5N|G89Nnph0g?C5iRJd(jNR9c`^U2B&M-TBWbByS}N7!!Y3Yu1x<xussw`+
zJCr`zvcpoEr~RQ@s&vrTqfagGkvziVDeZwC>32i85d^EHDf{=zd?=?=uOsIh$axSs
z4<T)D%D!D;O*`!C3sfY%j-)q`bP!30(5@XFc5O#T-b+JxOJ{PH8ftdrIhu@>iXMiL
z4i^JI(vr=NzP<RmO2!?R7tj~NA*jlyZyI>a%?%Ycd(pi=!y!PO7<bGP;x%f)gkwQ4
zR&^(Y@f5mkwgpF<y(y=y_Vk3KE9mXgS<QciD5Uz_@|xI)V;M?=HG_q~M)H=St9kdo
zya%AH2P_TNk(b|@tk_7C{9&LhVVXHEw%{TQ_F8Zu!)9_4)Ehy$T#b2Tzcah^i-7D`
z+dOi)wX|H-W^8-c+IDC*<t>!`Nt)8L)pN|%bIjFq%++(u)laJ)kGvei$-?;PG(N5w
zAD%*ad6FI%vO{vrLvqYRa?C?=%tKBZAt#NHld2vP&LA`-)X|XRmXI9tkR0=n9P^MI
z^N?dk$T1`2m=SW!2nlsG<X<fzIp!fb<{>%eAvxwDM~#r9M#xbk<fsu6>LBDsx_hz*
zmSY~0V;+)Y9+G1o(%ezmD>1v&T#1%awh}F+epO$I*`=A4_<y^PG<BBzlqi%5suYrc
z0T&n#R(g{yN>{TedN-K42GQ%1fOcxWu)Gbo*O7b_1`C0mAPdn>vII4dO4K3dqZC*x
z*uTVu=o4`XN{f|f#Fme)f(?K@4CUoeK5nZ-VZb3UH`p(23(;2F5>yA}JK^fF6>JmO
z=fXmCPFRBW2usm?z%|06&SapSW-5AT`q}-N2QvS?*6Dv5cMv!ao`iGf6vB3T7txP_
z)DK=NdiQ7!p!la2{1b-FqZ2d)-l?y2-iPSr28i>fkd0tGjBrB=jZwxN2N{HXNge1l
z1)A4^js^5|itGMO+p34-a`7s9aLf^@-&&}uXPF9`HYk3^g10d|sp2Rlis?iaQRYDo
zx?n1b&ZKCPDXO(9qFID0c#1{jc&i0J$?zCcR5Ozz^O%^UsCp(vV@y$%RS``xRMBHB
zBF8_p;1-5QnWD%{ip(=;j-v2Pibf4Zabrr&rG>6DMO#=zj+-rbGsDAFQOQbU_AQfU
z9&ob-#f=HJETdsvkP<g$lnc_X)XLRm%L)7l0w=i4L%$11Mz1Px#RvOT`5HQ^EJfo5
z`Dg^}D%d7v5eh>&QkKF!rJ$WA*JI%4V8S`hvtT>JSxGW`(}dwtJma3Rwm0@nBn<ah
zx@p>TcFlc_*-nSMa?U2A8G?$oF;N@~3}>B6azw(t(;_l#>};z8R|&UKsxnKYdT$z+
z+XwYAKc&s7!#9-fR@v>5U@l;dWS&9I(`x%d>4G}V-62mXB|;)RH&acu(?M_4d}%p?
zeLc1aDuq<p1fPo`O}=1TfNlzr-sH<z-Lze<^w0%Ie*<b@T^v>~9+d;m=$+742s@^b
zFiU-|TaMvjb<Q!l#03kFmHTb#y6tj8yLm(oxxD;<ONG$o;y?k_*CB83Z5)vc>D-@$
zLj89E_|$)~kY~B*S(dT=UXL;_XQJ?brjWEg`R(~}$Ox?6r$*F5Iy02gmzf#(k$_T0
zGL+X0%A6@MDIsw%$|0Nj<1YE@ZpO$@1Jml9{c^c07S0fUVvNMJ`rLlGI6n^Ag)#ib
z5appMmx|)Y`AK6e6B&lf2E!y{fV9FGK4uIwMN$U7OU4X_c!uGU!7#=cAlWd60meX6
z8fD;1c+_BsWf;yI45RvdDv*#ELD2ROgtU9@@>vD$9DRG`wJJ`@UOcE3_sHK>gc3o0
hx?e7bx|jOpr9zRQe%LPu@!+n{`ep62e&?d*{{lEGL7)Ht

delta 2790
zcmbuBe{2(F7{}lDdhd02WxLzD(J|)MDHBK_wy@DILKs?%iv!j%1r3A}Sdf^IA|s9%
z<q`}y!O(*295b~GVJKj-AIcfcWJwd}KV?HS5&vKqjKpNoE&7i!sL$QohnD-pnD{o&
z-F@HZeV@<s+<W)-bUmo+!HtwO1%47pzG)ual~dOF8YScg7$E}f|DKSJ(B$G<wkAX)
z0{mi@lUQBX=xAMHL_MX6#Y=KSE<^YEWYj0b{um8vlj`Ya%{}551N87HYdcuP2JaC%
zcKYyEA3JYdjrMQdyZE%2F0T+Fvc->rwS#R2J2xD?Q({!z7G_5h;t+i;8Lco*yk6un
zYsZxnYBILzN*fh5%92qp%$M!?X_$8b>_f1N_vast)1z_WXxw!rE{X~7+u+0|!v!Pt
zXMAk`>dUT15_hd84Pb?Bk*k=LgNa~Pdofq7Eu>GU|0XRFBSu+8StxMVuM<6!A7HF?
zu?0q)GFBS4ox_AugLKXKGt}7UVvpE9HN3)_c$HA0hk(l%qim@b4(2*(5Ap1R@wZ&;
zVSD^)9!n<^B=QNs+8~u0Yf&IB>W3^nLAp>^TY5#{ZtBc+w#bg+4K*S4H{zm1=p!kk
z6v*CC7|FJST8<5rEh!C!EC;Uv>PQvVkdM{_iKOfrLOjyfg*ig5sO=p6o?WQz9NQyL
zWb-+O8=X03d5+-*XO3B(V|ZmgM<^>>m}5R#51~djcc1S^f=&U(7u;t%mUW-WSB@G`
zV-2XWhD<>X_g5G1bH=VAl3!uG&$wFubv6I>DYBMKb3AtcXZcmf@|(KE-e~eYZ@&on
z1BEB8(p5biy(gHJPqLY1v<Kc%vog+RYVAv-GQq~!p0q#hAC5k%_NJLgH^Gq5b_N>{
z`CTI93DPDAMEO&Ir(w}kE$dq&J4CsawXbho*U_?R<BkfIFv}IZs<ME&FU^{%YfKf*
zp9h$)BpKUc$LxTZbepkYh&A|J5k6s+91(@^%8L=!a4EtX&D}#Rt=e?6a-2z$SB}8T
z_HyUWuFf4@od>$!ig=Ej!7tg3rL-BsxmSq<_L}u(?JQeBFFZHLXz>@s6FNsd;SZ>%
z2@3kW_+v>-Q)aTXG$<{XBeZPqZrC!dpwx;=A*=$uFLfSr^m@$i2Bl@Pwb%KK>LICA
z*poIN8<M`Aq|X4{sMOutt18I@3HA}sS>ov@9-W#eb@xFvH#FhiT=FiF`iOLvNc}|8
z>9Iozw|OX0bbOM&kc=)g{4u#m-jG|jb%2!T<;1gQG$xOpq!R|4l_%=0*YkaF6<b>f
zv@Act75tUB+~t4Wfz8~Qo0S&|p^#BBC)d}kYW&4d={+)&9}B}>?v4k>n)~MD-Wu<l
zR?vc0M(PZornEe+32Vp{T|*LJZD1Oh-DokHg>-I%O@TSvI4Mp>>!ViQ1K^vV%Nuot
zLzg?W*P+XDI%^D+DQjug_<^75ytdlOPXlm@TDw3Y5;Y=GBN8<tQ6n<Lkr|H67&bCv
z*huhMNNdX|M50C{YDA(&Bx*#aI5NeNDUM8WB={_3p96^+k*E=g8j+|G*~^i=9NEi}
zy&MTX3wgwWM2$$)h(wJ@)QHqMQs+pWBXy1hA0S&^bs$kA5;Y=GBNBC)aXqY*8y}S^
zD`_|9b#q=f=XLWE4>)+Jk%t<2sF8;nON{dp;~W|1$T&xW4@xwL7AhU0@C`L2zj9<a
z`igq0P4u=FyiV3fnLxIgzJRiy4!1uonp2HRpz0l=$~|TeyJXhs^jDRRnRU%{8a~Uk
z!MLJb8COQ2&lsIlHeR3!MVk*Fp0$p+GHEq^X(b48-xJIq&nf<ShB&Th5UXNJ*`f+l
r@Yg-9R70HO)5>z;8Z|zfR%+<jv76J1d2`ycIA#W#>6FTk$yn?kq4!Lb

diff --git a/tests/test_dbs/test_sqlite.db b/tests/test_dbs/test_sqlite.db
index 1b2cd50b5c3dacd6d8850e107db39917776e83a0..199ca0582c203573e83b8ff758a0e5250fb27f78 100755
GIT binary patch
delta 155
zcmZorXi%6SE%=myfq?~xnSq!Ih#yYWF$N0iK9c7J@)(&{GBB@Xw%%B9j)^T#S(&j>
zesT=6Ca+R*QEFmIYJ5p*af#C83Ct2=IttmTl?oxQ5g`gX3T25o5a#9;%rP7sOw9Kf
xnBOtq+bqa(iCKw{iG@L2yga`syErkYINx4?k%d88JSjgvJ+-LVy(qu97yyl*DLViF

delta 108
zcmZorXi%6SEx4P3fq?~xnSq!Ih<8uaF$N0iK9c7J@)(&{GBB@X4%t|6j%nfqN!Czh
zWybu;F3g(B$wjG&C8_Zxsl_D<8ks2yo_-;&?yf-!0YRR=jzN(M-ma0GS1`wLY-VBk
G!wdjOxf~+^