svn commit: r1034728 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java

[mtylenda]

Author: mtylenda
Date: Sat Nov 13 10:56:47 2010
New Revision: 1034728

URL: http://svn.apache.org/viewvc?rev=1034728&view=rev
Log:
OPENJPA-1863: Update HSQLDictionary for HSQLDB 2.0 - patch provided by Georgi 
Naplatanov with slight modifications.

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java?rev=1034728&r1=1034727&r2=1034728&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
 Sat Nov 13 10:56:47 2010
@@ -39,10 +39,9 @@ import org.apache.openjpa.util.OpenJPAEx
 import org.apache.openjpa.util.ReferentialIntegrityException;
 
 /**
- * Dictionary for Hypersonic SQL database.
+ * Dictionary for HyperSQL (HSQLDB) database.
  */
-public class HSQLDictionary
-    extends DBDictionary {
+public class HSQLDictionary extends DBDictionary {
 
     /**
      * Sets whether HSQL should use "CREATED CACHED TABLE" rather than
@@ -50,6 +49,8 @@ public class HSQLDictionary
      */
     public boolean cacheTables = false;
 
+    private int dbMajorVersion;
+
     private SQLBuffer _oneBuffer = new SQLBuffer(this).append("1");
 
     public HSQLDictionary() {
@@ -80,8 +81,6 @@ public class HSQLDictionary
         rangePosition = RANGE_PRE_DISTINCT;
         supportsDeferredConstraints = false;
 
-        useGetObjectForBlobs = true;
-        blobTypeName = "VARBINARY";
         doubleTypeName = "NUMERIC";
 
         supportsNullTableForGetPrimaryKeys = true;
@@ -98,6 +97,39 @@ public class HSQLDictionary
         }));
     }
 
+    /**
+     * Determine HSQLDB version and configure itself accordingly.
+     */
+    @Override
+    public void connectedConfiguration(Connection conn) throws SQLException {
+        super.connectedConfiguration(conn);
+
+        determineHSQLDBVersion(conn) ;
+
+        if (dbMajorVersion == 1) {
+            blobTypeName = "VARBINARY";
+            useGetObjectForBlobs = true;
+        }
+    }
+
+    /**
+     * Determine HSQLDB version either by using JDBC 3 method or, if it
+     * is not available, by parsing the value returned by
+     * {...@linkplain DatabaseMetaData#getDatabaseProductVersion()}.
+     */
+    protected void determineHSQLDBVersion(Connection con) throws SQLException {
+        DatabaseMetaData metaData = con.getMetaData();
+
+        if (isJDBC3) {
+            dbMajorVersion = metaData.getDatabaseMajorVersion();
+        } else {
+            // String is like "2.0.0"
+            String productVersion = metaData.getDatabaseProductVersion();
+            String[] version = productVersion.split("\\.") ;
+            dbMajorVersion = Integer.parseInt(version[0]) ;
+        }
+    }
+
     @Override
     public int getJDBCType(int metaTypeCode, boolean lob) {
         int type = super.getJDBCType(metaTypeCode, lob);
@@ -112,6 +144,9 @@ public class HSQLDictionary
 
     @Override
     public int getPreferredType(int type) {
+        if (dbMajorVersion > 1) {
+            return super.getPreferredType(type);
+        }
         switch (type) {
             case Types.CLOB:
                 return Types.VARCHAR;