diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
index 0d2661e561..f439f95a4d 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
@@ -8,7 +8,7 @@ import java.util.Vector;
 import org.postgresql.largeobject.*;
 import org.postgresql.util.PSQLException;
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Statement.java,v 1.9 2002/11/20 07:34:32 barry Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Statement.java,v 1.10 2002/11/20 20:37:53 barry Exp $
  * This class defines methods of the jdbc2 specification.  This class extends
  * org.postgresql.jdbc1.AbstractJdbc1Statement which provides the jdbc1
  * methods.  The real Statement class (for jdbc2) is org.postgresql.jdbc2.Jdbc2Statement
@@ -83,18 +83,18 @@ public abstract class AbstractJdbc2Statement extends org.postgresql.jdbc1.Abstra
 			String[] l_origBindTypes = m_bindTypes;
 
 			for (i = 0;i < size;i++) {
-                //set state from batch
-                Object[] l_statement = (Object[])batch.elementAt(i);
+				//set state from batch
+				Object[] l_statement = (Object[])batch.elementAt(i);
 				this.m_sqlFragments = (String[])l_statement[0];
 				this.m_binds = (Object[])l_statement[1];
 				this.m_bindTypes = (String[])l_statement[2];
 				result[i] = this.executeUpdate();
 			}
 
-            //restore state of statement
-            String[] m_sqlFragments = l_origSqlFragments;
-			Object[] m_binds = l_origBinds;
-			String[] m_bindTypes = l_origBindTypes;
+			//restore state of statement
+			m_sqlFragments = l_origSqlFragments;
+			m_binds = l_origBinds;
+			m_bindTypes = l_origBindTypes;
 
 		}
 		catch (SQLException e)
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java
index 5d34547737..27a8ca9173 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java
@@ -22,7 +22,7 @@ public abstract class AbstractJdbc3DatabaseMetaData extends org.postgresql.jdbc2
 	 */
 	public boolean supportsSavepoints() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -36,7 +36,7 @@ public abstract class AbstractJdbc3DatabaseMetaData extends org.postgresql.jdbc2
 	 */
 	public boolean supportsNamedParameters() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -52,7 +52,7 @@ public abstract class AbstractJdbc3DatabaseMetaData extends org.postgresql.jdbc2
 	 */
 	public boolean supportsMultipleOpenResults() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -66,7 +66,7 @@ public abstract class AbstractJdbc3DatabaseMetaData extends org.postgresql.jdbc2
 	 */
 	public boolean supportsGetGeneratedKeys() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -244,7 +244,7 @@ public abstract class AbstractJdbc3DatabaseMetaData extends org.postgresql.jdbc2
 	 */
 	public boolean supportsResultSetHoldability(int holdability) throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return true;
 	}
 
 	/**
@@ -259,7 +259,7 @@ public abstract class AbstractJdbc3DatabaseMetaData extends org.postgresql.jdbc2
 	 */
 	public int getResultSetHoldability() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return ResultSet.HOLD_CURSORS_OVER_COMMIT;
 	}
 
 	/**