svn commit: r832092 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java

[ppoddar]

Author: ppoddar
Date: Mon Nov  2 20:33:53 2009
New Revision: 832092

URL: http://svn.apache.org/viewvc?rev=832092&view=rev
Log:
OPENJPA-1369: Use CONCAT function for HSQL 1.8.x

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.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=832092&r1=832091&r2=832092&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
 Mon Nov  2 20:33:53 2009
@@ -54,6 +54,7 @@
     public HSQLDictionary() {
         platform = "HSQL";
         validationSQL = "CALL 1";
+        concatenateFunction = "CONCAT({0},{1})";
         closePoolSQL = "SHUTDOWN";
 
         supportsAutoAssign = true;

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java?rev=832092&r1=832091&r2=832092&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order.java
 Mon Nov  2 20:33:53 2009
@@ -21,6 +21,7 @@
 import java.sql.Timestamp;
 import java.util.List;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -37,6 +38,7 @@
 
     private int quantity;
        private double totalCost;
+       @Column(name="CNT")
        private int count;
        private String name;