|
 |
100e1c |
diff -ur hsqldb.orig/build/build.xml hsqldb/build/build.xml
|
|
|
100e1c |
--- hsqldb.orig/build/build.xml 2010-06-23 08:49:15.000000000 -0400
|
|
|
100e1c |
+++ hsqldb/build/build.xml 2012-01-24 15:09:43.000000000 -0500
|
|
|
100e1c |
@@ -98,7 +98,11 @@
|
|
|
100e1c |
<echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
|
|
|
100e1c |
</target>
|
|
|
100e1c |
|
|
|
100e1c |
- <target name="javaversion6">
|
|
|
100e1c |
+ <target name="javaversion7">
|
|
|
100e1c |
+ <available classname="java.util.Objects" property="ant.java.iscjava17"/>
|
|
|
100e1c |
+ </target>
|
|
|
100e1c |
+
|
|
|
100e1c |
+ <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjava17">
|
|
|
100e1c |
<available classname="java.net.IDN" property="ant.java.iscjava16"/>
|
|
|
100e1c |
</target>
|
|
|
100e1c |
|
|
|
100e1c |
@@ -210,6 +214,7 @@
|
|
|
100e1c |
<arg value="+JAVA2FULL"/>
|
|
|
100e1c |
<arg value="-JAVA4"/>
|
|
|
100e1c |
<arg value="-JAVA6"/>
|
|
|
100e1c |
+ <arg value="-JAVA7"/>
|
|
|
100e1c |
</java>
|
|
|
100e1c |
</target>
|
|
|
100e1c |
|
|
|
100e1c |
@@ -244,6 +249,7 @@
|
|
|
100e1c |
<arg value="+JAVA2FULL"/>
|
|
|
100e1c |
<arg value="+JAVA4"/>
|
|
|
100e1c |
<arg value="-JAVA6"/>
|
|
|
100e1c |
+ <arg value="-JAVA7"/>
|
|
|
100e1c |
</java>
|
|
|
100e1c |
</target>
|
|
|
100e1c |
|
|
|
100e1c |
@@ -279,10 +285,47 @@
|
|
|
100e1c |
<arg value="+JAVA2FULL"/>
|
|
|
100e1c |
<arg value="+JAVA4"/>
|
|
|
100e1c |
<arg value="+JAVA6"/>
|
|
|
100e1c |
+ <arg value="-JAVA7"/>
|
|
|
100e1c |
+ </java>
|
|
|
100e1c |
+ </target>
|
|
|
100e1c |
+
|
|
|
100e1c |
+
|
|
|
100e1c |
+ description="self explanatory" if="ant.java.iscjava17">
|
|
|
100e1c |
+ <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/persist/Logger.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
|
|
|
100e1c |
+ <arg file="${src}/org/hsqldb/HsqlDateTime.java"/>
|
|
|
100e1c |
+ <arg value="+JAVA2"/>
|
|
|
100e1c |
+ <arg value="+JAVA2FULL"/>
|
|
|
100e1c |
+ <arg value="+JAVA4"/>
|
|
|
100e1c |
+ <arg value="+JAVA6"/>
|
|
|
100e1c |
+ <arg value="+JAVA7"/>
|
|
|
100e1c |
</java>
|
|
|
100e1c |
</target>
|
|
|
100e1c |
|
|
|
100e1c |
-
|
|
|
100e1c |
+
|
|
|
100e1c |
description="compiles the /store folder">
|
|
|
100e1c |
|
|
|
100e1c |
destdir="classes"
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcCallableStatement.java hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2010-02-27 12:04:52.000000000 -0500
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-01-24 15:00:15.000000000 -0500
|
|
|
100e1c |
@@ -3379,4 +3379,20 @@
|
|
|
100e1c |
*/
|
|
|
100e1c |
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
}
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcConnection.java hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcConnection.java 2010-02-27 12:04:52.000000000 -0500
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-01-24 14:53:02.000000000 -0500
|
|
|
100e1c |
@@ -50,6 +50,14 @@
|
|
|
100e1c |
*/
|
|
|
100e1c |
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+import java.util.concurrent.Executor;
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
+
|
|
|
100e1c |
import java.sql.PreparedStatement;
|
|
|
100e1c |
import java.sql.SQLException;
|
|
|
100e1c |
import java.sql.SQLWarning;
|
|
|
100e1c |
@@ -2794,4 +2802,33 @@
|
|
|
100e1c |
*/
|
|
|
100e1c |
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+ public int getNetworkTimeout() throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public void setNetworkTimeout(Executor executor, int millis) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public void abort(Executor executor) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public String getSchema() throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public void setSchema(String schema) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
}
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2010-02-27 12:04:52.000000000 -0500
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-01-24 15:03:07.000000000 -0500
|
|
|
100e1c |
@@ -5697,4 +5697,21 @@
|
|
|
100e1c |
*/
|
|
|
100e1c |
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+ public boolean generatedKeyAlwaysReturned() throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
|
|
|
100e1c |
+ String tableNamePattern, String columnNamePattern) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
}
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcDataSource.java hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcDataSource.java 2010-02-27 12:04:52.000000000 -0500
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-01-24 15:08:29.000000000 -0500
|
|
|
100e1c |
@@ -47,6 +47,13 @@
|
|
|
100e1c |
//#endif JAVA4
|
|
|
100e1c |
import org.hsqldb.jdbcDriver;
|
|
|
100e1c |
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
100e1c |
+import java.util.logging.Logger;
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
+
|
|
|
100e1c |
// boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
|
|
|
100e1c |
|
|
|
100e1c |
/**
|
|
|
100e1c |
@@ -325,4 +332,14 @@
|
|
|
100e1c |
*/
|
|
|
100e1c |
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new SQLFeatureNotSupportedException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
}
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcResultSet.java hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcResultSet.java 2010-06-23 08:49:19.000000000 -0400
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-01-24 14:55:16.000000000 -0500
|
|
|
100e1c |
@@ -5332,4 +5332,21 @@
|
|
|
100e1c |
*/
|
|
|
100e1c |
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public <T> T getObject(int columnNum, Class<T> type) throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#endif JAVA6
|
|
|
100e1c |
}
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbc/jdbcStatement.java hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbc/jdbcStatement.java 2010-02-27 12:04:52.000000000 -0500
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-01-24 14:58:14.000000000 -0500
|
|
|
100e1c |
@@ -1610,4 +1610,18 @@
|
|
|
100e1c |
}
|
|
|
100e1c |
*/
|
|
|
100e1c |
//#endif JAVA6
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+ public boolean isCloseOnCompletion() throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+
|
|
|
100e1c |
+ public void closeOnCompletion() throws SQLException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
}
|
|
|
100e1c |
diff -ur hsqldb.orig/src/org/hsqldb/jdbcDriver.java hsqldb/src/org/hsqldb/jdbcDriver.java
|
|
|
100e1c |
--- hsqldb.orig/src/org/hsqldb/jdbcDriver.java 2009-02-16 19:29:55.000000000 -0500
|
|
|
100e1c |
+++ hsqldb/src/org/hsqldb/jdbcDriver.java 2012-01-24 15:08:44.000000000 -0500
|
|
|
100e1c |
@@ -42,6 +42,13 @@
|
|
|
100e1c |
import org.hsqldb.persist.HsqlDatabaseProperties;
|
|
|
100e1c |
import org.hsqldb.persist.HsqlProperties;
|
|
|
100e1c |
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+import java.sql.SQLFeatureNotSupportedException;
|
|
|
100e1c |
+import java.util.logging.Logger;
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
+
|
|
|
100e1c |
// fredt@users 20011220 - patch 1.7.0 by fredt
|
|
|
100e1c |
// new version numbering scheme
|
|
|
100e1c |
// fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
|
|
|
100e1c |
@@ -321,4 +328,14 @@
|
|
|
100e1c |
DriverManager.registerDriver(new jdbcDriver());
|
|
|
100e1c |
} catch (Exception e) {}
|
|
|
100e1c |
}
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#ifdef JAVA7
|
|
|
100e1c |
+/*
|
|
|
100e1c |
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
|
|
|
100e1c |
+ {
|
|
|
100e1c |
+ throw new SQLFeatureNotSupportedException("Not supported yet.");
|
|
|
100e1c |
+ }
|
|
|
100e1c |
+*/
|
|
|
100e1c |
+
|
|
|
100e1c |
+//#endif JAVA7
|
|
|
100e1c |
}
|