diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index 431823631f2..395cbadbe4e 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -15,7 +15,7 @@ import org.postgresql.util.PSQLException;
 /**
  * This class provides information about the database as a whole.
  *
- * $Id: DatabaseMetaData.java,v 1.44 2001/11/09 02:57:50 davec Exp $
+ * $Id: DatabaseMetaData.java,v 1.45 2001/11/14 20:04:00 davec Exp $
  *
  * <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
@@ -2903,8 +2903,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 				tuple[0] = "".getBytes();
 				tuple[1] = "".getBytes();
 				tuple[2] = r.getBytes(1);
-				tuple[3] = r.getBoolean(2) ? "f".getBytes() : "t".getBytes();
-				tuple[4] = null;
+                        tuple[3] = r.getBoolean(2) ? "false".getBytes() : "true".getBytes();
+         	            tuple[4] = null;
 				tuple[5] = r.getBytes(3);
 				tuple[6] = r.getBoolean(4) ?
 						   Integer.toString(tableIndexClustered).getBytes() :
@@ -2913,7 +2913,10 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 						   Integer.toString(tableIndexOther).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) + ")");
-				columnNameRS.next();
+				if(columnNameRS.next())
+                                   tuple[8] = columnNameRS.getBytes(1);
+                                else
+                                   tuple[8] = "".getBytes();
 				tuple[8] = columnNameRS.getBytes(1);
 				tuple[9] = null;  // sort sequence ???
 				tuple[10] = r.getBytes(7);	// inexact