Fix a dumb cut and paste error from my last commit and update some of the

Barry Lind · Barry Lind · commit 1b80e0122f09 · 2002-11-20T20:37:53.000Z
jdbc3 metadata responses

 Modified Files:
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
 	jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
@@ -8,7 +8,7 @@
 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 int[] executeBatch() throws SQLException
 			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
@@ -22,7 +22,7 @@ public AbstractJdbc3DatabaseMetaData(AbstractJdbc3Connection conn)
 	 */
 	public boolean supportsSavepoints() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -36,7 +36,7 @@ public boolean supportsSavepoints() throws SQLException
 	 */
 	public boolean supportsNamedParameters() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -52,7 +52,7 @@ public boolean supportsNamedParameters() throws SQLException
 	 */
 	public boolean supportsMultipleOpenResults() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -66,7 +66,7 @@ public boolean supportsMultipleOpenResults() throws SQLException
 	 */
 	public boolean supportsGetGeneratedKeys() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return false;
 	}
 
 	/**
@@ -244,7 +244,7 @@ public ResultSet getAttributes(String catalog, String schemaPattern,
 	 */
 	public boolean supportsResultSetHoldability(int holdability) throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return true;
 	}
 
 	/**
@@ -259,7 +259,7 @@ public boolean supportsResultSetHoldability(int holdability) throws SQLException
 	 */
 	public int getResultSetHoldability() throws SQLException
 	{
-		throw org.postgresql.Driver.notImplemented();
+		return ResultSet.HOLD_CURSORS_OVER_COMMIT;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public AbstractJdbc3DatabaseMetaData(AbstractJdbc3Connection conn)`
`22`	`22`	`*/`
`23`	`23`	`public boolean supportsSavepoints() throws SQLException`
`24`	`24`	`{`
`25`		`- throw org.postgresql.Driver.notImplemented();`
	`25`	`+ return false;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`@@ -36,7 +36,7 @@ public boolean supportsSavepoints() throws SQLException`
`36`	`36`	`*/`
`37`	`37`	`public boolean supportsNamedParameters() throws SQLException`
`38`	`38`	`{`
`39`		`- throw org.postgresql.Driver.notImplemented();`
	`39`	`+ return false;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
`@@ -52,7 +52,7 @@ public boolean supportsNamedParameters() throws SQLException`
`52`	`52`	`*/`
`53`	`53`	`public boolean supportsMultipleOpenResults() throws SQLException`
`54`	`54`	`{`
`55`		`- throw org.postgresql.Driver.notImplemented();`
	`55`	`+ return false;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
`@@ -66,7 +66,7 @@ public boolean supportsMultipleOpenResults() throws SQLException`
`66`	`66`	`*/`
`67`	`67`	`public boolean supportsGetGeneratedKeys() throws SQLException`
`68`	`68`	`{`
`69`		`- throw org.postgresql.Driver.notImplemented();`
	`69`	`+ return false;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`@@ -244,7 +244,7 @@ public ResultSet getAttributes(String catalog, String schemaPattern,`
`244`	`244`	`*/`
`245`	`245`	`public boolean supportsResultSetHoldability(int holdability) throws SQLException`
`246`	`246`	`{`
`247`		`- throw org.postgresql.Driver.notImplemented();`
	`247`	`+ return true;`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`/**`
`@@ -259,7 +259,7 @@ public boolean supportsResultSetHoldability(int holdability) throws SQLException`
`259`	`259`	`*/`
`260`	`260`	`public int getResultSetHoldability() throws SQLException`
`261`	`261`	`{`
`262`		`- throw org.postgresql.Driver.notImplemented();`
	`262`	`+ return ResultSet.HOLD_CURSORS_OVER_COMMIT;`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`/**`