added varargs to update

dstengle · Feb 17, 2012 · 568b723 · 568b723
1 parent dc06729
commit 568b723
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.classpath b/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>knzn</groupId>
   <artifactId>base</artifactId>
-  <version>0.1.5-SNAPSHOT</version>
+  <version>0.1.6-SNAPSHOT</version>
   <dependencies>
   	<dependency>
   		<groupId>com.google.guava</groupId>

diff --git a/src/main/java/knzn/db/Database.java b/src/main/java/knzn/db/Database.java
@@ -10,6 +10,9 @@ <T> List<T> query(final String sql, final Object[] params,
   <T> List<T> query(final String sql,
       final ResultSetHandler<T> resultSetHandler);
 
-  int update(final String sql, final Object[] params);
+  <T> List<T> query(final String sql, 
+      final ResultSetHandler<T> resultSetHandler, Object... params);
+
+  int update(final String sql, final Object... params);
 
 }
diff --git a/src/main/java/knzn/db/DatabaseImpl.java b/src/main/java/knzn/db/DatabaseImpl.java
@@ -124,7 +124,7 @@ public <T> List<T> query(final String sql, final ResultSetHandler<T> resultSetHa
   }
 
 
-  public int update(final String sql, final Object[] params) {
+  public int update(final String sql, final Object... params) {
     Connection conn = null;
     try {
       conn  = getConnection();

diff --git a/src/main/java/knzn/db/TransactionDatabase.java b/src/main/java/knzn/db/TransactionDatabase.java
@@ -23,8 +23,13 @@ public <T> List<T> query(final String sql, final Object[] params,
   public <T> List<T> query(final String sql, final ResultSetHandler<T> resultSetHandler) {
     return database.query(connection, sql, null, resultSetHandler);
   }
+
+  public <T> List<T> query(String sql, ResultSetHandler<T> resultSetHandler,
+          Object... params) {
+    return database.query(connection, sql, params, resultSetHandler);
+  }
 
-  public int update(final String sql, final Object[] params) {
+  public int update(final String sql, final Object... params) {
     return database.update(connection, sql, params);
   }