Author: mikedd
Date: Tue Nov 23 17:29:32 2010
New Revision: 1038214
URL: http://svn.apache.org/viewvc?rev=1038214&view=rev
Log:
OPENJPA-1897: Add all reserved words to invalid column name set
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.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=1038214&r1=1038213&r2=1038214&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
Tue Nov 23 17:29:32 2010
@@ -135,8 +135,7 @@ public class SybaseDictionary
}));
// reserved words specified at:
- // http://manuals.sybase.com/onlinebooks/group-as/asg1250e/
- // refman/@Generic__BookTextView/26603
+ //
http://manuals.sybase.com/onlinebooks/group-as/asg1250e/refman/@Generic__BookTextView/26603
reservedWordSet.addAll(Arrays.asList(new String[]{
"ARITH_OVERFLOW", "BREAK", "BROWSE", "BULK", "CHAR_CONVERT",
"CHECKPOINT", "CLUSTERED", "COMPUTE", "CONFIRM", "CONTROLROW",
@@ -159,7 +158,8 @@ public class SybaseDictionary
"USER_OPTION", "WAITFOR", "WHILE", "WRITETEXT",
}));
- invalidColumnWordSet.addAll(Arrays.asList(new String [] { "DUMMY" } ));
+ // Sybase does not allow reserved words to be used as column names.
+ invalidColumnWordSet.addAll(reservedWordSet);
// Sybase does not support foreign key delete/update action NULL,
// DEFAULT, CASCADE
