mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Cormac Twomey

Browse Source 
fixes getIndexInfo throwing NullPointerException
fixes getIndexInfo improper results when multiple key indexs are used
This commit is contained in:
Dave Cramer 2002-02-22 02:17:13 +00:00
parent 178961ad47
commit 0786c61c14
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
View File

@ -15,7 +15,7 @@ import org.postgresql.util.PSQLException;
/* /*
* This class provides information about the database as a whole. * This class provides information about the database as a whole.
* *
* $Id: DatabaseMetaData.java,v 1.48 2002/01/18 17:21:31 davec Exp $ * $Id: DatabaseMetaData.java,v 1.49 2002/02/22 02:17:13 davec Exp $
* *
* <p>Many of the methods here return lists of information in ResultSets. You * <p>Many of the methods here return lists of information in ResultSets. You
* can use the normal ResultSet methods such as getString and getInt to * can use the normal ResultSet methods such as getString and getInt to
@ -2919,6 +2919,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
{ {
columnOrdinals[o++] = Integer.parseInt(stok.nextToken()); columnOrdinals[o++] = Integer.parseInt(stok.nextToken());
} }
java.sql.ResultSet columnNameRS = connection.ExecSQL("select a.attname FROM pg_attribute a WHERE a.attrelid = " + r.getInt(9));
for (int i = 0; i < columnOrdinals.length; i++) for (int i = 0; i < columnOrdinals.length; i++)
{ {
byte [] [] tuple = new byte [13] []; byte [] [] tuple = new byte [13] [];
@ -2934,12 +2936,11 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
Integer.toString(tableIndexHashed).getBytes() : Integer.toString(tableIndexHashed).getBytes() :
Integer.toString(tableIndexOther).getBytes(); Integer.toString(tableIndexOther).getBytes();
tuple[7] = Integer.toString(i + 1).getBytes(); tuple[7] = Integer.toString(i + 1).getBytes();
java.sql.ResultSet columnNameRS = connection.ExecSQL("select a.attname FROM pg_attribute a WHERE (a.attnum = " + columnOrdinals[i] + ") AND (a.attrelid = " + r.getInt(9) + ")");
if (columnNameRS.next()) if (columnNameRS.next())
tuple[8] = columnNameRS.getBytes(1); tuple[8] = columnNameRS.getBytes(1);
else else
tuple[8] = "".getBytes(); tuple[8] = "".getBytes();
tuple[8] = columnNameRS.getBytes(1);
tuple[9] = null; // sort sequence ??? tuple[9] = null; // sort sequence ???
tuple[10] = r.getBytes(7); // inexact tuple[10] = r.getBytes(7); // inexact
tuple[11] = r.getBytes(8); tuple[11] = r.getBytes(8);