This patch fixes a couple of minor bugs:

1) DatabaseMetaData.getPrimaryKeys() would fail saying that there
is no
   table t.

2) PreparedStatement.getObject() was missing some break statements,
which
   was causing updates not to work with JBuilder (supplied by Aaron
   Dunlop).

jdbc fixes from Peter.

diff --git a/src/interfaces/jdbc/postgresql/DatabaseMetaData.java b/src/interfaces/jdbc/postgresql/DatabaseMetaData.java
index e3ffc3450ef802e60ea878b4f44a2bfe5628cccb..3aef2068cd37f37a5533358b407aa6b35c9b2328 100644 (file)
--- a/src/interfaces/jdbc/postgresql/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/postgresql/DatabaseMetaData.java
@@ -2121,7 +2121,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
                                                     "ic.relname AS COLUMN_NAME," +
                                                     "'1' as KEY_SEQ,"+ // -- fake it as a String for now
                                                     "t.typname as PK_NAME " +
-                                                    " FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a " +
+                                                    " FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a, pg_type t " +
                                                     " WHERE relkind = 'r' " + //    -- not indices
                                                     "  and bc.relname ~ '"+table+"'" +
                                                     "  and i.indrelid = bc.oid" +

diff --git a/src/interfaces/jdbc/postgresql/PreparedStatement.java b/src/interfaces/jdbc/postgresql/PreparedStatement.java
index 659375064d3df97e191c2a9513d0869d4247410f..1f82314e115c5f31e7070884c7e1f2028bd6446f 100644 (file)
--- a/src/interfaces/jdbc/postgresql/PreparedStatement.java
+++ b/src/interfaces/jdbc/postgresql/PreparedStatement.java
@@ -470,14 +470,19 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
                        case Types.VARCHAR:
                        case Types.LONGVARCHAR:
                                setString(parameterIndex, x.toString());
+                               break;
                        case Types.DATE:
                                setDate(parameterIndex, (java.sql.Date)x);
+                               break;
                        case Types.TIME:
                                setTime(parameterIndex, (Time)x);
+                               break;
                        case Types.TIMESTAMP:
                                setTimestamp(parameterIndex, (Timestamp)x);
+                               break;
                        case Types.OTHER:
                                setString(parameterIndex, ((PGobject)x).getValue());
+                               break;
                        default:
                                throw new SQLException("Unknown Types value");
                }