1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
|
--- misc/hsqldb/build/build.xml 2012-07-12 10:58:11.000000000 +0200
+++ misc/build/hsqldb/build/build.xml 2012-07-12 10:49:28.000000000 +0200
@@ -98,16 +98,24 @@
<echo message="ant.java.hasjsse=${ant.java.hasjsse}" />
</target>
- <target name="javaversion6">
+ <target name="javaversion7" unless="ant.java.iscjavaset">
+ <available classname="java.util.Objects" property="ant.java.iscjava17"/>
+ <available classname="java.util.Objects" property="ant.java.iscjavaset"/>
+ </target>
+
+ <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjavaset">
<available classname="java.net.IDN" property="ant.java.iscjava16"/>
+ <available classname="java.net.IDN" property="ant.java.iscjavaset"/>
</target>
- <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjava16">
+ <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjavaset">
<available classname="java.nio.Buffer" property="ant.java.iscjava14"/>
+ <available classname="java.nio.Buffer" property="ant.java.iscjavaset"/>
</target>
- <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjava14">
+ <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjavaset">
<available classname="java.lang.ref.Reference" property="ant.java.iscjava12"/>
+ <available classname="java.lang.ref.Reference" property="ant.java.iscjavaset"/>
</target>
<target name="-prepare" depends="init,javaversion2">
@@ -166,6 +177,7 @@
<java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
<arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
<arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
<arg file="${src}/org/hsqldb/persist/LockFile.java"/>
<arg file="${src}/org/hsqldb/persist/Logger.java"/>
@@ -183,6 +195,7 @@
<java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
<arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
<arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
@@ -210,6 +223,7 @@
<arg value="+JAVA2FULL"/>
<arg value="-JAVA4"/>
<arg value="-JAVA6"/>
+ <arg value="-JAVA7"/>
</java>
</target>
@@ -218,6 +232,7 @@
<java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
<arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
<arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
@@ -244,6 +259,7 @@
<arg value="+JAVA2FULL"/>
<arg value="+JAVA4"/>
<arg value="-JAVA6"/>
+ <arg value="-JAVA7"/>
</java>
</target>
@@ -253,6 +269,43 @@
<java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
<arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
<arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/>
+ <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/>
+ <arg file="${src}/org/hsqldb/persist/LockFile.java"/>
+ <arg file="${src}/org/hsqldb/persist/Logger.java"/>
+ <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/>
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
+ <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/>
+ <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/>
+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
+ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/>
+ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/>
+ <arg file="${src}/org/hsqldb/HsqlDateTime.java"/>
+ <arg value="+JAVA2"/>
+ <arg value="+JAVA2FULL"/>
+ <arg value="+JAVA4"/>
+ <arg value="+JAVA6"/>
+ <arg value="-JAVA7"/>
+ </java>
+ </target>
+
+ <target name="switchtojdk17" depends="switchtojdk16"
+ description="self explanatory" if="ant.java.iscjava17">
+ <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" >
+ <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/>
+ <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/>
+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/>
<arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/>
@@ -279,10 +332,11 @@
<arg value="+JAVA2FULL"/>
<arg value="+JAVA4"/>
<arg value="+JAVA6"/>
+ <arg value="+JAVA7"/>
</java>
</target>
- <target name="store" depends="switchtojdk16"
+ <target name="store" depends="switchtojdk17"
description="compiles the /store folder">
<javac srcdir="${src}"
destdir="classes"
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:47:35.842635642 +0000
@@ -3375,4 +3375,18 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+
+//#endif JAVA7
}
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:47:35.851635628 +0000
@@ -48,6 +48,12 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+import java.util.concurrent.Executor;
+
+//#endif JAVA7
+
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.SQLWarning;
@@ -2793,4 +2799,31 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+ public int getNetworkTimeout() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void setNetworkTimeout(Executor executor, int millis) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void abort(Executor executor) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public String getSchema() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void setSchema(String schema) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+//#endif JAVA7
}
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000
@@ -5693,4 +5693,21 @@
*/
//#endif JAVA6
+
+
+//#ifdef JAVA7
+ public boolean generatedKeyAlwaysReturned() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
+ String tableNamePattern, String columnNamePattern) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+
+//#endif JAVA7
+
}
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:47:35.836635653 +0000
@@ -47,6 +47,11 @@
//#endif JAVA4
import org.hsqldb.jdbcDriver;
+//#ifdef JAVA7
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+//#endif JAVA7
+
// boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
/**
@@ -323,4 +328,15 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ throw new AbstractMethodError(
+ "org.hsqldb.jdbc.jdbcDataSource.getParentLogger should throw" +
+ " SQLFeatureNotSupportedException, but that is not yet available" +
+ " in Java 5");
+ }
+
+//#endif JAVA7
}
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:47:35.866635606 +0000
@@ -5324,4 +5324,19 @@
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+
+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public <T> T getObject(int columnNum, Class<T> type) throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+//#endif JAVA7
+
}
--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000
@@ -1608,4 +1608,16 @@
}
*/
//#endif JAVA6
+
+//#ifdef JAVA7
+ public boolean isCloseOnCompletion() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void closeOnCompletion() throws SQLException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+//#endif JAVA7
}
--- misc/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:14:42.800123566 +0000
+++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:47:35.826635667 +0000
@@ -42,6 +42,11 @@
import org.hsqldb.persist.HsqlDatabaseProperties;
import org.hsqldb.persist.HsqlProperties;
+//#ifdef JAVA7
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+//#endif JAVA7
+
// fredt@users 20011220 - patch 1.7.0 by fredt
// new version numbering scheme
// fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
@@ -321,4 +326,15 @@
DriverManager.registerDriver(new jdbcDriver());
} catch (Exception e) {}
}
+
+//#ifdef JAVA7
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ throw new AbstractMethodError(
+ "org.hsqldb.jdbcDriver.getParentLogger should throw" +
+ " SQLFeatureNotSupportedException, but that is not yet available" +
+ " in Java 5");
+ }
+
+//#endif JAVA7
}
|
