1607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/build/build.xml ext_sources/hsqldb_1_8_0_11/build/build.xml 2607db26bSAndrea Pescetti--- misc/hsqldb/build/build.xml 2008-06-01 23:56:57.000000000 +0200 3607db26bSAndrea Pescetti+++ misc/build/hsqldb/build/build.xml 2013-07-05 23:25:40.000000000 +0200 4607db26bSAndrea Pescetti@@ -1,6 +1,6 @@ 5607db26bSAndrea Pescetti <?xml version="1.0"?> 6607db26bSAndrea Pescetti-<!-- author fredt@users.sourceforge.net 2001 - 2008 --> 7607db26bSAndrea Pescetti-<!-- additional targets by unsaved@users.sourceforge.net 2004 - 2008 --> 8607db26bSAndrea Pescetti+<!-- author fredt@users.sourceforge.net 2001 - 2009 --> 9607db26bSAndrea Pescetti+<!-- additional targets by unsaved@users.sourceforge.net 2004 - 2009 --> 10607db26bSAndrea Pescetti 11607db26bSAndrea Pescetti <project name="hsqldb" default="help" basedir="../"> 12607db26bSAndrea Pescetti <!-- This loads properties in the same exact way as if you ran 13607db26bSAndrea Pescetti@@ -14,10 +14,10 @@ 14607db26bSAndrea Pescetti Do not address questions about property file(s) to the 15607db26bSAndrea Pescetti hsqldb community. --> 16607db26bSAndrea Pescetti <property file='build/build.properties'/> 17607db26bSAndrea Pescetti- <property name="hsqldb.version" value="1.8.0.10"/> 18607db26bSAndrea Pescetti+ <property name="hsqldb.version" value="1.8.0.11"/> 19607db26bSAndrea Pescetti 20607db26bSAndrea Pescetti <tstamp> 21607db26bSAndrea Pescetti- <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss" 22607db26bSAndrea Pescetti+ <format property="_tmpstamp" pattern="yyyy/MM/dd-HH:mm:ss" 23607db26bSAndrea Pescetti locale="en"/> 24607db26bSAndrea Pescetti </tstamp> 25607db26bSAndrea Pescetti 26607db26bSAndrea Pescetti@@ -26,7 +26,7 @@ 27607db26bSAndrea Pescetti <property name="hsqldb.title" value="HSQLDB"/> 28607db26bSAndrea Pescetti <property name="hsqldb.vendor" value="The HSQLDB Development Group"/> 29607db26bSAndrea Pescetti <property name="src" value="${basedir}/src"/> 30607db26bSAndrea Pescetti- <property name="build.debug" value="off"/> 31607db26bSAndrea Pescetti+ <property name="build.debug" value="false"/> 32607db26bSAndrea Pescetti 33607db26bSAndrea Pescetti <target name="init"> 34607db26bSAndrea Pescetti </target> 35607db26bSAndrea Pescetti@@ -213,10 +213,11 @@ 36607db26bSAndrea Pescetti </java> 37607db26bSAndrea Pescetti </target> 38607db26bSAndrea Pescetti 39607db26bSAndrea Pescetti- <target name="switchtojdk14" depends="switches" 40607db26bSAndrea Pescetti+ <target name="switchtojdk14" depends="switchtojdk13" 41607db26bSAndrea Pescetti description="self explanatory" if="ant.java.iscjava14"> 42607db26bSAndrea Pescetti <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > 43607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> 44607db26bSAndrea Pescetti+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> 45607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> 46607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> 47607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> 48607db26bSAndrea Pescetti@@ -251,6 +252,7 @@ 49607db26bSAndrea Pescetti <target name="switchtojdk16" depends="switchtojdk14" 50607db26bSAndrea Pescetti description="self explanatory" if="ant.java.iscjava16"> 51607db26bSAndrea Pescetti <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > 52607db26bSAndrea Pescetti+ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> 53607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> 54607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> 55607db26bSAndrea Pescetti <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> 56607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/Expression.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Expression.java 57607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/Expression.java 2008-05-27 17:15:05.000000000 +0200 58607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/Expression.java 2013-07-05 23:40:51.000000000 +0200 59607db26bSAndrea Pescetti@@ -807,6 +807,14 @@ 60607db26bSAndrea Pescetti 61607db26bSAndrea Pescetti case COUNT : 62607db26bSAndrea Pescetti buf.append(' ').append(Token.T_COUNT).append('('); 63607db26bSAndrea Pescetti+ 64607db26bSAndrea Pescetti+ if ("(*)".equals(left)) { 65607db26bSAndrea Pescetti+ buf.append('*'); 66607db26bSAndrea Pescetti+ } else { 67607db26bSAndrea Pescetti+ buf.append(left); 68607db26bSAndrea Pescetti+ } 69607db26bSAndrea Pescetti+ 70607db26bSAndrea Pescetti+ buf.append(')'); 71607db26bSAndrea Pescetti break; 72607db26bSAndrea Pescetti 73607db26bSAndrea Pescetti case SUM : 74607db26bSAndrea Pescetti@@ -858,11 +866,15 @@ 75607db26bSAndrea Pescetti buf.append(' ').append(Token.T_VAR_SAMP).append('('); 76607db26bSAndrea Pescetti buf.append(left).append(')'); 77607db26bSAndrea Pescetti break; 78607db26bSAndrea Pescetti- } 79607db26bSAndrea Pescetti 80607db26bSAndrea Pescetti+ default : 81607db26bSAndrea Pescetti throw Trace.error(Trace.EXPRESSION_NOT_SUPPORTED); 82607db26bSAndrea Pescetti } 83607db26bSAndrea Pescetti 84607db26bSAndrea Pescetti+ // changes used in OpenOffice 3.4 have been incorporated 85607db26bSAndrea Pescetti+ return buf.toString(); 86607db26bSAndrea Pescetti+ } 87607db26bSAndrea Pescetti+ 88607db26bSAndrea Pescetti private String describe(Session session, int blanks) { 89607db26bSAndrea Pescetti 90607db26bSAndrea Pescetti int lIType; 91607db26bSAndrea Pescetti@@ -1523,6 +1535,12 @@ 92607db26bSAndrea Pescetti return columnName; 93607db26bSAndrea Pescetti } 94607db26bSAndrea Pescetti 95607db26bSAndrea Pescetti+ if (isAggregate(exprType)) { 96607db26bSAndrea Pescetti+ try { 97607db26bSAndrea Pescetti+ return getDDL(); 98607db26bSAndrea Pescetti+ } catch (Exception e) {} 99607db26bSAndrea Pescetti+ } 100607db26bSAndrea Pescetti+ 101607db26bSAndrea Pescetti return ""; 102607db26bSAndrea Pescetti } 103607db26bSAndrea Pescetti 104607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcCallableStatement.java 105607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2008-03-20 02:44:28.000000000 +0100 106607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2013-07-05 23:45:50.000000000 +0200 107607db26bSAndrea Pescetti@@ -3376,7 +3376,26 @@ 108607db26bSAndrea Pescetti { 109607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 110607db26bSAndrea Pescetti } 111607db26bSAndrea Pescetti-*/ 112607db26bSAndrea Pescetti 113607db26bSAndrea Pescetti+ public <T>T getObject(int parameterIndex, 114607db26bSAndrea Pescetti+ Class<T> type) throws SQLException { 115607db26bSAndrea Pescetti+ return (T) this.getObject(parameterIndex); 116607db26bSAndrea Pescetti+ } 117607db26bSAndrea Pescetti+ 118607db26bSAndrea Pescetti+ public <T>T getObject(String parameterName, 119607db26bSAndrea Pescetti+ Class<T> type) throws SQLException { 120607db26bSAndrea Pescetti+ return getObject(this.findParameterIndex(parameterName), type); 121607db26bSAndrea Pescetti+ } 122607db26bSAndrea Pescetti+ 123607db26bSAndrea Pescetti+ public void closeOnCompletion() throws SQLException { 124607db26bSAndrea Pescetti+ throw new UnsupportedOperationException("Not supported yet."); 125607db26bSAndrea Pescetti+ } 126607db26bSAndrea Pescetti+ 127607db26bSAndrea Pescetti+ public boolean isCloseOnCompletion() throws SQLException { 128607db26bSAndrea Pescetti+ throw new UnsupportedOperationException("Not supported yet."); 129607db26bSAndrea Pescetti+ } 130607db26bSAndrea Pescetti+ 131607db26bSAndrea Pescetti+*/ 132607db26bSAndrea Pescetti //#endif JAVA6 133607db26bSAndrea Pescetti+ 134607db26bSAndrea Pescetti } 135607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcConnection.java 136607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2008-03-20 02:44:28.000000000 +0100 137607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2013-07-05 23:46:02.000000000 +0200 138607db26bSAndrea Pescetti@@ -2794,6 +2794,36 @@ 139607db26bSAndrea Pescetti { 140607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 141607db26bSAndrea Pescetti } 142607db26bSAndrea Pescetti+ 143607db26bSAndrea Pescetti+ public int getNetworkTimeout() throws SQLException { 144607db26bSAndrea Pescetti+ return 0; 145607db26bSAndrea Pescetti+ } 146607db26bSAndrea Pescetti+ 147607db26bSAndrea Pescetti+ public void setNetworkTimeout(java.util.concurrent.Executor executor, 148607db26bSAndrea Pescetti+ int milliseconds) throws SQLException { 149607db26bSAndrea Pescetti+ 150607db26bSAndrea Pescetti+ checkClosed(); 151607db26bSAndrea Pescetti+ 152607db26bSAndrea Pescetti+ throw Util.notSupported(); 153607db26bSAndrea Pescetti+ } 154607db26bSAndrea Pescetti+ 155607db26bSAndrea Pescetti+ public void setSchema(String schema) throws SQLException { 156607db26bSAndrea Pescetti+ checkClosed(); 157607db26bSAndrea Pescetti+ 158607db26bSAndrea Pescetti+ throw Util.notSupported(); 159607db26bSAndrea Pescetti+ } 160607db26bSAndrea Pescetti+ 161607db26bSAndrea Pescetti+ public String getSchema() throws SQLException { 162607db26bSAndrea Pescetti+ checkClosed(); 163607db26bSAndrea Pescetti+ 164607db26bSAndrea Pescetti+ throw Util.notSupported(); 165607db26bSAndrea Pescetti+ } 166607db26bSAndrea Pescetti+ public void abort( 167607db26bSAndrea Pescetti+ java.util.concurrent.Executor executor) throws SQLException { 168607db26bSAndrea Pescetti+ checkClosed(); 169607db26bSAndrea Pescetti+ 170607db26bSAndrea Pescetti+ throw Util.notSupported(); 171607db26bSAndrea Pescetti+ } 172607db26bSAndrea Pescetti */ 173607db26bSAndrea Pescetti 174607db26bSAndrea Pescetti //#endif JAVA6 175607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 176607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2008-03-20 02:44:28.000000000 +0100 177607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2013-07-05 23:46:18.000000000 +0200 178607db26bSAndrea Pescetti@@ -5694,7 +5694,17 @@ 179607db26bSAndrea Pescetti { 180607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 181607db26bSAndrea Pescetti } 182607db26bSAndrea Pescetti-*/ 183607db26bSAndrea Pescetti 184607db26bSAndrea Pescetti+ public ResultSet getPseudoColumns( 185607db26bSAndrea Pescetti+ String catalog, String schemaPattern, String tableNamePattern, 186607db26bSAndrea Pescetti+ String columnNamePattern) throws SQLException { 187607db26bSAndrea Pescetti+ throw Util.notSupported(); 188607db26bSAndrea Pescetti+ } 189607db26bSAndrea Pescetti+ 190607db26bSAndrea Pescetti+ public boolean generatedKeyAlwaysReturned() throws SQLException { 191607db26bSAndrea Pescetti+ return true; 192607db26bSAndrea Pescetti+ } 193607db26bSAndrea Pescetti+ 194607db26bSAndrea Pescetti+*/ 195607db26bSAndrea Pescetti //#endif JAVA6 196607db26bSAndrea Pescetti } 197607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcDataSource.java 198607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2008-05-28 22:23:02.000000000 +0200 199607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2013-07-05 23:46:39.000000000 +0200 200607db26bSAndrea Pescetti@@ -322,6 +322,11 @@ 201607db26bSAndrea Pescetti { 202607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 203607db26bSAndrea Pescetti } 204607db26bSAndrea Pescetti+ 205607db26bSAndrea Pescetti+ public java.util.logging.Logger getParentLogger() 206607db26bSAndrea Pescetti+ throws java.sql.SQLFeatureNotSupportedException { 207607db26bSAndrea Pescetti+ throw (java.sql.SQLFeatureNotSupportedException) Util.notSupported(); 208607db26bSAndrea Pescetti+ } 209607db26bSAndrea Pescetti */ 210607db26bSAndrea Pescetti 211607db26bSAndrea Pescetti //#endif JAVA6 212607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcPreparedStatement.java 213607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java 2008-03-20 02:44:28.000000000 +0100 214607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcPreparedStatement.java 2013-07-05 23:46:54.000000000 +0200 215607db26bSAndrea Pescetti@@ -2403,6 +2403,15 @@ 216607db26bSAndrea Pescetti { 217607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 218607db26bSAndrea Pescetti } 219607db26bSAndrea Pescetti+ 220607db26bSAndrea Pescetti+ public void closeOnCompletion() throws SQLException { 221607db26bSAndrea Pescetti+ checkClosed(); 222607db26bSAndrea Pescetti+ } 223607db26bSAndrea Pescetti+ 224607db26bSAndrea Pescetti+ public boolean isCloseOnCompletion() throws SQLException { 225607db26bSAndrea Pescetti+ checkClosed(); 226607db26bSAndrea Pescetti+ return false; 227607db26bSAndrea Pescetti+ } 228607db26bSAndrea Pescetti */ 229607db26bSAndrea Pescetti 230607db26bSAndrea Pescetti //#endif JAVA6 231607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcResultSet.java 232607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2008-03-20 02:44:28.000000000 +0100 233607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2013-07-05 23:47:15.000000000 +0200 234607db26bSAndrea Pescetti@@ -5325,7 +5325,16 @@ 235607db26bSAndrea Pescetti { 236607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 237607db26bSAndrea Pescetti } 238607db26bSAndrea Pescetti-*/ 239607db26bSAndrea Pescetti 240607db26bSAndrea Pescetti+ public <T>T getObject(int columnIndex, Class<T> type) throws SQLException { 241607db26bSAndrea Pescetti+ return (T) getObject(columnIndex); 242607db26bSAndrea Pescetti+ } 243607db26bSAndrea Pescetti+ 244607db26bSAndrea Pescetti+ public <T>T getObject(String columnLabel, 245607db26bSAndrea Pescetti+ Class<T> type) throws SQLException { 246607db26bSAndrea Pescetti+ return getObject(findColumn(columnLabel), type); 247607db26bSAndrea Pescetti+ } 248607db26bSAndrea Pescetti+ 249607db26bSAndrea Pescetti+*/ 250607db26bSAndrea Pescetti //#endif JAVA6 251607db26bSAndrea Pescetti } 252607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbc/jdbcStatement.java 253607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2008-03-20 02:44:28.000000000 +0100 254607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2013-07-05 23:47:29.000000000 +0200 255607db26bSAndrea Pescetti@@ -1608,6 +1608,16 @@ 256607db26bSAndrea Pescetti { 257607db26bSAndrea Pescetti throw new UnsupportedOperationException("Not supported yet."); 258607db26bSAndrea Pescetti } 259607db26bSAndrea Pescetti+ 260607db26bSAndrea Pescetti+ public void closeOnCompletion() throws SQLException { 261607db26bSAndrea Pescetti+ checkClosed(); 262607db26bSAndrea Pescetti+ } 263607db26bSAndrea Pescetti+ 264607db26bSAndrea Pescetti+ public boolean isCloseOnCompletion() throws SQLException { 265607db26bSAndrea Pescetti+ checkClosed(); 266607db26bSAndrea Pescetti+ return false; 267607db26bSAndrea Pescetti+ } 268607db26bSAndrea Pescetti+ 269607db26bSAndrea Pescetti */ 270607db26bSAndrea Pescetti //#endif JAVA6 271607db26bSAndrea Pescetti } 272607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/jdbcDriver.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/jdbcDriver.java 273607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/jdbcDriver.java 2006-04-11 17:03:24.000000000 +0200 274607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java 2013-07-05 23:48:06.000000000 +0200 275607db26bSAndrea Pescetti@@ -321,4 +321,16 @@ 276607db26bSAndrea Pescetti DriverManager.registerDriver(new jdbcDriver()); 277607db26bSAndrea Pescetti } catch (Exception e) {} 278607db26bSAndrea Pescetti } 279607db26bSAndrea Pescetti+ 280607db26bSAndrea Pescetti+//#ifdef JAVA6 281607db26bSAndrea Pescetti+/* 282607db26bSAndrea Pescetti+ public java.util.logging 283607db26bSAndrea Pescetti+ .Logger getParentLogger() throws java.sql 284607db26bSAndrea Pescetti+ .SQLFeatureNotSupportedException { 285607db26bSAndrea Pescetti+ throw new UnsupportedOperationException("Not supported yet."); 286607db26bSAndrea Pescetti+ } 287607db26bSAndrea Pescetti+*/ 288607db26bSAndrea Pescetti+ 289607db26bSAndrea Pescetti+//#endif 290607db26bSAndrea Pescetti+ 291607db26bSAndrea Pescetti } 292607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/lib/StringComparator.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/lib/StringComparator.java 293607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/lib/StringComparator.java 2013-07-06 00:32:59.000000000 +0200 294607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/lib/StringComparator.java 2013-07-06 00:09:04.000000000 +0200 295607db26bSAndrea Pescetti@@ -0,0 +1,53 @@ 296607db26bSAndrea Pescetti+/* Copyright (c) 2001-2008, The HSQL Development Group 297607db26bSAndrea Pescetti+ * All rights reserved. 298607db26bSAndrea Pescetti+ * 299607db26bSAndrea Pescetti+ * Redistribution and use in source and binary forms, with or without 300607db26bSAndrea Pescetti+ * modification, are permitted provided that the following conditions are met: 301607db26bSAndrea Pescetti+ * 302607db26bSAndrea Pescetti+ * Redistributions of source code must retain the above copyright notice, this 303607db26bSAndrea Pescetti+ * list of conditions and the following disclaimer. 304607db26bSAndrea Pescetti+ * 305607db26bSAndrea Pescetti+ * Redistributions in binary form must reproduce the above copyright notice, 306607db26bSAndrea Pescetti+ * this list of conditions and the following disclaimer in the documentation 307607db26bSAndrea Pescetti+ * and/or other materials provided with the distribution. 308607db26bSAndrea Pescetti+ * 309607db26bSAndrea Pescetti+ * Neither the name of the HSQL Development Group nor the names of its 310607db26bSAndrea Pescetti+ * contributors may be used to endorse or promote products derived from this 311607db26bSAndrea Pescetti+ * software without specific prior written permission. 312607db26bSAndrea Pescetti+ * 313607db26bSAndrea Pescetti+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 314607db26bSAndrea Pescetti+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 315607db26bSAndrea Pescetti+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 316607db26bSAndrea Pescetti+ * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, 317607db26bSAndrea Pescetti+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 318607db26bSAndrea Pescetti+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 319607db26bSAndrea Pescetti+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 320607db26bSAndrea Pescetti+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 321607db26bSAndrea Pescetti+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 322607db26bSAndrea Pescetti+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 323607db26bSAndrea Pescetti+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 324607db26bSAndrea Pescetti+ */ 325607db26bSAndrea Pescetti+ 326607db26bSAndrea Pescetti+ 327607db26bSAndrea Pescetti+package org.hsqldb.lib; 328607db26bSAndrea Pescetti+ 329607db26bSAndrea Pescetti+public class StringComparator implements ObjectComparator { 330607db26bSAndrea Pescetti+ 331607db26bSAndrea Pescetti+ public int compare(Object a, Object b) { 332607db26bSAndrea Pescetti+ 333607db26bSAndrea Pescetti+ // handle nulls 334607db26bSAndrea Pescetti+ if (a == b) { 335607db26bSAndrea Pescetti+ return 0; 336607db26bSAndrea Pescetti+ } 337607db26bSAndrea Pescetti+ 338607db26bSAndrea Pescetti+ if (a == null) { 339607db26bSAndrea Pescetti+ return -1; 340607db26bSAndrea Pescetti+ } 341607db26bSAndrea Pescetti+ 342607db26bSAndrea Pescetti+ if (b == null) { 343607db26bSAndrea Pescetti+ return 1; 344607db26bSAndrea Pescetti+ } 345607db26bSAndrea Pescetti+ 346607db26bSAndrea Pescetti+ return ((String) a).compareTo((String) b); 347607db26bSAndrea Pescetti+ } 348607db26bSAndrea Pescetti+} 349607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/Library.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Library.java 350607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/Library.java 2006-07-17 00:29:33.000000000 +0200 351607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/Library.java 2013-07-05 23:51:13.000000000 +0200 352607db26bSAndrea Pescetti@@ -1957,7 +1957,7 @@ 353607db26bSAndrea Pescetti functionMap.put("bitand", bitand); 354607db26bSAndrea Pescetti functionMap.put("bitlength", bitLength); 355607db26bSAndrea Pescetti functionMap.put("bitor", bitor); 356607db26bSAndrea Pescetti- functionMap.put("bitxor", bitor); 357607db26bSAndrea Pescetti+ functionMap.put("bitxor", bitxor); 358607db26bSAndrea Pescetti functionMap.put("character", character); 359607db26bSAndrea Pescetti functionMap.put("concat", concat); 360607db26bSAndrea Pescetti functionMap.put("cot", cot); 361607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/persist/HsqlDatabaseProperties.java 362607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2008-03-17 17:05:41.000000000 +0100 363607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2013-07-05 23:52:14.000000000 +0200 364607db26bSAndrea Pescetti@@ -429,6 +429,7 @@ 365607db26bSAndrea Pescetti setProperty(hsqldb_log_size, 10); 366607db26bSAndrea Pescetti setProperty(sql_enforce_strict_size, true); 367607db26bSAndrea Pescetti setProperty(hsqldb_nio_data_file, false); 368607db26bSAndrea Pescetti+ setProperty(hsqldb_lock_file, true); 369607db26bSAndrea Pescetti } 370607db26bSAndrea Pescetti 371607db26bSAndrea Pescetti // OOo end 372607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/Select.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Select.java 373607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/Select.java 2007-07-17 18:14:09.000000000 +0200 374607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/Select.java 2013-07-05 23:57:48.000000000 +0200 375607db26bSAndrea Pescetti@@ -33,7 +33,7 @@ 376607db26bSAndrea Pescetti * 377607db26bSAndrea Pescetti * For work added by the HSQL Development Group: 378607db26bSAndrea Pescetti * 379607db26bSAndrea Pescetti- * Copyright (c) 2001-2008, The HSQL Development Group 380*c7a44bc6SAndrea Pescetti+ * Copyright (c) 2001-2005, The HSQL Development Group 381607db26bSAndrea Pescetti * All rights reserved. 382607db26bSAndrea Pescetti * 383607db26bSAndrea Pescetti * Redistribution and use in source and binary forms, with or without 384607db26bSAndrea Pescetti@@ -1255,6 +1255,7 @@ 385607db26bSAndrea Pescetti for (int i = 0; i < iResultLen; i++) { 386607db26bSAndrea Pescetti e = exprColumns[i]; 387607db26bSAndrea Pescetti rmd.colTypes[i] = e.getDataType(); 388*c7a44bc6SAndrea Pescetti+ rmd.classNames[i] = e.getValueClassName(); 389607db26bSAndrea Pescetti rmd.colSizes[i] = e.getColumnSize(); 390607db26bSAndrea Pescetti rmd.colScales[i] = e.getColumnScale(); 391607db26bSAndrea Pescetti rmd.colLabels[i] = e.getAlias(); 392607db26bSAndrea Pescetti@@ -1263,6 +1264,7 @@ 393607db26bSAndrea Pescetti rmd.colNames[i] = e.getColumnName(); 394607db26bSAndrea Pescetti 395607db26bSAndrea Pescetti if (rmd.isTableColumn(i)) { 396*c7a44bc6SAndrea Pescetti+ rmd.schemaNames[i] = e.getTableSchemaName(); 397607db26bSAndrea Pescetti rmd.colNullable[i] = e.nullability; 398607db26bSAndrea Pescetti rmd.isIdentity[i] = e.isIdentity; 399607db26bSAndrea Pescetti rmd.isWritable[i] = e.isWritable; 400607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/Table.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/Table.java 401607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200 402607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/Table.java 2013-07-05 23:58:46.000000000 +0200 403607db26bSAndrea Pescetti@@ -149,10 +149,10 @@ 404607db26bSAndrea Pescetti Constraint[] constraintList; // constrainst for the table 405607db26bSAndrea Pescetti HsqlArrayList[] triggerLists; // array of trigger lists 406607db26bSAndrea Pescetti private int[] colTypes; // fredt - types of columns 407607db26bSAndrea Pescetti- private int[] colSizes; // fredt - copy of SIZE values for columns 408607db26bSAndrea Pescetti+ int[] colSizes; // fredt - copy of SIZE values for columns 409607db26bSAndrea Pescetti private int[] colScales; // fredt - copy of SCALE values for columns 410607db26bSAndrea Pescetti private boolean[] colNullable; // fredt - modified copy of isNullable() values 411607db26bSAndrea Pescetti- private Expression[] colDefaults; // fredt - expressions of DEFAULT values 412607db26bSAndrea Pescetti+ Expression[] colDefaults; // fredt - expressions of DEFAULT values 413607db26bSAndrea Pescetti private int[] defaultColumnMap; // fred - holding 0,1,2,3,... 414607db26bSAndrea Pescetti private boolean hasDefaultValues; //fredt - shortcut for above 415607db26bSAndrea Pescetti boolean sqlEnforceSize; // inherited from the database - 416607db26bSAndrea Pescettidiff -urbwB ext_sources/hsqldb/src/org/hsqldb/TableWorks.java ext_sources/hsqldb_1_8_0_11/src/org/hsqldb/TableWorks.java 417607db26bSAndrea Pescetti--- misc/hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100 418607db26bSAndrea Pescetti+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java 2013-07-05 23:59:03.000000000 +0200 419607db26bSAndrea Pescetti@@ -670,7 +670,10 @@ 420607db26bSAndrea Pescetti // default expressions can change 421607db26bSAndrea Pescetti oldCol.setType(newCol); 422607db26bSAndrea Pescetti oldCol.setDefaultExpression(newCol.getDefaultExpression()); 423607db26bSAndrea Pescetti- table.setColumnTypeVars(colIndex); 424607db26bSAndrea Pescetti+ 425607db26bSAndrea Pescetti+ table.colSizes[colIndex] = oldCol.getSize(); 426607db26bSAndrea Pescetti+ table.colDefaults[colIndex] = oldCol.getDefaultExpression(); 427607db26bSAndrea Pescetti+ 428607db26bSAndrea Pescetti table.resetDefaultsFlag(); 429607db26bSAndrea Pescetti 430607db26bSAndrea Pescetti return; 431