X-Git-Url: http://jaekl.net/gitweb/?a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Fcfb%2Fdb%2Fdriver%2FDbDriver.java;h=b8d1ee6bf5f67935a882d62d57667a82cd81a3b6;hb=a1378c84c773511e4ffe99fb419da67af188aff7;hp=a756ab2d39f673b225eee46a4adcfef17bd2b219;hpb=8e5bdf0294e85b4419ee1e582d5677cccd3f736e;p=cfb.git

diff --git a/prod/net/jaekl/cfb/db/driver/DbDriver.java b/prod/net/jaekl/cfb/db/driver/DbDriver.java
index a756ab2..b8d1ee6 100644
--- a/prod/net/jaekl/cfb/db/driver/DbDriver.java
+++ b/prod/net/jaekl/cfb/db/driver/DbDriver.java
@@ -9,7 +9,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import net.jaekl.cfb.db.Column;
@@ -32,6 +31,8 @@ public abstract class DbDriver {
 	
 	public abstract Connection connect(String host, int port, String dbName, String user, String pass) throws SQLException;
 	
+	public abstract long nextVal(Connection con, Sequence seq) throws SQLException;
+	
 	public boolean createTable(Connection con, Table table) throws SQLException 
 	{
 		String sql = createTableSql(table);
@@ -115,8 +116,9 @@ public abstract class DbDriver {
 			int index = 0;
 			for (Condition condition : conditions) {
 				if (condition.getOperation().hasParam()) {
+					Column column = condition.getColumn();
 					index++;
-					ps.setObject(index, condition.getValue());
+					column.setObject(ps, index, condition.getValue());
 				}
 			}
 			
@@ -137,6 +139,9 @@ public abstract class DbDriver {
 				}
 			}
 		}
+		catch (SQLException se) {
+			throw new SQLException("Error with SQL:  " + sql, se);
+		}
 		
 		return result;
 	}
@@ -159,19 +164,10 @@ public abstract class DbDriver {
 				assert(null != data);
 				assert(data.length == table.getNumColumns());
 				
-				for (int col = 0; col < data.length; ++col) {
-					Object obj = data[col];
-					Column column = table.getColumn(col);
-					if (column.getType().equals(Type.TIMESTAMPTZ)) {
-						// Special case:  because there's no good way to read a TIMESTAMPTZ from 
-						// the database using JDBC, we store it as an integer (milliseconds since
-						// the epoch, 01.01.1970 00:00:00.000 UTC).
-						Date date = (Date)obj;
-						ps.setLong(col + 1, date.getTime());
-					}
-					else {
-						ps.setObject(col + 1, data[col]);
-					}
+				for (int idx = 0; idx < data.length; ++idx) {
+					Object obj = data[idx];
+					Column column = table.getColumn(idx);
+					column.setObject(ps, idx + 1, obj);
 					pendingValues++;
 				}
 				ps.addBatch();
@@ -189,22 +185,6 @@ public abstract class DbDriver {
 		return count;
 	}
 	
-	public long nextVal(Connection con, Sequence seq) throws SQLException
-	{
-		String sql = nextValSql(seq);
-		
-		try (PreparedStatement ps = con.prepareStatement(sql)) 
-		{
-			try (ResultSet rs = ps.executeQuery()) {
-				if (rs.next()) {
-					return rs.getLong(1);
-				}
-			}
-		}
-		
-		throw new SQLException("No value returned for sequence:  " + sql);
-	}
-	
 	int checkFlushBatch(PreparedStatement ps, int pendingValues, boolean forceFlush) throws SQLException
  	{
 		int count = 0;
@@ -300,10 +280,10 @@ public abstract class DbDriver {
 				sb.append(sort.getColumn().getName());
 				
 				if (sort.getDirection().equals(Sort.Direction.ASCENDING)) {
-					sb.append(" ASCENDING ");
+					sb.append(" ASC ");
 				}
 				else {
-					sb.append(" DESCENDING ");
+					sb.append(" DESC ");
 				}
 			}
 		}
@@ -389,8 +369,6 @@ public abstract class DbDriver {
 		return "DROP SEQUENCE " + seq.getName();
 	}
 	
-	abstract protected String nextValSql(Sequence seq);
-	
 	boolean isValidInsert(Table table, Object[][] values)
 	{
 		if (null == table) return false;
@@ -407,4 +385,15 @@ public abstract class DbDriver {
 		
 		return true;
 	}
+	
+	int executeUpdate(Connection con, String sql) throws SQLException
+	{
+		try (PreparedStatement ps = con.prepareStatement(sql))
+		{
+			return ps.executeUpdate();
+		}
+		catch (SQLException exc) {
+			throw new SQLException("Failed to executeUpdate:  " + sql, exc);
+		}
+	}
 }