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