svn commit: r1022960 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java

[mikedd]

Author: mikedd
Date: Fri Oct 15 15:00:30 2010
New Revision: 1022960

URL: http://svn.apache.org/viewvc?rev=1022960&view=rev
Log:
OPENJPA-1835: add dummy as an invalid column name for Sybase and update 
testcase to use DBIdentifier to get column name. 

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java?rev=1022960&r1=1022959&r2=1022960&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
 Fri Oct 15 15:00:30 2010
@@ -139,7 +139,7 @@ public class SybaseDictionary
         reservedWordSet.addAll(Arrays.asList(new String[]{
             "ARITH_OVERFLOW", "BREAK", "BROWSE", "BULK", "CHAR_CONVERT",
             "CHECKPOINT", "CLUSTERED", "COMPUTE", "CONFIRM", "CONTROLROW",
-            "DATABASE", "DBCC", "DETERMINISTIC", "DISK DISTINCT", "DUMMY",
+            "DATABASE", "DBCC", "DETERMINISTIC", "DISK DISTINCT", "DUMMY", 
             "DUMP", "ENDTRAN", "ERRLVL", "ERRORDATA", "ERROREXIT", "EXCLUSIVE",
             "EXIT", "EXP_ROW_SIZE", "FILLFACTOR", "FUNC", "FUNCTION",
             "HOLDLOCK", "IDENTITY_GAP", "IDENTITY_INSERT", "IDENTITY_START",
@@ -157,6 +157,8 @@ public class SybaseDictionary
             "TRAN", "TRIGGER", "TRUNCATE", "TSEQUAL", "UNPARTITION", "USE",
             "USER_OPTION", "WAITFOR", "WHILE", "WRITETEXT",
         }));
+        
+        invalidColumnWordSet.addAll(Arrays.asList(new String [] { "DUMMY" } ));
 
         // Sybase does not support foreign key delete/update action NULL,
         // DEFAULT, CASCADE

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java?rev=1022960&r1=1022959&r2=1022960&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java
 Fri Oct 15 15:00:30 2010
@@ -20,6 +20,7 @@ package org.apache.openjpa.jdbc.meta;
 
 import javax.persistence.*;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.jdbc.schema.Column;
 
@@ -36,14 +37,14 @@ public class TestBooleanValue extends Si
         em.getTransaction().begin();
         em.persist(t0);
         em.getTransaction().commit();
-        Column boolCol =
-            getMapping(EntityBool.class).getTable().getColumn("dummy");
+        Column boolCol = 
getMapping(EntityBool.class).getTable().getColumn("dummy");
+        DBIdentifier boolColId = boolCol.getIdentifier();
         Query q =
             em.createNativeQuery("Select "
                     + ((JDBCConfiguration) emf.getConfiguration())
                         .getDBDictionaryInstance().getPlaceholderValueString(
                             boolCol)
-                    + " FROM EntityBool a UNION ALL Select a.dummy " +
+                    + " FROM EntityBool a UNION ALL Select a." + 
boolColId.getName()  + " " +
                                "FROM EntityBool a");
         q.getResultList();
         em.close();