Re: java 7 patch

2013-02-25 Thread Herbert Dürr 

On 2013/02/25 1:09 AM, Pedro Giffuni wrote:

While here let me remind you that to solve the jdk7 issue you have to
look at i121098. The fix is rather trivial but someone else has to do
it.


Thanks for the pointer. I adjusted the produced classfile format to our
baseline as defined in the checks during configure which is Java 5. Even 
this version was released in 2004 so it is old enough to be upgraded 
should the need arise.


Herbert

Re: java 7 patch

2013-02-24 Thread Andrea Pescetti 

On 19/02/2013 Fred Ollinger wrote:

I think that Pedro pointed out that this is redundant as there all
ready is a patch that fixes this and more issues.
I was going to eventually grab Pedro's linked patch and test it on a
fresh install.


Are there any pointers/progress here? While building for Fedora, I was 
stuck on building module hsqldb with

$ javac -version
javac 1.7.0_09
and Fred's patch, as adapted by Ariel, worked for me (thanks!).

What's needed to get it committed? As I understand it:

1) There are still problems in building with Java 7, and there is 
consensus that we want to support Java 7 in our build environment.


2) This has little to do with the Java baseline, i.e., the minimum 
version of Java we need to build (source Java baseline) or to run 
(target Java baseline) OpenOffice, now set to Java 5 in both cases and 
not set to change. All Java 5/6 is dead remarks belong here and are 
thus not relevant to this discussion.


3) The patch attached to 
https://issues.apache.org/ooo/show_bug.cgi?id=121754 still has issues to 
fix before being  committed, namely:
- It doesn't respect point 2, i.e., it would REQUIRE changing the Java 
baseline; and this must be adapted.
- Pedro has a more comprehensive patch (where?) that already includes 
this functionality.


What's the best way to move on? It is definitely time to be able to 
build with Java 7...


Regards,
  Andrea.

Re: java 7 patch

2013-02-24 Thread Pedro Giffuni 
Hello;

Sorry that I was misunderstood.
I didn't really mean the patch was redundant:

- I am aware that upstream (hsqldb) will be releasing a new version (2.3)
which will fix the jdk7 problems and will work with AOO.

- I am not aware of anyone working on updating this so if you guys have a 
patch that works *now* just go ahead and commit it.

While here let me remind you that to solve the jdk7 issue you have to
look at i121098. The fix is rather trivial but someone else has to do
it.

Pedro.





 Da: Andrea Pescetti 
 


On 19/02/2013 Fred Ollinger wrote:
 I think that Pedro pointed out that this is redundant as there all
 ready is a patch that fixes this and more issues.
 I was going to eventually grab Pedro's linked patch and test it on a
 fresh install.

Are there any pointers/progress here? While building for Fedora, I was stuck 
on building module hsqldb with
$ javac -version
javac 1.7.0_09
and Fred's patch, as adapted by Ariel, worked for me (thanks!).

What's needed to get it committed? As I understand it:

1) There are still problems in building with Java 7, and there is consensus 
that we want to support Java 7 in our build environment.

2) This has little to do with the Java baseline, i.e., the minimum version 
of Java we need to build (source Java baseline) or to run (target Java 
baseline) OpenOffice, now set to Java 5 in both cases and not set to change. 
All Java 5/6 is dead remarks belong here and are thus not relevant to this 
discussion.

3) The patch attached to https://issues.apache.org/ooo/show_bug.cgi?id=121754 
still has issues to fix before being  committed, namely:
- It doesn't respect point 2, i.e., it would REQUIRE changing the Java 
baseline; and this must be adapted.
- Pedro has a more comprehensive patch (where?) that already includes this 
functionality.

What's the best way to move on? It is definitely time to be able to build with 
Java 7...

Regards,
  Andrea.

Re: java 7 patch

2013-02-19 Thread Rob Weir 
On Mon, Feb 11, 2013 at 12:41 PM, Rob Weir robw...@apache.org wrote:
 On Thu, Feb 7, 2013 at 2:32 PM, Fred Ollinger folli...@gmail.com wrote:
 To whom it may concern,

 Below is a patch to fix some java7 compilation bugs. Also, this is attached.


 Thanks for the patch, Fred!

 I've created a Bugzilla issue for this, so we don't lose track of it.
  I also added you to the cc list for the report, so you will be
 notified when its status changes.

 https://issues.apache.org/ooo/show_bug.cgi?id=121754


Is someone able to review this patch?  It is good encouragement to
review and integrate patches quickly.   If you can do it soon, but not
right now, you could just assign the BZ to yourself:

https://issues.apache.org/ooo/show_bug.cgi?id=121754

Thanks!

-Rob



 Regards,

 -Rob


 Index: hsqldb/jdbcDriver.java
 ===
 --- hsqldb.orig/jdbcDriver.java 2013-02-07 09:17:01.0 -0800
 +++ hsqldb/jdbcDriver.java  2013-02-07 09:17:32.0 -0800
 @@ -31,6 +31,11 @@

  package org.hsqldb;

 +//#ifdef JAVA7
 +import java.sql.SQLFeatureNotSupportedException;
 +import java.util.logging.Logger;
 +//#enddif JAVA7
 +
  import java.sql.Connection;
  import java.sql.Driver;
  import java.sql.DriverManager;
 @@ -121,6 +126,12 @@
   */
  public class jdbcDriver implements Driver {

 +//#ifdef JAVA7
 +public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 +  throw new SQLFeatureNotSupportedException();
 +}
 +//#endif JAVA7
 +
  /**
   *  Attempts to make a database connection to the given URL. The driver
   *  returns null if it realizes it is the wrong kind of driver to
 @@ -321,4 +332,8 @@
  DriverManager.registerDriver(new jdbcDriver());
  } catch (Exception e) {}
  }
 +
 +public boolean isCloseOnCompletion() { return false; }
 +
  }
 +
 Index: hsqldb/jdbc/jdbcCallableStatement.java
 ===
 --- hsqldb.orig/jdbc/jdbcCallableStatement.java 2013-02-07
 09:55:57.0 -0800
 +++ hsqldb/jdbc/jdbcCallableStatement.java  2013-02-07 
 09:57:17.0 -0800
 @@ -302,6 +302,14 @@
  public class jdbcCallableStatement extends jdbcPreparedStatement
  implements CallableStatement {

 +//#if JAVA7
 +public T T getObject(String s, ClassT T) throws SQLException
 { throw new SQLException(); }
 +public T T getObject(int i, ClassT T) throws SQLException {
 throw new SQLException(); }
 +public boolean isCloseOnCompletion() {
 + throw new UnsupportedOperationException(Not supported yet.);
 +}
 +//#endif JAVA7
 +
  /** parameter name = parameter index */
  private IntValueHashMap parameterNameMap;

 @@ -3373,11 +3381,6 @@
  {
  throw new UnsupportedOperationException(Not supported yet.);
  }
 -//#endif JAVA6
 -
 -//#if JAVA7
 -[javac] 
 /mnt/lfs/sources/ubuntu/old/local_dev300/hsqldb/unxlngi6.pro/misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
 :302: error: jdbcCallableStatement is not abstract and does not
 override abstract method TgetObject(String,ClassT) in
 CallableStatement
 -
 -//#endif JAVA7

 +//#endif JAVA6
  }
 Index: hsqldb/jdbc/jdbcConnection.java
 ===
 --- hsqldb.orig/jdbc/jdbcConnection.java2013-02-07 
 11:22:20.0 -0800
 +++ hsqldb/jdbc/jdbcConnection.java 2013-02-07 11:22:43.0 -0800
 @@ -31,6 +31,10 @@

  package org.hsqldb.jdbc;

 +//#ifdef JAVA7
 +import java.util.concurrent.Executor;
 +//#endif JAVA7
 +
  //#ifdef JAVA2
  import java.sql.Array;
  import java.sql.Blob;
 @@ -416,6 +420,21 @@
   * @see jdbcDatabaseMetaData
   */
  public class jdbcConnection implements Connection {
 +//#ifdef JAVA7
 +public void abort(Executor e){}
 +public int getNetworkTimeout(){
 +  throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public void setNetworkTimeout(Executor e, int i ){
 +  throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public String getSchema() {
 +   throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public void setSchema(String s) {
 +   throw new UnsupportedOperationException(Not supported yet.);
 +}
 +//#endif JAVA7

  //  Common Attributes --

 Index: hsqldb/jdbc/jdbcDatabaseMetaData.java
 ===
 --- hsqldb.orig/jdbc/jdbcDatabaseMetaData.java  2013-02-07
 11:27:01.0 -0800
 +++ hsqldb/jdbc/jdbcDatabaseMetaData.java   2013-02-07 
 11:27:03.0 -0800
 @@ -99,7 +99,7 @@
   * P
   * A method that gets information about a feature that the driver does not
   * support will throw an codeSQLException/code.
 - * In the case of methods that return a codeResultSet/code
 + * In the case of methods that eeturn

Re: java 7 patch

2013-02-19 Thread Fred Ollinger 
I think that Pedro pointed out that this is redundant as there all
ready is a patch that fixes this and more issues.

I was going to eventually grab Pedro's linked patch and test it on a
fresh install.

At any rate, I suggest that you apply one of the java fixes (mine or
the other one, I don't care which) soon if we are really going to drop
java6 like others had told me.

Sincerely,

Fred

On Tue, Feb 19, 2013 at 5:20 AM, Rob Weir robw...@apache.org wrote:
 On Mon, Feb 11, 2013 at 12:41 PM, Rob Weir robw...@apache.org wrote:
 On Thu, Feb 7, 2013 at 2:32 PM, Fred Ollinger folli...@gmail.com wrote:
 To whom it may concern,

 Below is a patch to fix some java7 compilation bugs. Also, this is attached.


 Thanks for the patch, Fred!

 I've created a Bugzilla issue for this, so we don't lose track of it.
  I also added you to the cc list for the report, so you will be
 notified when its status changes.

 https://issues.apache.org/ooo/show_bug.cgi?id=121754


 Is someone able to review this patch?  It is good encouragement to
 review and integrate patches quickly.   If you can do it soon, but not
 right now, you could just assign the BZ to yourself:

 https://issues.apache.org/ooo/show_bug.cgi?id=121754

 Thanks!

 -Rob



 Regards,

 -Rob


 Index: hsqldb/jdbcDriver.java
 ===
 --- hsqldb.orig/jdbcDriver.java 2013-02-07 09:17:01.0 -0800
 +++ hsqldb/jdbcDriver.java  2013-02-07 09:17:32.0 -0800
 @@ -31,6 +31,11 @@

  package org.hsqldb;

 +//#ifdef JAVA7
 +import java.sql.SQLFeatureNotSupportedException;
 +import java.util.logging.Logger;
 +//#enddif JAVA7
 +
  import java.sql.Connection;
  import java.sql.Driver;
  import java.sql.DriverManager;
 @@ -121,6 +126,12 @@
   */
  public class jdbcDriver implements Driver {

 +//#ifdef JAVA7
 +public Logger getParentLogger() throws SQLFeatureNotSupportedException 
 {
 +  throw new SQLFeatureNotSupportedException();
 +}
 +//#endif JAVA7
 +
  /**
   *  Attempts to make a database connection to the given URL. The driver
   *  returns null if it realizes it is the wrong kind of driver to
 @@ -321,4 +332,8 @@
  DriverManager.registerDriver(new jdbcDriver());
  } catch (Exception e) {}
  }
 +
 +public boolean isCloseOnCompletion() { return false; }
 +
  }
 +
 Index: hsqldb/jdbc/jdbcCallableStatement.java
 ===
 --- hsqldb.orig/jdbc/jdbcCallableStatement.java 2013-02-07
 09:55:57.0 -0800
 +++ hsqldb/jdbc/jdbcCallableStatement.java  2013-02-07 
 09:57:17.0 -0800
 @@ -302,6 +302,14 @@
  public class jdbcCallableStatement extends jdbcPreparedStatement
  implements CallableStatement {

 +//#if JAVA7
 +public T T getObject(String s, ClassT T) throws SQLException
 { throw new SQLException(); }
 +public T T getObject(int i, ClassT T) throws SQLException {
 throw new SQLException(); }
 +public boolean isCloseOnCompletion() {
 + throw new UnsupportedOperationException(Not supported yet.);
 +}
 +//#endif JAVA7
 +
  /** parameter name = parameter index */
  private IntValueHashMap parameterNameMap;

 @@ -3373,11 +3381,6 @@
  {
  throw new UnsupportedOperationException(Not supported yet.);
  }
 -//#endif JAVA6
 -
 -//#if JAVA7
 -[javac] 
 /mnt/lfs/sources/ubuntu/old/local_dev300/hsqldb/unxlngi6.pro/misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
 :302: error: jdbcCallableStatement is not abstract and does not
 override abstract method TgetObject(String,ClassT) in
 CallableStatement
 -
 -//#endif JAVA7

 +//#endif JAVA6
  }
 Index: hsqldb/jdbc/jdbcConnection.java
 ===
 --- hsqldb.orig/jdbc/jdbcConnection.java2013-02-07 
 11:22:20.0 -0800
 +++ hsqldb/jdbc/jdbcConnection.java 2013-02-07 11:22:43.0 -0800
 @@ -31,6 +31,10 @@

  package org.hsqldb.jdbc;

 +//#ifdef JAVA7
 +import java.util.concurrent.Executor;
 +//#endif JAVA7
 +
  //#ifdef JAVA2
  import java.sql.Array;
  import java.sql.Blob;
 @@ -416,6 +420,21 @@
   * @see jdbcDatabaseMetaData
   */
  public class jdbcConnection implements Connection {
 +//#ifdef JAVA7
 +public void abort(Executor e){}
 +public int getNetworkTimeout(){
 +  throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public void setNetworkTimeout(Executor e, int i ){
 +  throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public String getSchema() {
 +   throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public void setSchema(String s) {
 +   throw new UnsupportedOperationException(Not supported yet.);
 +}
 +//#endif JAVA7

  //  Common Attributes 
 --

 Index: hsqldb/jdbc/jdbcDatabaseMetaData.java

Re: java 7 patch

2013-02-11 Thread Rob Weir 
On Thu, Feb 7, 2013 at 2:32 PM, Fred Ollinger folli...@gmail.com wrote:
 To whom it may concern,

 Below is a patch to fix some java7 compilation bugs. Also, this is attached.


Thanks for the patch, Fred!

I've created a Bugzilla issue for this, so we don't lose track of it.
 I also added you to the cc list for the report, so you will be
notified when its status changes.

https://issues.apache.org/ooo/show_bug.cgi?id=121754


Regards,

-Rob


 Index: hsqldb/jdbcDriver.java
 ===
 --- hsqldb.orig/jdbcDriver.java 2013-02-07 09:17:01.0 -0800
 +++ hsqldb/jdbcDriver.java  2013-02-07 09:17:32.0 -0800
 @@ -31,6 +31,11 @@

  package org.hsqldb;

 +//#ifdef JAVA7
 +import java.sql.SQLFeatureNotSupportedException;
 +import java.util.logging.Logger;
 +//#enddif JAVA7
 +
  import java.sql.Connection;
  import java.sql.Driver;
  import java.sql.DriverManager;
 @@ -121,6 +126,12 @@
   */
  public class jdbcDriver implements Driver {

 +//#ifdef JAVA7
 +public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 +  throw new SQLFeatureNotSupportedException();
 +}
 +//#endif JAVA7
 +
  /**
   *  Attempts to make a database connection to the given URL. The driver
   *  returns null if it realizes it is the wrong kind of driver to
 @@ -321,4 +332,8 @@
  DriverManager.registerDriver(new jdbcDriver());
  } catch (Exception e) {}
  }
 +
 +public boolean isCloseOnCompletion() { return false; }
 +
  }
 +
 Index: hsqldb/jdbc/jdbcCallableStatement.java
 ===
 --- hsqldb.orig/jdbc/jdbcCallableStatement.java 2013-02-07
 09:55:57.0 -0800
 +++ hsqldb/jdbc/jdbcCallableStatement.java  2013-02-07 09:57:17.0 
 -0800
 @@ -302,6 +302,14 @@
  public class jdbcCallableStatement extends jdbcPreparedStatement
  implements CallableStatement {

 +//#if JAVA7
 +public T T getObject(String s, ClassT T) throws SQLException
 { throw new SQLException(); }
 +public T T getObject(int i, ClassT T) throws SQLException {
 throw new SQLException(); }
 +public boolean isCloseOnCompletion() {
 + throw new UnsupportedOperationException(Not supported yet.);
 +}
 +//#endif JAVA7
 +
  /** parameter name = parameter index */
  private IntValueHashMap parameterNameMap;

 @@ -3373,11 +3381,6 @@
  {
  throw new UnsupportedOperationException(Not supported yet.);
  }
 -//#endif JAVA6
 -
 -//#if JAVA7
 -[javac] 
 /mnt/lfs/sources/ubuntu/old/local_dev300/hsqldb/unxlngi6.pro/misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
 :302: error: jdbcCallableStatement is not abstract and does not
 override abstract method TgetObject(String,ClassT) in
 CallableStatement
 -
 -//#endif JAVA7

 +//#endif JAVA6
  }
 Index: hsqldb/jdbc/jdbcConnection.java
 ===
 --- hsqldb.orig/jdbc/jdbcConnection.java2013-02-07 11:22:20.0 
 -0800
 +++ hsqldb/jdbc/jdbcConnection.java 2013-02-07 11:22:43.0 -0800
 @@ -31,6 +31,10 @@

  package org.hsqldb.jdbc;

 +//#ifdef JAVA7
 +import java.util.concurrent.Executor;
 +//#endif JAVA7
 +
  //#ifdef JAVA2
  import java.sql.Array;
  import java.sql.Blob;
 @@ -416,6 +420,21 @@
   * @see jdbcDatabaseMetaData
   */
  public class jdbcConnection implements Connection {
 +//#ifdef JAVA7
 +public void abort(Executor e){}
 +public int getNetworkTimeout(){
 +  throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public void setNetworkTimeout(Executor e, int i ){
 +  throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public String getSchema() {
 +   throw new UnsupportedOperationException(Not supported yet.);
 +}
 +public void setSchema(String s) {
 +   throw new UnsupportedOperationException(Not supported yet.);
 +}
 +//#endif JAVA7

  //  Common Attributes --

 Index: hsqldb/jdbc/jdbcDatabaseMetaData.java
 ===
 --- hsqldb.orig/jdbc/jdbcDatabaseMetaData.java  2013-02-07
 11:27:01.0 -0800
 +++ hsqldb/jdbc/jdbcDatabaseMetaData.java   2013-02-07 11:27:03.0 
 -0800
 @@ -99,7 +99,7 @@
   * P
   * A method that gets information about a feature that the driver does not
   * support will throw an codeSQLException/code.
 - * In the case of methods that return a codeResultSet/code
 + * In the case of methods that eeturn a codeResultSet/code
   * object, either a codeResultSet/code object (which may be empty) is
   * returned or an codeSQLException/code is thrown.p
   *
 @@ -282,6 +282,13 @@
   */
  public class jdbcDatabaseMetaData implements DatabaseMetaData {

 +//#ifdef JAVA7
 +public ResultSet getPseudoColumns(String catalog, String

Re: java 7 patch

2013-02-09 Thread Kay Schenk 

Fred --

Thanks. We'll see if we can get some testing/build with this this coming 
week.


On 02/07/2013 11:32 AM, Fred Ollinger wrote:

To whom it may concern,

Below is a patch to fix some java7 compilation bugs. Also, this is attached.

Index: hsqldb/jdbcDriver.java
===
--- hsqldb.orig/jdbcDriver.java 2013-02-07 09:17:01.0 -0800
+++ hsqldb/jdbcDriver.java  2013-02-07 09:17:32.0 -0800
@@ -31,6 +31,11 @@

  package org.hsqldb;

+//#ifdef JAVA7
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+//#enddif JAVA7
+
  import java.sql.Connection;
  import java.sql.Driver;
  import java.sql.DriverManager;
@@ -121,6 +126,12 @@
   */
  public class jdbcDriver implements Driver {

+//#ifdef JAVA7
+public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+  throw new SQLFeatureNotSupportedException();
+}
+//#endif JAVA7
+
  /**
   *  Attempts to make a database connection to the given URL. The driver
   *  returns null if it realizes it is the wrong kind of driver to
@@ -321,4 +332,8 @@
  DriverManager.registerDriver(new jdbcDriver());
  } catch (Exception e) {}
  }
+
+public boolean isCloseOnCompletion() { return false; }
+
  }
+
Index: hsqldb/jdbc/jdbcCallableStatement.java
===
--- hsqldb.orig/jdbc/jdbcCallableStatement.java 2013-02-07
09:55:57.0 -0800
+++ hsqldb/jdbc/jdbcCallableStatement.java  2013-02-07 09:57:17.0 
-0800
@@ -302,6 +302,14 @@
  public class jdbcCallableStatement extends jdbcPreparedStatement
  implements CallableStatement {

+//#if JAVA7
+public T T getObject(String s, ClassT T) throws SQLException
{ throw new SQLException(); }
+public T T getObject(int i, ClassT T) throws SQLException {
throw new SQLException(); }
+public boolean isCloseOnCompletion() {
+ throw new UnsupportedOperationException(Not supported yet.);
+}
+//#endif JAVA7
+
  /** parameter name = parameter index */
  private IntValueHashMap parameterNameMap;

@@ -3373,11 +3381,6 @@
  {
  throw new UnsupportedOperationException(Not supported yet.);
  }
-//#endif JAVA6
-
-//#if JAVA7
-[javac] 
/mnt/lfs/sources/ubuntu/old/local_dev300/hsqldb/unxlngi6.pro/misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
:302: error: jdbcCallableStatement is not abstract and does not
override abstract method TgetObject(String,ClassT) in
CallableStatement
-
-//#endif JAVA7

+//#endif JAVA6
  }
Index: hsqldb/jdbc/jdbcConnection.java
===
--- hsqldb.orig/jdbc/jdbcConnection.java2013-02-07 11:22:20.0 
-0800
+++ hsqldb/jdbc/jdbcConnection.java 2013-02-07 11:22:43.0 -0800
@@ -31,6 +31,10 @@

  package org.hsqldb.jdbc;

+//#ifdef JAVA7
+import java.util.concurrent.Executor;
+//#endif JAVA7
+
  //#ifdef JAVA2
  import java.sql.Array;
  import java.sql.Blob;
@@ -416,6 +420,21 @@
   * @see jdbcDatabaseMetaData
   */
  public class jdbcConnection implements Connection {
+//#ifdef JAVA7
+public void abort(Executor e){}
+public int getNetworkTimeout(){
+  throw new UnsupportedOperationException(Not supported yet.);
+}
+public void setNetworkTimeout(Executor e, int i ){
+  throw new UnsupportedOperationException(Not supported yet.);
+}
+public String getSchema() {
+   throw new UnsupportedOperationException(Not supported yet.);
+}
+public void setSchema(String s) {
+   throw new UnsupportedOperationException(Not supported yet.);
+}
+//#endif JAVA7

  //  Common Attributes --

Index: hsqldb/jdbc/jdbcDatabaseMetaData.java
===
--- hsqldb.orig/jdbc/jdbcDatabaseMetaData.java  2013-02-07
11:27:01.0 -0800
+++ hsqldb/jdbc/jdbcDatabaseMetaData.java   2013-02-07 11:27:03.0 
-0800
@@ -99,7 +99,7 @@
   * P
   * A method that gets information about a feature that the driver does not
   * support will throw an codeSQLException/code.
- * In the case of methods that return a codeResultSet/code
+ * In the case of methods that eeturn a codeResultSet/code
   * object, either a codeResultSet/code object (which may be empty) is
   * returned or an codeSQLException/code is thrown.p
   *
@@ -282,6 +282,13 @@
   */
  public class jdbcDatabaseMetaData implements DatabaseMetaData {

+//#ifdef JAVA7
+public ResultSet getPseudoColumns(String catalog, String
schemaPattern, String tableNamePattern, String columnNamePattern)
throws SQLException {throw new SQLException(); }
+
+public boolean generatedKeyAlwaysReturned(){ return false; }
+//#endif JAVA7
+
+
  /** Used by getBestRowIdentifier to avoid extra object construction */
  static final