Use the new dynamic sql builder to build sqlTask's SQL and bind its parameters from a more user friendly source

7 files changed, 16 insertions, 46 deletions

diff --git a/gentoobrowse/console/categorymetadata.xml b/gentoobrowse/console/categorymetadata.xml
index c801376..564a003 100644
--- a/gentoobrowse/console/categorymetadata.xml
+++ b/gentoobrowse/console/categorymetadata.xml
@@ -22,15 +22,10 @@
 			<project2:sqltask name="update" datasource="postgres">
 				<sql>
 					UPDATE categories SET
-						summary = ?,
-						metadatadate = ?
-					WHERE categoryid = ?
+						summary = <param source="parent" name="longdesc" />,
+						metadatadate = <param source="parent" name="moddate" depth="2" />
+					WHERE categoryid = <param source="parent" name="categoryid" depth="2" />
 				</sql>
-				<parameters>
-					<param name="0"><value source="parent" name="longdesc" depth="1" /></param>
-					<param name="1"><value source="parent" name="moddate" depth="2" /></param>
-					<param name="2"><value source="parent" name="categoryid" depth="2" /></param>
-				</parameters>
 			</project2:sqltask>
 		</project2:iterate>
 	</project2:iterate>
diff --git a/gentoobrowse/console/emailebuilds.xml b/gentoobrowse/console/emailebuilds.xml
index af8c83e..660e2d7 100644
--- a/gentoobrowse/console/emailebuilds.xml
+++ b/gentoobrowse/console/emailebuilds.xml
@@ -28,14 +28,11 @@
 					from ebuilds e, user_packages up, users u
 					where e.packageid = up.packageid
 					and u.userid = up.userid
-					and u.userid = ?
+					and u.userid = <param source="parent" name="userid" />
 					and e.firstseen > up.trackedsince) as ut left outer join user_ebuild_emails ebe
 						on ebe.userid = ut.userid and ebe.ebuildid = ut.ebuildid
 				where ebe.userid is null
 			</sql>
-			<parameters>
-				<param name="0"><value source="parent" name="userid" depth="1" /></param>
-			</parameters>
 		</project2:sqltask>
 	</project2:iterate>
 </emailebuild>
diff --git a/gentoobrowse/console/packagemetadata.xml b/gentoobrowse/console/packagemetadata.xml
index 9c00963..f9bbd6c 100644
--- a/gentoobrowse/console/packagemetadata.xml
+++ b/gentoobrowse/console/packagemetadata.xml
@@ -25,19 +25,12 @@
 			<project2:sqltask name="update" datasource="postgres">
 				<sql>
 					UPDATE packages SET
-						summary = ?,
-						maintainer = ?,
-						herd = ?,
-						metadatadate = ?
-					WHERE packageid = ?
+						summary = <param source="parent" name="longdesc" />,
+						maintainer = <param source="parent" name="maintainer" />,
+						herd = <param source="parent" name="herd" />,
+						metadatadate = <param source="parent" name="moddate" depth="2" />
+					WHERE packageid = <param source="parent" name="packageid" depth="2" />
 				</sql>
-				<parameters>
-					<param name="0"><value source="parent" name="longdesc" depth="1" /></param>
-					<param name="1"><value source="parent" name="maintainer" depth="1" /></param>
-					<param name="2"><value source="parent" name="herd" depth="1" /></param>
-					<param name="3"><value source="parent" name="moddate" depth="2" /></param>
-					<param name="4"><value source="parent" name="packageid" depth="2" /></param>
-				</parameters>
 			</project2:sqltask>
 		</project2:iterate>
 	</project2:iterate>
diff --git a/gentoobrowse/request/doconfirm.xml b/gentoobrowse/request/doconfirm.xml
index 200ae31..6b8eed8 100644
--- a/gentoobrowse/request/doconfirm.xml
+++ b/gentoobrowse/request/doconfirm.xml
@@ -24,9 +24,6 @@
 		</tasks>
 	</project2:iterate>
 	<project2:sqltask datasource="postgres-web">
-		<sql>UPDATE users SET verifyguid = NULL WHERE verifyguid = ?</sql>
-		<parameters>
-			<param name="0"><value source="param" name="verifyguid" /></param>
-		</parameters>
+		<sql>UPDATE users SET verifyguid = NULL WHERE verifyguid = <param source="param" name="verifyguid" /></sql>
 	</project2:sqltask>
 </view>
diff --git a/gentoobrowse/request/dosignup.xml b/gentoobrowse/request/dosignup.xml
index f9b8819..7b515f9 100644
--- a/gentoobrowse/request/dosignup.xml
+++ b/gentoobrowse/request/dosignup.xml
@@ -33,13 +33,8 @@
 	</project2:sqlcheck>
 	<project2:sqltask datasource="postgres-web" name="insertUser">
 		<sql>INSERT INTO users(username, userrealname, userpassword, useremail, verifyguid)
-			VALUES(?, ?, ?, ?, uuid_generate_v4())</sql>
-		<parameters>
-			<param name="0"><value source="param" name="username" /></param>
-			<param name="1"><value source="param" name="realname" /></param>
-			<param name="2"><value source="param" name="password" /></param>
-			<param name="3"><value source="param" name="email" /></param>
-		</parameters>
+			VALUES(<param source="param" name="username" />, <param source="param" name="realname" />,
+					<param source="param" name="password" />, <param source="param" name="email" />, uuid_generate_v4())</sql>
 	</project2:sqltask>
 	<project2:sendmail server="smtp.random.lan:25" subject="Welcome to Gentoo Browse" name="sendWelcome"
 			present="welcome" from="&quot;Gentoo Browse&quot; &lt;noreply@gentoobrowse.randomdan.homeip.net&gt;">
diff --git a/gentoobrowse/request/track.xml b/gentoobrowse/request/track.xml
index 2043e80..41eb328 100644
--- a/gentoobrowse/request/track.xml
+++ b/gentoobrowse/request/track.xml
@@ -14,11 +14,8 @@
 		</parameters>
 	</project2:sqlcheck>
 	<project2:sqltask datasource="postgres-web" name="addTrack">
-		<sql>INSERT INTO user_packages(packageid, userid, trackedsince) VALUES(?, ?, NOW())</sql>
-		<parameters>
-			<param name="0"><value source="param" name="packageid" /></param>
-			<param name="1"><value source="session" name="loggedInUserID" /></param>
-		</parameters>
+		<sql>INSERT INTO user_packages(packageid, userid, trackedsince) VALUES(
+				<param source="param" name="packageid" />, <param source="session" name="loggedInUserID" />, NOW())</sql>
 	</project2:sqltask>
 </request>
 
diff --git a/gentoobrowse/request/untrack.xml b/gentoobrowse/request/untrack.xml
index ceac001..69acd33 100644
--- a/gentoobrowse/request/untrack.xml
+++ b/gentoobrowse/request/untrack.xml
@@ -3,13 +3,9 @@
 	<project2:sqltask datasource="postgres-web" name="addTrack">
 		<sql>
 			DELETE FROM user_packages
-			WHERE packageid = ?
-			AND userid = ?
+			WHERE packageid = <param source="param" name="packageid" />
+			AND userid = <param source="session" name="loggedInUserID" />
 		</sql>
-		<parameters>
-			<param name="0"><value source="param" name="packageid" /></param>
-			<param name="1"><value source="session" name="loggedInUserID" /></param>
-		</parameters>
 	</project2:sqltask>
 </request>