Index: jdbc1/DatabaseMetaData.java =================================================================== RCS file: /projects/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java,v retrieving revision 1.40 diff -c -r1.40 DatabaseMetaData.java *** jdbc1/DatabaseMetaData.java 2001/11/19 23:16:45 1.40 --- jdbc1/DatabaseMetaData.java 2002/01/15 20:23:02 *************** *** 2299,2306 **** + "pg_class ic,pg_proc p, pg_index i " + "WHERE t.tgrelid=c.oid AND t.tgconstrrelid=c2.oid " + "AND t.tgfoid=p.oid AND tgisconstraint " ! + ((primaryTable != null) ? "AND c2.relname='" + primaryTable + "' " : "") ! + ((foreignTable != null) ? "AND c.relname='" + foreignTable + "' " : "") + "AND i.indrelid=c.oid " + "AND i.indexrelid=ic.oid AND i.indisprimary " + "ORDER BY c.relname,c2.relname" --- 2299,2306 ---- + "pg_class ic,pg_proc p, pg_index i " + "WHERE t.tgrelid=c.oid AND t.tgconstrrelid=c2.oid " + "AND t.tgfoid=p.oid AND tgisconstraint " ! + ((primaryTable != null) ? "AND c.relname='" + primaryTable + "' " : "") ! + ((foreignTable != null) ? "AND c2.relname='" + foreignTable + "' " : "") + "AND i.indrelid=c.oid " + "AND i.indexrelid=ic.oid AND i.indisprimary " + "ORDER BY c.relname,c2.relname" Index: jdbc2/DatabaseMetaData.java =================================================================== RCS file: /projects/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java,v retrieving revision 1.47 diff -c -r1.47 DatabaseMetaData.java *** jdbc2/DatabaseMetaData.java 2001/11/19 23:16:46 1.47 --- jdbc2/DatabaseMetaData.java 2002/01/15 20:23:11 *************** *** 2427,2434 **** + "pg_class ic,pg_proc p, pg_index i " + "WHERE t.tgrelid=c.oid AND t.tgconstrrelid=c2.oid " + "AND t.tgfoid=p.oid AND tgisconstraint " ! + ((primaryTable != null) ? "AND c2.relname='" + primaryTable + "' " : "") ! + ((foreignTable != null) ? "AND c.relname='" + foreignTable + "' " : "") + "AND i.indrelid=c.oid " + "AND i.indexrelid=ic.oid AND i.indisprimary " + "ORDER BY c.relname,c2.relname" --- 2427,2434 ---- + "pg_class ic,pg_proc p, pg_index i " + "WHERE t.tgrelid=c.oid AND t.tgconstrrelid=c2.oid " + "AND t.tgfoid=p.oid AND tgisconstraint " ! + ((primaryTable != null) ? "AND c.relname='" + primaryTable + "' " : "") ! + ((foreignTable != null) ? "AND c2.relname='" + foreignTable + "' " : "") + "AND i.indrelid=c.oid " + "AND i.indexrelid=ic.oid AND i.indisprimary " + "ORDER BY c.relname,c2.relname"