As if my JDBC patch hasn't already caused enough grief, there is now a

one-line change necessary. Due to the Mark Holloman "New Relkind for
Views" patch, my support for views in the driver will need to be updated
to match. The change to DatabaseMetaData.getTableTypes[][] is as
follows:

-    {"VIEW",           "(relkind='r' and relhasrules='t' and relname !~
'^pg_' and relname !~ '^xinv')"},
+    {"VIEW",           "(relkind='v' and relname !~ '^pg_' and relname
!~ '^xinv')"},

Christopher Cain

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index 52e871e..674c0d1 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -1722,7 +1722,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   // IMPORTANT: the query must be enclosed in ( )
   private static final String getTableTypes[][] = {
     {"TABLE",          "(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"VIEW",           "(relkind='r' and relhasrules='t' and relname !~ '^pg_' and relname !~ '^xinv')"},
+    {"VIEW",        "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"},
     {"INDEX",          "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
     {"LARGE OBJECT",   "(relkind='r' and relname ~ '^xinv')"},
     {"SEQUENCE",       "(relkind='S' and relname !~ '^pg_')"},

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index 3b30d0a..4b8451d 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -1722,7 +1722,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
   // IMPORTANT: the query must be enclosed in ( )
   private static final String getTableTypes[][] = {
     {"TABLE",          "(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"},
-    {"VIEW",           "(relkind='r' and relhasrules='t' and relname !~ '^pg_' and relname !~ '^xinv')"},
+    {"VIEW",        "(relkind='v' and relname !~ '^pg_' and relname !~ '^xinv')"},
     {"INDEX",          "(relkind='i' and relname !~ '^pg_' and relname !~ '^xinx')"},
     {"LARGE OBJECT",   "(relkind='r' and relname ~ '^xinv')"},
     {"SEQUENCE",       "(relkind='S' and relname !~ '^pg_')"},