Added toParameter() to update/set commands

Also allow generation of parameterized update statements for reuse.

docs/04_examples.mkd

@@ -55,6 +55,11 @@ db.from(p).set(p.productName).to("updated")
 	.increment(p.unitPrice).by(3.14)
 	.increment(p.unitsInStock).by(2)
 	.where(p.productId).is(1).update();
+	
+// reusable, parameterized update query
+String q = db.from(p).set(p.productName).toParameter().where(p.productId).is(1).toSQL();
+db.executeUpdate(q, "Lettuce");
+
 %ENDCODE%
 
 ## Merge Statements

docs/05_releases.mkd

@@ -6,6 +6,12 @@
 
 **%VERSION%** ([zip](http://code.google.com/p/iciql/downloads/detail?name=%ZIP%)|[jar](http://code.google.com/p/iciql/downloads/detail?name=%JAR%))   *released %BUILDDATE%*
 
+- Added toParameter() option for SET commands and allow generating parameterized UPDATE statements<br/>
+String q = db.from(t).set(t.timestamp).toParameter().where(t.id).is(5).toSQL();<br/>
+db.executeUpdate(q, new Date());
+
+**0.7.8** &nbsp; *released 2012-01-11*
+
 - Replaced non-threadsafe counter used for assigning AS identifiers in JOIN statements with an AtomicInteger
 - Prevent negative rollover of the AS counter
 - Added optional alias parameter to *Query.toSQL* and *QueryWhere.toSQL* to force generated statement to prefix an AS identifier or, alternatively, the tablename.  

src/com/iciql/Constants.java

@@ -25,14 +25,14 @@ public class Constants {
 
 	// The build script extracts this exact line so be careful editing it
 	// and only use A-Z a-z 0-9 .-_ in the string.
-	public static final String VERSION = "0.7.8";
+	public static final String VERSION = "0.7.9";
 
 	// The build script extracts this exact line so be careful editing it
 	// and only use A-Z a-z 0-9 .-_ in the string.
-	public static final String VERSION_DATE = "2012-01-11";
+	public static final String VERSION_DATE = "2012-01-24";
 
 	// The build script extracts this exact line so be careful editing it
 	// and only use A-Z a-z 0-9 .-_ in the string.
-	public static final String API_CURRENT = "12";
+	public static final String API_CURRENT = "13";
 
 }

src/com/iciql/Db.java

@@ -572,11 +572,22 @@ public class Db {
 	 *            the SQL statement
 	 * @return the update count
 	 */
-	public int executeUpdate(String sql) {
+	public int executeUpdate(String sql, Object... args) {
 		Statement stat = null;
 		try {
-			stat = conn.createStatement();
-			int updateCount = stat.executeUpdate(sql);
+			int updateCount;
+			if (args.length == 0) {
+				stat = conn.createStatement();
+				updateCount = stat.executeUpdate(sql);
+			} else {
+				PreparedStatement ps = conn.prepareStatement(sql);				
+				int i = 1;
+				for (Object arg : args) {
+					ps.setObject(i++, arg);
+				}
+				updateCount = ps.executeUpdate();
+				stat = ps;
+			}			
 			return updateCount;
 		} catch (SQLException e) {
 			throw new IciqlException(e);

src/com/iciql/Query.java

@@ -160,32 +160,46 @@ public class Query<T> {
 	 */
 	public <K> String toSQL(boolean distinct, K k) {
 		SQLStatement stat = new SQLStatement(getDb());
-		stat.appendSQL("SELECT ");
-		if (distinct) {
-			stat.appendSQL("DISTINCT ");
-		}
-		if (k != null) {
-			SelectTable<?> sel = getSelectTable(k);
-			if (sel == null) {
-				// unknown alias, use wildcard
-				IciqlLogger.warn("Alias {0} is not defined in the statement!", k.getClass());
-				stat.appendSQL("*");
-			} else if (isJoin()) {
-				// join query, use AS alias
-				String as = sel.getAs();
-				stat.appendSQL(as + ".*");
-			} else {
-				// schema.table.*
-				String schema = sel.getAliasDefinition().schemaName;
-				String table = sel.getAliasDefinition().tableName;
-				String as = getDb().getDialect().prepareTableName(schema, table);
-				stat.appendSQL(as + ".*");
+		if (updateColumnDeclarations.size() > 0) {
+			stat.appendSQL("UPDATE ");
+			from.appendSQL(stat);
+			stat.appendSQL(" SET ");
+			int i = 0;
+			for (UpdateColumn declaration : updateColumnDeclarations) {
+				if (i++ > 0) {
+					stat.appendSQL(", ");
+				}
+				declaration.appendSQL(stat);
 			}
+			appendWhere(stat);
 		} else {
-			// alias unspecified, use wildcard
-			stat.appendSQL("*");
-		}
-		appendFromWhere(stat);
+			stat.appendSQL("SELECT ");
+			if (distinct) {
+				stat.appendSQL("DISTINCT ");
+			}
+			if (k != null) {
+				SelectTable<?> sel = getSelectTable(k);
+				if (sel == null) {
+					// unknown alias, use wildcard
+					IciqlLogger.warn("Alias {0} is not defined in the statement!", k.getClass());
+					stat.appendSQL("*");
+				} else if (isJoin()) {
+					// join query, use AS alias
+					String as = sel.getAs();
+					stat.appendSQL(as + ".*");
+				} else {
+					// schema.table.*
+					String schema = sel.getAliasDefinition().schemaName;
+					String table = sel.getAliasDefinition().tableName;
+					String as = getDb().getDialect().prepareTableName(schema, table);
+					stat.appendSQL(as + ".*");
+				}
+			} else {
+				// alias unspecified, use wildcard
+				stat.appendSQL("*");
+			}
+			appendFromWhere(stat);
+		}		
 		return stat.toSQL().trim();
 	}
 

src/com/iciql/UpdateColumnSet.java

@@ -31,6 +31,7 @@ public class UpdateColumnSet<T, A> implements UpdateColumn {
 	private Query<T> query;
 	private A x;
 	private A y;
+	private boolean isParameter;
 
 	UpdateColumnSet(Query<T> query, A x) {
 		this.query = query;
@@ -43,10 +44,20 @@ public class UpdateColumnSet<T, A> implements UpdateColumn {
 		return query;
 	}
 
+	public Query<T> toParameter() {
+		query.addUpdateColumnDeclaration(this);
+		isParameter = true;
+		return query;
+	}
+
 	public void appendSQL(SQLStatement stat) {
 		query.appendSQL(stat, null, x);
-		stat.appendSQL("=");
-		query.appendSQL(stat, x, y);
+		stat.appendSQL(" = ");
+		if (isParameter) {			
+			query.appendSQL(stat, x, RuntimeParameter.PARAMETER);
+		} else {
+			query.appendSQL(stat, x, y);
+		}
 	}
 
 }

tests/com/iciql/test/RuntimeQueryTest.java

@@ -83,6 +83,21 @@ public class RuntimeQueryTest {
 		assertEquals("SELECT * FROM StaticQueryTest1 WHERE myTimestamp = '" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(refDate) + "' AND myTimestamp = ?", q8);
 	}
 	
+	@Test
+	public void testRuntimeSet() {
+		Db db = IciqlSuite.openNewDb();
+		
+		// do not test non-H2 databases because dialects will get in the way
+		// e.g. column quoting, etc
+		Assume.assumeTrue(IciqlSuite.isH2(db));
+		
+		StaticQueries.StaticModel1 m = new StaticQueries.StaticModel1();
+		String q = db.from(m).set(m.myTimestamp).toParameter().where(m.id).isParameter().toSQL();
+		db.close();
+		
+		assertEquals("UPDATE StaticQueryTest1 SET myTimestamp = ? WHERE id = ?", q);
+	}
+	
 	@Test
 	public void testRuntimeSelectWildcards() {
 		Db db = IciqlSuite.openNewDb();