Re: Recent patch to DatabaseMetaData

[ Charset ISO-8859-1 unsupported, converting... ]
>
> I missed the commit message about 3 days ago to the file
> src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
>
> Can it be backed out please and the patch sent to me? I've got a commit that's
> failing and there's a lot of methods in that class that have now changed (ie:
> JDBC will now report that outer joins are now possible) and there's the
> TestCase for that class that can't go in because it reports the wrong
> information.

Here is the patch.  I applied it to DatabaseMetaData.java in postgresql/
and jdbc1 and jdbc2.  It was a cleanup of the code to no longer handle
large object files, because they are all stored in a single table now.

Hard to imagine that caused the problems you reported.  I can back it
out, but it hits a couple of files.  Please let me know.  Recent logs
for that file are:

    revision 1.12
    date: 2001/02/09 22:23:47;  author: momjian;  state: Exp;  lines: +4 -6
    Remove last code that assumed xinv/xinx are large object files.
    ----------------------------
    revision 1.11
    date: 2001/01/24 09:22:01;  author: peter;  state: Exp;  lines: +251
    -251
    Removed the 8k row limit reported by DatabaseMetaData
    ----------------------------
    revision 1.10
    date: 2000/11/25 04:32:12;  author: momjian;  state: Exp;  lines: +8 -8
    Allow jdbc to return proper server version number

    Anders Bengtsson
    ----------------------------


--
  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_')"}