Re: Recent patch to DatabaseMetaData

OK, backed out and patch attached.

[ Charset ISO-8859-1 unsupported, converting... ]
> Quoting Bruce Momjian <pgman@candle.pha.pa.us>:
>
>
> This one please:
> >     ./org/postgresql/jdbc2/DatabaseMetaData.java
>
> Thanks.
>
> >     ./postgresql/jdbc1/DatabaseMetaData.java
> >     ./postgresql/jdbc2/DatabaseMetaData.java
>
> Hmmm, I thought I deleted those from CVS (it's old obsolete pre 7.0 code).
>
> Peter
>
> --
> Peter Mount peter@retep.org.uk
> PostgreSQL JDBC Driver: http://www.retep.org.uk/postgres/
> RetepPDF PDF library for Java: http://www.retep.org.uk/pdf/
>


--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026
Index: DatabaseMetaData.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** DatabaseMetaData.java    2001/01/24 09:22:01    1.11
--- DatabaseMetaData.java    2001/02/09 22:23:47    1.12
***************
*** 1617,1624 ****
     * </ol>
     *
     * <p>The valid values for the types parameter are:
!    * "TABLE", "INDEX", "LARGE OBJECT", "SEQUENCE", "SYSTEM TABLE" and
!    * "SYSTEM INDEX"
     *
     * @param catalog a catalog name; For org.postgresql, this is ignored, and
     * should be set to null
--- 1617,1623 ----
     * </ol>
     *
     * <p>The valid values for the types parameter are:
!    * "TABLE", "INDEX", "SEQUENCE", "SYSTEM TABLE" and "SYSTEM INDEX"
     *
     * @param catalog a catalog name; For org.postgresql, this is ignored, and
     * should be set to null
***************
*** 1721,1730 ****
    //
    // 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='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_')"},
      {"SYSTEM TABLE",    "(relkind='r' and relname ~ '^pg_')"},
      {"SYSTEM INDEX",    "(relkind='i' and relname ~ '^pg_')"}
--- 1720,1728 ----
    //
    // IMPORTANT: the query must be enclosed in ( )
    private static final String getTableTypes[][] = {
!     {"TABLE",        "(relkind='r' and relhasrules='f' and relname !~ '^pg_')"},
!     {"VIEW",        "(relkind='v' and relname !~ '^pg_')"},
!     {"INDEX",        "(relkind='i' and relname !~ '^pg_')"},
      {"SEQUENCE",    "(relkind='S' and relname !~ '^pg_')"},
      {"SYSTEM TABLE",    "(relkind='r' and relname ~ '^pg_')"},
      {"SYSTEM INDEX",    "(relkind='i' and relname ~ '^pg_')"}