snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

New package: hsqldb1.8.0-1.8.0.10

This commit is contained in:
Đoàn Trần Công Danh 2024-08-29 11:10:06 +07:00
parent 4b343e9739
commit 4be7f1ac10
10 changed files with 807 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
srcpkgs/hsqldb1.8.0/patches/001-java-6.patch Normal file
View File

@ -0,0 +1,253 @@
--- a/src/org/hsqldb/jdbc/jdbcBlob.java
+++ b/src/org/hsqldb/jdbc/jdbcBlob.java
@@ -462,7 +462,6 @@ public class jdbcBlob implements Blob {
}
//#ifdef JAVA6
-/*
public void free() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -472,7 +471,6 @@ public class jdbcBlob implements Blob {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
--- a/src/org/hsqldb/jdbc/jdbcCallableStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcCallableStatement.java
@@ -37,11 +37,9 @@ import java.math.BigDecimal;
import java.sql.CallableStatement;
import java.sql.Date;
//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.Time;
import java.sql.Timestamp;
@@ -3106,7 +3104,6 @@ implements CallableStatement {
//#endif JAVA4
//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -3376,7 +3373,6 @@ implements CallableStatement {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcClob.java
+++ b/src/org/hsqldb/jdbc/jdbcClob.java
@@ -464,7 +464,6 @@ public final class jdbcClob implements C
}
//#ifdef JAVA6
-/*
public void free() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -474,6 +473,5 @@ public final class jdbcClob implements C
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcConnection.java
+++ b/src/org/hsqldb/jdbc/jdbcConnection.java
@@ -43,11 +43,9 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.SQLClientInfoException;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.PreparedStatement;
@@ -2729,7 +2727,6 @@ public class jdbcConnection implements C
}
//#ifdef JAVA6
-/*
public Clob createClob() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -2794,7 +2791,6 @@ public class jdbcConnection implements C
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcDataSource.java
+++ b/src/org/hsqldb/jdbc/jdbcDataSource.java
@@ -312,7 +312,6 @@ public class jdbcDataSource implements S
}
//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -322,7 +321,6 @@ public class jdbcDataSource implements S
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
@@ -37,9 +37,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
//#ifdef JAVA6
-/*
import java.sql.RowIdLifetime;
-*/
//#endif JAVA6
import org.hsqldb.Column;
@@ -5650,7 +5648,6 @@ public class jdbcDatabaseMetaData implem
}
//#ifdef JAVA6
-/*
public RowIdLifetime getRowIdLifetime() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -5694,7 +5691,6 @@ public class jdbcDatabaseMetaData implem
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcParameterMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcParameterMetaData.java
@@ -383,7 +383,6 @@ public class jdbcParameterMetaData imple
}
//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -393,7 +392,6 @@ public class jdbcParameterMetaData imple
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcPreparedStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcPreparedStatement.java
@@ -39,11 +39,9 @@ import java.math.BigDecimal;
import java.sql.Date;
//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.PreparedStatement;
@@ -2293,7 +2291,6 @@ implements PreparedStatement {
}
//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -2403,7 +2400,6 @@ implements PreparedStatement {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcResultSet.java
+++ b/src/org/hsqldb/jdbc/jdbcResultSet.java
@@ -76,11 +76,9 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
//#ifdef JAVA6
-/*
import java.sql.RowId;
import java.sql.NClob;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.SQLException;
@@ -5075,7 +5073,6 @@ public class jdbcResultSet implements Re
}
//#ifdef JAVA6
-/*
public RowId getRowId(int columnIndex) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -5325,7 +5322,6 @@ public class jdbcResultSet implements Re
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
@@ -1145,7 +1145,6 @@ public class jdbcResultSetMetaData imple
}
}
//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -1155,6 +1154,5 @@ public class jdbcResultSetMetaData imple
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--- a/src/org/hsqldb/jdbc/jdbcStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcStatement.java
@@ -1588,7 +1588,6 @@ public class jdbcStatement implements St
}
}
//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -1608,6 +1607,5 @@ public class jdbcStatement implements St
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}

23
srcpkgs/hsqldb1.8.0/patches/002-avoid-execution-in-script-or-log.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/src/org/hsqldb/DatabaseCommandInterpreter.java
+++ b/src/org/hsqldb/DatabaseCommandInterpreter.java
@@ -394,15 +394,18 @@ class DatabaseCommandInterpreter {
String token = tokenizer.getString();
ScriptWriterText dsw = null;
-
session.checkAdmin();
-
try {
if (tokenizer.wasValue()) {
if (tokenizer.getType() != Types.VARCHAR) {
throw Trace.error(Trace.INVALID_IDENTIFIER);
}
+ // added condition to avoid execution of spurious command in .script or .log file
+ if (session.isProcessingScript() || session.isProcessingLog()) {
+ return new Result(ResultConstants.UPDATECOUNT);
+ }
+
dsw = new ScriptWriterText(database, token, true, true, true);
dsw.writeAll();

15
srcpkgs/hsqldb1.8.0/patches/003-bitxor.patch Normal file
View File

@ -0,0 +1,15 @@
# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- a/src/org/hsqldb/Library.java
+++ b/src/org/hsqldb/Library.java
@@ -1957,7 +1957,7 @@ public class Library {
functionMap.put("bitand", bitand);
functionMap.put("bitlength", bitLength);
functionMap.put("bitor", bitor);
- functionMap.put("bitxor", bitor);
+ functionMap.put("bitxor", bitxor);
functionMap.put("character", character);
functionMap.put("concat", concat);
functionMap.put("cot", cot);

10
srcpkgs/hsqldb1.8.0/patches/004-fix-lock.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/src/org/hsqldb/persist/HsqlDatabaseProperties.java
+++ b/src/org/hsqldb/persist/HsqlDatabaseProperties.java
@@ -429,6 +429,7 @@ public class HsqlDatabaseProperties exte
setProperty(hsqldb_log_size, 10);
setProperty(sql_enforce_strict_size, true);
setProperty(hsqldb_nio_data_file, false);
+ setProperty(hsqldb_lock_file, true);
}
// OOo end

27
srcpkgs/hsqldb1.8.0/patches/005-i104901.patch Normal file
View File

@ -0,0 +1,27 @@
--- hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200
+++ hsqldb/src/org/hsqldb/Table.java 2009-09-11 13:45:42.939231519 +0200
@@ -149,10 +149,10 @@
Constraint[] constraintList; // constrainst for the table
HsqlArrayList[] triggerLists; // array of trigger lists
private int[] colTypes; // fredt - types of columns
- private int[] colSizes; // fredt - copy of SIZE values for columns
+ int[] colSizes; // fredt - copy of SIZE values for columns
private int[] colScales; // fredt - copy of SCALE values for columns
private boolean[] colNullable; // fredt - modified copy of isNullable() values
- private Expression[] colDefaults; // fredt - expressions of DEFAULT values
+ Expression[] colDefaults; // fredt - expressions of DEFAULT values
private int[] defaultColumnMap; // fred - holding 0,1,2,3,...
private boolean hasDefaultValues; //fredt - shortcut for above
boolean sqlEnforceSize; // inherited from the database -
--- hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100
+++ hsqldb/src/org/hsqldb/TableWorks.java 2009-09-11 13:47:50.328667463 +0200
@@ -670,7 +670,8 @@
// default expressions can change
oldCol.setType(newCol);
oldCol.setDefaultExpression(newCol.getDefaultExpression());
- table.setColumnTypeVars(colIndex);
+ table.colSizes[colIndex] = oldCol.getSize();
+ table.colDefaults[colIndex] = oldCol.getDefaultExpression();
table.resetDefaultsFlag();
return;

314
srcpkgs/hsqldb1.8.0/patches/006-java-7.patch Normal file
View File

@ -0,0 +1,314 @@
--- a/build/build.xml
+++ b/build/build.xml
@@ -98,16 +98,24 @@ examples:
<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 +174,7 @@ examples:
<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 +192,7 @@ examples:
<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 +220,7 @@ examples:
<arg value="+JAVA2FULL"/>
<arg value="-JAVA4"/>
<arg value="-JAVA6"/>
+ <arg value="-JAVA7"/>
</java>
</target>
@@ -218,6 +229,7 @@ examples:
<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 +256,7 @@ examples:
<arg value="+JAVA2FULL"/>
<arg value="+JAVA4"/>
<arg value="-JAVA6"/>
+ <arg value="-JAVA7"/>
</java>
</target>
@@ -253,6 +266,43 @@ examples:
<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 +329,11 @@ examples:
<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"
--- a/src/org/hsqldb/jdbc/jdbcCallableStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcCallableStatement.java
@@ -3375,4 +3375,18 @@ implements CallableStatement {
}
//#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
}
--- a/src/org/hsqldb/jdbc/jdbcConnection.java
+++ b/src/org/hsqldb/jdbc/jdbcConnection.java
@@ -48,6 +48,12 @@ import java.sql.SQLClientInfoException;
import java.sql.SQLXML;
//#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 @@ public class jdbcConnection implements C
}
//#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
}
--- a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
@@ -5693,4 +5693,21 @@ public class jdbcDatabaseMetaData implem
}
//#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
+
}
--- a/src/org/hsqldb/jdbc/jdbcDataSource.java
+++ b/src/org/hsqldb/jdbc/jdbcDataSource.java
@@ -47,6 +47,11 @@ import javax.sql.DataSource;
//#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,12 @@ public class jdbcDataSource implements S
}
//#endif JAVA6
+
+//#ifdef JAVA7
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ throw new SQLFeatureNotSupportedException("Not supported yet.");
+ }
+
+//#endif JAVA7
}
--- a/src/org/hsqldb/jdbc/jdbcResultSet.java
+++ b/src/org/hsqldb/jdbc/jdbcResultSet.java
@@ -5324,4 +5324,19 @@ public class jdbcResultSet implements Re
}
//#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
+
}
--- a/src/org/hsqldb/jdbc/jdbcStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcStatement.java
@@ -1608,4 +1608,16 @@ public class jdbcStatement implements St
throw new UnsupportedOperationException("Not supported yet.");
}
//#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
}
--- a/src/org/hsqldb/jdbcDriver.java
+++ b/src/org/hsqldb/jdbcDriver.java
@@ -42,6 +42,11 @@ import org.hsqldb.jdbc.jdbcConnection;
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,12 @@ public class jdbcDriver implements Drive
DriverManager.registerDriver(new jdbcDriver());
} catch (Exception e) {}
}
+
+//#ifdef JAVA7
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException
+ {
+ throw new SQLFeatureNotSupportedException("Not supported yet.");
+ }
+
+//#endif JAVA7
}

22
srcpkgs/hsqldb1.8.0/patches/007-java-11.patch Normal file
View File

@ -0,0 +1,22 @@
From 1d3f2ed0606cc971513dab5932ec7d1dd2a15f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 12 Jul 2018 11:57:07 +0200
Subject: call System.runFinalizersOnExit by reflection, since it was removed
in jdk11
--- a/src/org/hsqldb/lib/java/JavaSystem.java 2008-03-16 23:51:35.000000000 +0100
+++ b/src/org/hsqldb/lib/java/JavaSystem.java 2018-07-12 11:46:57.997837180 +0200
@@ -160,8 +160,9 @@
public static void runFinalizers() {
//#ifdef JAVA2FULL
- System.runFinalizersOnExit(true);
-
+ try {
+ System.class.getMethod("runFinalizersOnExit", boolean.class).invoke(null, true);
+ } catch (Exception e) {}
//#endif
}
--
cgit v1.1

24
srcpkgs/hsqldb1.8.0/patches/008-multiple-result-set.patch Normal file
View File

@ -0,0 +1,24 @@
From 856159b3913976c68c8a04b7e939a6cc64477f6a Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Thu, 22 Feb 2018 21:33:20 +0100
Subject: tdf#115828: hsqldb supports multiple resultSets
Regression from 3c567e55e6aed9e0da892d8b9fc09f8a0c784fcc
Thank you to Lionel for this suggestion
Change-Id: I5eeadc1968e57d586e55a7aa5488b2ab3ee43724
Reviewed-on: https://gerrit.libreoffice.org/50202
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins <ci@libreoffice.org>
--- a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
@@ -1347,7 +1347,7 @@ public class jdbcDatabaseMetaData implem
* @exception SQLException if a database access error occurs
*/
public boolean supportsMultipleResultSets() throws SQLException {
- return false;
+ return true;
}
/**

91
srcpkgs/hsqldb1.8.0/patches/009-no-implmenetation-vendor.patch Normal file
View File

@ -0,0 +1,91 @@
--- a/build/build.xml
+++ b/build/build.xml
@@ -21,8 +21,6 @@
locale="en"/>
</tstamp>
- <property name="build.label" value="private-${_tmpstamp}"/>
- <property name="build.vendor" value="${user.name}"/>
<property name="hsqldb.title" value="HSQLDB"/>
<property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
<property name="src" value="${basedir}/src"/>
@@ -481,8 +479,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='Zaurus runtime'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
</manifest>
<exclude name="org/hsqldb/jmx/**"/>
<exclude name="org/hsqldb/util/*Transfer*.*"/>
@@ -528,8 +524,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='Test runtime'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
</manifest>
<exclude name="org/hsqldb/jmx/**"/>
<exclude name="org/hsqldb/sample/*.*"/>
@@ -553,8 +547,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='Runtime without utilities'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
</manifest>
<exclude name="org/hsqldb/jmx/**"/>
<exclude name="org/hsqldb/util/**"/>
@@ -580,8 +572,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='Runtime without utilities and servers'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
</manifest>
<exclude name="org/hsqldb/jdbc/jdbcStubs.class"/>
<exclude name="org/hsqldb/jdbc/Array.class"/>
@@ -629,8 +619,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='Standard runtime'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
<!-- This attribute is completely ignored unless the user
uses the jar like "java -jar .../hsqldb.jar" -->
<attribute name='Main-Class' value='org.hsqldb.util.SqlTool'/>
@@ -740,8 +728,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='JDBC client runtime'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
</manifest>
<fileset refid='jdbcclasses'/>
</jar>
@@ -756,8 +742,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='SqlTool runtime, with JDBC driver'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
<attribute name='Main-Class' value='org.hsqldb.util.SqlTool'/>
</manifest>
<!-- including 'org/hsqldb/jdbc*' just to be safe -->
@@ -776,7 +760,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='HSQLDB Transfer Tool classes'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
<attribute name='Class-Path' value='hsqldb.jar'/>
<attribute name='Main-Class' value='org.hsqldb.util.DatabaseManagerSwing'/>
<!-- If we prefer to encourage use of Transfer instead of
@@ -805,8 +788,6 @@ examples:
<attribute name='Specification-Vendor' value='${hsqldb.vendor}'/>
<attribute name='Implementation-Title'
value='Utilities runtime, without JDBC driver'/>
- <attribute name='Implementation-Version' value='${build.label}'/>
- <attribute name='Implementation-Vendor' value='${build.vendor}'/>
<!-- N.b. Blaine removed the Main-Class because this jar is
useless without a JDBC driver in the classpath, and you
can't add to classpath if invoked with "-jar" -->

28
srcpkgs/hsqldb1.8.0/template Normal file
View File

@ -0,0 +1,28 @@
# Template file for 'hsqldb1.8.0'
#
# libreoffice uses this version
pkgname=hsqldb1.8.0
version=1.8.0.10
revision=1
hostmakedepends="openjdk8 apache-ant"
depends="virtual?java-runtime"
short_desc="HyperSQL Database Engine - v1.8.0"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-4-Clause"
homepage="https://hsqldb.org/"
#changelog=""
distfiles="${SOURCEFORGE_SITE}/hsqldb/hsqldb_${version//./_}.zip"
checksum=d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
do_build() {
source /etc/profile.d/jdk.sh
source /etc/profile.d/apache-ant.sh
rm -f lib/hsqldb*
cd build
ant jar jarutil
}
do_install() {
vinstall lib/hsqldb.jar 644 usr/share/java hsqldb-1.8.0.jar
vlicense doc/hsqldb_lic.txt
}