Updated ODBC Bridge to OpenJDK7 part 2

6 files changed, 74 insertions, 6 deletions

diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java b/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
index 81c92fc2..12a15ff3 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -641,4 +641,22 @@ public class JdbcOdbcCallableStatement extends JdbcOdbcPreparedStatement impleme
         }
         
     }
+
+
+    /**
+     * {@inheritDoc}
+     */
+	public <T> T getObject(int parameterIndex, Class<T> type)
+			throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+
+    /**
+     * {@inheritDoc}
+     */
+	public <T> T getObject(String parameterName, Class<T> type)
+			throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
 }
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java b/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java
index 7ea47a4f..5e075b2a 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java b/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
index 7550b965..df631c5b 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -1190,4 +1190,22 @@ public class JdbcOdbcDatabaseMetaData implements DatabaseMetaData{
             throw JdbcOdbcUtils.createSQLException(th);
         }
     }
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public ResultSet getPseudoColumns(String catalog, String schemaPattern,
+			String tableNamePattern, String columnNamePattern)
+			throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean generatedKeyAlwaysReturned() throws SQLException {
+		return false;
+	}
 }
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java b/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java
index 0b8441f5..9eb1d9d4 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java b/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java
index 7b4c91b6..398f368b 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -779,4 +779,21 @@ public class JdbcOdbcResultSet extends JdbcOdbcObject implements ResultSet{
         }
     }
 
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public <T> T getObject(String columnLabel, Class<T> type)
+			throws SQLException {
+		throw new SQLFeatureNotSupportedException();
+	}
+
 }
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java b/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java
index 76123b34..358ae0e7 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Volker Berlin (i-net software)
+  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -368,4 +368,19 @@ public class JdbcOdbcStatement implements Statement{
         rs = currentRs;
     }
 
+
+    /**
+     * {@inheritDoc}
+     */
+	public void closeOnCompletion() throws SQLException {
+	}
+
+
+    /**
+     * {@inheritDoc}
+     */
+	public boolean isCloseOnCompletion() throws SQLException {
+		return false;
+	}
+
 }