X-Git-Url: http://jaekl.net/gitweb/?a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Fcfb%2Fdb%2Fdriver%2FPostgresqlDriver.java;h=ce4a802fe39c7cb12dde8db661d8adb8e26796ee;hb=a1378c84c773511e4ffe99fb419da67af188aff7;hp=8e19fc49aca4f63ef76336e2fa0309a13d18c228;hpb=58107a0cbb49652e7772ce80fb73d2c027590eb1;p=cfb.git

diff --git a/prod/net/jaekl/cfb/db/driver/PostgresqlDriver.java b/prod/net/jaekl/cfb/db/driver/PostgresqlDriver.java
index 8e19fc4..ce4a802 100644
--- a/prod/net/jaekl/cfb/db/driver/PostgresqlDriver.java
+++ b/prod/net/jaekl/cfb/db/driver/PostgresqlDriver.java
@@ -4,10 +4,13 @@ package net.jaekl.cfb.db.driver;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
 import net.jaekl.cfb.db.Sequence;
+import net.jaekl.cfb.db.Column.Type;
 
 public class PostgresqlDriver extends DbDriver {
 
@@ -30,8 +33,34 @@ public class PostgresqlDriver extends DbDriver {
 	}
 	
 	@Override 
-	public String nextValSql(Sequence seq) 
+	public long nextVal(Connection con, Sequence seq) throws SQLException
 	{
-		return " SELECT NEXTVAL('" + seq.getName() + "') ";
+		String sql = " SELECT NEXTVAL(?) ";
+		
+		try (PreparedStatement ps = con.prepareStatement(sql)) 
+		{
+			ps.setString(1, seq.getName());
+			
+			try (ResultSet rs = ps.executeQuery()) {
+				if (rs.next()) {
+					return rs.getLong(1);
+				}
+			}
+		}
+		
+		throw new SQLException("No value returned for sequence:  " + sql);
 	}
-}
+	
+	
+	@Override
+	protected String typeName(Type type) {
+		// Special case:  TIMESTAMPTZ stored as INTEGER (milliseconds since the epoch)
+		// Reading a TIMESTAMPTZ back from the DB, and converting it to a java.util.Date,
+		// is fraught with peril.  The best way around this is to store the dates in 
+		// milliseconds-since-the-epoch (01.01.1970 00:00:00.000 UTC).
+		if (Type.TIMESTAMPTZ.equals(type)) {
+			return "BIGINT";
+		}
+		
+		return type.toString();
+	}}