From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 8 Jul 2001 11:08:13 +0000 (+0000)
Subject: Implement DatabaseMetaData.getCatalogs()
X-Git-Tag: REL7_2_BETA1~905
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b054fb3b2d1ecf8c4f5d05c3a3bf7502e4cec93d;p=postgresql

Implement DatabaseMetaData.getCatalogs()
---

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index a1dfa37be3..a2c2e60db5 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -1825,14 +1825,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    */
   public java.sql.ResultSet getCatalogs() throws SQLException
   {
-    // We don't use catalogs, so we simply return a single catalog name "".
-    Field f[] = new Field[1];
-    Vector v = new Vector();
-    byte[][] tuple = new byte[1][0];
-    f[0] = new Field(connection,"TABLE_CAT",iVarcharOid,32);
-    tuple[0] = "".getBytes();
-    v.addElement(tuple);
-    return new ResultSet(connection,f,v,"OK",1);
+      return connection.createStatement().executeQuery("select datname as TABLE_CAT from pg_database;");
   }
 
   /**
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index b048ca6127..df8aaf849f 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -1825,14 +1825,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    */
   public java.sql.ResultSet getCatalogs() throws SQLException
   {
-    // We don't use catalogs, so we simply return a single catalog name "".
-    Field f[] = new Field[1];
-    Vector v = new Vector();
-    byte[][] tuple = new byte[1][0];
-    f[0] = new Field(connection,"TABLE_CAT",iVarcharOid,32);
-    tuple[0] = "".getBytes();
-    v.addElement(tuple);
-    return new ResultSet(connection,f,v,"OK",1);
+      return connection.createStatement().executeQuery("select datname as TABLE_CAT from pg_database;");
   }
 
   /**