Обсуждение: Recent patch to DatabaseMetaData
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. Thanks, 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/
[ 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_')"}
Quoting Bruce Momjian <pgman@candle.pha.pa.us>: > 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: The file that's important is the jdbc/DatabaseMetaData.java file as that's the one I've been updating recently. I've got to syncronise the jdbc1 files when I get JDK1.1 back online. I've already made the modifications to my copy here on that file. Can you backout just the changes to that one file? Peter > > 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 > -- 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/
[ Charset ISO-8859-1 unsupported, converting... ]
> Quoting Bruce Momjian <pgman@candle.pha.pa.us>:
>
> > 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:
>
> The file that's important is the jdbc/DatabaseMetaData.java file as that's the
> one I've been updating recently. I've got to syncronise the jdbc1 files when I
> get JDK1.1 back online.
>
> I've already made the modifications to my copy here on that file. Can you
> backout just the changes to that one file?
Sure, which file do you want backed out?
./org/postgresql/jdbc1/DatabaseMetaData.java
./org/postgresql/jdbc2/DatabaseMetaData.java
./postgresql/jdbc1/DatabaseMetaData.java
./postgresql/jdbc2/DatabaseMetaData.java
--
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
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/
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_')"}
Yes, I asked recently if these should be removed. You want me to remove them? > > > ./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
Quoting Bruce Momjian <pgman@candle.pha.pa.us>: > Yes, I asked recently if these should be removed. You want me to > remove > them? Yes please. the entire ./postgresql/ directory is dead. I left it there for the 7.0 series but for 7.1 it's obsolete. Thanks, Peter > > > > > > ./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 > -- 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/
> > ./postgresql/jdbc1/DatabaseMetaData.java > > ./postgresql/jdbc2/DatabaseMetaData.java > > Hmmm, I thought I deleted those from CVS (it's old obsolete pre 7.0 code). Removed. -- 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
Quoting Bruce Momjian <pgman@candle.pha.pa.us>: > > > ./postgresql/jdbc1/DatabaseMetaData.java > > > ./postgresql/jdbc2/DatabaseMetaData.java > > > > Hmmm, I thought I deleted those from CVS (it's old obsolete pre 7.0 > code). > > Removed. Thanks. My stuff now committed. 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/