This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit d8bb07fe86f61a8d62c8701e425383d0cc3ba545
Author: Mark Struberg <strub...@apache.org>
AuthorDate: Sun May 2 14:31:17 2021 +0200
OPENJPA-2868 update reserved column words for Derby
---
.../apache/openjpa/jdbc/sql/DerbyDictionary.java | 58 ++++++++++------------
1 file changed, 25 insertions(+), 33 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 63b996e..61b119c 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
@@ -84,40 +84,32 @@ public class DerbyDictionary
// reservedWordSet subset that CANNOT be used as valid column names
// (i.e., without surrounding them with double-quotes)
+ // generated at 2021-05-02T14:07:25.218 via
org.apache.openjpa.reservedwords.ReservedWordsIT
invalidColumnWordSet.addAll(Arrays.asList(new String[] {
- "ADD", "ALL", "ALLOCATE", "ALTER", "AND", "ANY", "ARE", "AS",
"ASC",
- "ASSERTION", "AT", "AUTHORIZATION", "AVG", "BEGIN", "BETWEEN",
- "BIT", "BOOLEAN", "BOTH", "BY", "CALL", "CASCADE", "CASCADED",
- "CASE", "CAST", "CHAR", "CHARACTER", "CHARACTER_LENGTH", "CHECK",
- "CLOSE", "COALESCE", "COLLATE", "COLLATION", "COLUMN", "COMMIT",
"CONNECT",
- "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONTINUE", "CONVERT",
- "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",
- "DISCONNECT", "DISTINCT", "DOUBLE", "DROP", "ELSE", "END",
- "END-EXEC", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC", "EXECUTE",
- "EXISTS", "EXPLAIN", "EXTERNAL", "FALSE", "FETCH", "FIRST",
"FLOAT",
- "FOR", "FOREIGN", "FOUND", "FROM", "FULL", "FUNCTION", "GET",
- "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", "NONE",
"NOT",
- "NULL", "NULLIF", "NUMERIC", "NVARCHAR", "OF", "ON", "ONLY",
"OPEN",
- "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",
- "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", "XMLQUERY",
"XMLSERIALIZE", "YEAR",
+ "ADD", "ALL", "ALLOCATE", "ALTER", "AND", "ANY", "ARE", "AS",
"ASC", "ASSERTION", "AT", "AUTHORIZATION", "AVG",
+ "BEGIN", "BETWEEN", "BIGINT", "BIT", "BOOLEAN", "BOTH", "BY",
"CALL", "CASCADE", "CASCADED", "CASE", "CAST", "CHAR",
+ "CHARACTER", "CHARACTER_LENGTH", "CHECK", "CLOSE", "COLLATE",
"COLLATION", "COLUMN", "COMMIT", "CONNECT", "CONNECTION",
+ "CONSTRAINT", "CONSTRAINTS", "CONTINUE", "CONVERT",
"CORRESPONDING", "CREATE", "CROSS", "CURRENT", "CURRENT_DATE",
+ "CURRENT_ROLE", "CURRENT_TIME", "CURRENT_TIMESTAMP",
"CURRENT_USER", "CURSOR", "DEALLOCATE", "DEC", "DECIMAL",
+ "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DEFINER",
"DELETE", "DESC", "DESCRIBE", "DETERMINISTIC", "DIAGNOSTICS",
+ "DISCONNECT", "DISTINCT", "DOUBLE", "DROP", "ELSE", "END",
"END-EXEC", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC",
+ "EXECUTE", "EXISTS", "EXPLAIN", "EXTERNAL", "FALSE", "FETCH",
"FIRST", "FLOAT", "FOR", "FOREIGN", "FOUND", "FROM",
+ "FULL", "FUNCTION", "GET", "GETCURRENTCONNECTION", "GLOBAL", "GO",
"GOTO", "GRANT", "GROUP", "HAVING", "HOUR",
+ "IDENTITY", "IMMEDIATE", "IN", "INDICATOR", "INITIALLY", "INNER",
"INOUT", "INPUT", "INSENSITIVE", "INSERT", "INT",
+ "INTEGER", "INTERSECT", "INTO", "INVOKER", "IS", "ISOLATION",
"JOIN", "KEY", "LAST", "LEADING", "LEFT", "LIKE",
+ "LOWER", "LTRIM", "MATCH", "MAX", "MIN", "MINUTE", "NATIONAL",
"NATURAL", "NCHAR", "NEXT", "NO", "NONE", "NOT",
+ "NULL", "NULLIF", "NUMERIC", "NVARCHAR", "OF", "ON", "ONLY",
"OPEN", "OPTION", "OR", "ORDER", "OUT", "OUTER", "OUTPUT",
+ "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", "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", "WINDOW", "WITH", "WORK", "WRITE", "XML",
+ "XMLEXISTS", "XMLPARSE", "XMLQUERY", "XMLSERIALIZE", "YEAR",
+ // end generated.
+ // the following keywords used to be defined as reserved words in
the past, but now seem to work
+ // we still add them for compat reasons
+ "COALESCE", "OVER", "ROW_NUMBER",
}));
}
