From 538f1fd084c655850d5628e0bf7d8fc5273c29fd Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Mon, 10 Aug 2009 14:03:29 +0000
Subject: [PATCH] OPENJPA-1233 Update DerbyDictionary with new reserved words. 
 The following reserved words were added, based on the Derby 10.5 docs -   
 COALESCE, CURRENT_ROLE, GETCURRENTCONNECTION, NONE, OVER, ROW_NUMBER,
 XMLQUERY

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@802801 13f79535-47bb-0310-9956-ffa450edef68
---
 .../openjpa/jdbc/sql/DerbyDictionary.java     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
index dd43a2682..6b5ed11e4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
@@ -74,9 +74,9 @@ public class DerbyDictionary
         }));
         reservedWordSet.addAll(Arrays.asList(new String[]{
             "BOOLEAN", "CALL", "ENDEXEC", "EXPLAIN", "FUNCTION",
-            "GET_CURRENT_CONNECTION", "INOUT", "LONGINT", "LTRIM", "NVARCHAR",
-            "OFF", "OUT", "RTRIM", "SUBSTR", "XML", "XMLEXISTS", "XMLPARSE",
-            "XMLSERIALIZE",
+            "GET_CURRENT_CONNECTION", "INOUT", "LONGINT", "LTRIM", "NONE",
+            "NVARCHAR", "OFF", "OUT", "RTRIM", "SUBSTR", "XML", "XMLEXISTS",
+            "XMLPARSE", "XMLSERIALIZE",
         }));
 
         // reservedWordSet subset that CANNOT be used as valid column names
@@ -86,9 +86,9 @@ public class DerbyDictionary
             "ASSERTION", "AT", "AUTHORIZATION", "AVG", "BEGIN", "BETWEEN", 
             "BIT", "BOOLEAN", "BOTH", "BY", "CALL", "CASCADE", "CASCADED", 
             "CASE", "CAST", "CHAR", "CHARACTER", "CHARACTER_LENGTH", "CHECK",
-            "CLOSE", "COLLATE", "COLLATION", "COLUMN", "COMMIT", "CONNECT",
+            "CLOSE", "COALESCE", "COLLATE", "COLLATION", "COLUMN", "COMMIT", "CONNECT",
             "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONTINUE", "CONVERT",
-            "CORRESPONDING", "CREATE", "CURRENT", "CURRENT_DATE", 
+            "CORRESPONDING", "CREATE", "CURRENT", "CURRENT_DATE", "CURRENT_ROLE",
             "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR",
             "DEALLOCATE", "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE",
             "DEFERRED", "DELETE", "DESC", "DESCRIBE", "DIAGNOSTICS", 
@@ -96,25 +96,25 @@ public class DerbyDictionary
             "END-EXEC", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC", "EXECUTE",
             "EXISTS", "EXPLAIN", "EXTERNAL", "FALSE", "FETCH", "FIRST", "FLOAT",
             "FOR", "FOREIGN", "FOUND", "FROM", "FULL", "FUNCTION", "GET", 
-            "GLOBAL", "GO", "GOTO", "GRANT", "GROUP", "HAVING", "HOUR",
+            "GETCURRENTCONNECTION", "GLOBAL", "GO", "GOTO", "GRANT", "GROUP", "HAVING", "HOUR",
             "IDENTITY", "IMMEDIATE", "IN", "INDICATOR", "INITIALLY", "INNER",
             "INOUT", "INPUT", "INSENSITIVE", "INSERT", "INT", "INTEGER",
             "INTERSECT", "INTO", "IS", "ISOLATION", "JOIN", "KEY", "LAST",
             "LEADING", "LEFT", "LIKE", "LOWER", "LTRIM", "MATCH", "MAX", "MIN",
-            "MINUTE", "NATIONAL", "NATURAL", "NCHAR", "NEXT", "NO", "NOT", 
+            "MINUTE", "NATIONAL", "NATURAL", "NCHAR", "NEXT", "NO", "NONE", "NOT", 
             "NULL", "NULLIF", "NUMERIC", "NVARCHAR", "OF", "ON", "ONLY", "OPEN",
-            "OPTION", "OR", "ORDER", "OUT", "OUTER", "OUTPUT", "OVERLAPS", 
+            "OPTION", "OR", "ORDER", "OUT", "OUTER", "OUTPUT", "OVER", "OVERLAPS", 
             "PAD", "PARTIAL", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR",
             "PRIVILEGES", "PROCEDURE", "PUBLIC", "READ", "REAL", "REFERENCES",
             "RELATIVE", "RESTRICT", "REVOKE", "RIGHT", "ROLLBACK", "ROWS",
-            "RTRIM", "SCHEMA", "SCROLL", "SECOND", "SELECT", "SESSION_USER",
+            "ROW_NUMBER", "RTRIM", "SCHEMA", "SCROLL", "SECOND", "SELECT", "SESSION_USER",
             "SET", "SMALLINT", "SOME", "SPACE", "SQL", "SQLCODE", "SQLERROR",
             "SQLSTATE", "SUBSTR", "SUBSTRING", "SUM", "SYSTEM_USER", "TABLE",
             "TEMPORARY", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO", "TRAILING",
             "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRIM", "TRUE", "UNION",
             "UNIQUE", "UNKNOWN", "UPDATE", "UPPER", "USER", "USING", "VALUES",
             "VARCHAR", "VARYING", "VIEW", "WHENEVER", "WHERE", "WITH", "WORK",
-            "WRITE", "XML", "XMLEXISTS", "XMLPARSE", "XMLSERIALIZE", "YEAR",
+            "WRITE", "XML", "XMLEXISTS", "XMLPARSE", "XMLQUERY", "XMLSERIALIZE", "YEAR",
         }));
     }