Merge pull request #1173 from domaframework/dependencies/h2

Update H2 Database Engine to v2.3.232
domaframework · Aug 31, 2024 · ef418b7 · ef418b7
2 parents 7d1b96e + 7c821dc
commit ef418b7
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 87 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -206,7 +206,7 @@ configure(integrationTestProjects) {
 
     dependencies {
         testImplementation(platform("org.testcontainers:testcontainers-bom:1.20.1"))
-        testRuntimeOnly("com.h2database:h2:1.4.200")
+        testRuntimeOnly("com.h2database:h2:2.3.232")
         testRuntimeOnly("mysql:mysql-connector-java:8.0.33")
         testRuntimeOnly("com.oracle.database.jdbc:ojdbc8-production:18.15.0.0")
         testRuntimeOnly("org.postgresql:postgresql:42.7.4")

diff --git a/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java b/doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java
@@ -28,11 +28,9 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) {
     } else {
       orderBy = new OrderByClauseNode("");
     }
-    orderBy.appendNode(new FragmentNode(" limit "));
     if (limit > 0) {
+      orderBy.appendNode(new FragmentNode(" limit "));
       orderBy.appendNode(new FragmentNode(String.valueOf(limit)));
-    } else {
-      orderBy.appendNode(new FragmentNode("-1"));
     }
     if (offset >= 0) {
       orderBy.appendNode(new FragmentNode(" offset "));

diff --git a/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java b/doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java
@@ -63,7 +63,7 @@ public void testOffsetLimit_forUpdate_semicolon() {
 
   @Test
   public void testOffsetOnly() {
-    String expected = "select * from emp order by emp.id limit -1 offset 5";
+    String expected = "select * from emp order by emp.id offset 5";
     H2PagingTransformer transformer = new H2PagingTransformer(5, -1);
     SqlParser parser = new SqlParser("select * from emp order by emp.id");
     SqlNode sqlNode = transformer.transform(parser.parse());

diff --git a/...est-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-db2.script b/...est-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-db2.script
@@ -17,16 +17,16 @@ CREATE TABLE AUTHORITY (ID INTEGER NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
 CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
 CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY INTEGER NOT NULL PRIMARY KEY, UNIQUE_KEY INTEGER NOT NULL UNIQUE, FOREIGN_KEY INTEGER, CHECK_CONSTRAINT INTEGER, NOT_NULL INTEGER NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
-CREATE TABLE PATTERN (VALUE VARCHAR(10));
+CREATE TABLE PATTERN ("VALUE" VARCHAR(10));
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
+CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
 
 CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

diff --git a/...test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-h2.script b/...test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-h2.script
@@ -17,18 +17,18 @@ CREATE TABLE AUTHORITY (ID INTEGER NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
 CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
 CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY INTEGER PRIMARY KEY, UNIQUE_KEY INTEGER UNIQUE, FOREIGN_KEY INTEGER, CHECK_CONSTRAINT INTEGER, NOT_NULL INTEGER NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
-CREATE TABLE PATTERN (VALUE VARCHAR(10));
-CREATE TABLE ROOM (ID INTEGER NOT NULL PRIMARY KEY, COLORS ARRAY);
+CREATE TABLE PATTERN ("VALUE" VARCHAR(10));
+CREATE TABLE ROOM (ID INTEGER NOT NULL PRIMARY KEY, COLORS varchar(10) array);
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER NOT NULL IDENTITY PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
+CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL generated by default as identity PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL generated by default as identity PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER NOT NULL generated by default as identity PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, "VALUE" VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
 
 CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

diff --git a/...-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-hsqldb.script b/...-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-hsqldb.script
@@ -22,16 +22,16 @@ CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
 CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY INTEGER PRIMARY KEY, UNIQUE_KEY INTEGER, FOREIGN_KEY INTEGER, CHECK_CONSTRAINT INTEGER, NOT_NULL INTEGER NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
 ALTER TABLE CONSTRAINT_CHECKING ADD UNIQUE (UNIQUE_KEY);
-CREATE TABLE PATTERN (VALUE VARCHAR(10));
+CREATE TABLE PATTERN ("VALUE" VARCHAR(10));
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
+CREATE TABLE AUTO_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
 
 CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

diff --git a/...t-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql.script b/...t-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql.script
@@ -14,18 +14,18 @@ CREATE TABLE AUTHORITY (ID INT NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER);
 CREATE TABLE NO_ID (VALUE1 INT, VALUE2 INT);
 CREATE TABLE OWNER_OF_NO_ID (ID INT NOT NULL PRIMARY KEY, NO_ID_VALUE1 INT);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY INT PRIMARY KEY, UNIQUE_KEY INT UNIQUE, FOREIGN_KEY INT, CHECK_CONSTRAINT INT, NOT_NULL INT NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
-CREATE TABLE PATTERN (VALUE VARCHAR(10));
+CREATE TABLE PATTERN ([VALUE] VARCHAR(10));
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY2(ID INT IDENTITY PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
+CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY2(ID INT IDENTITY PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, [VALUE] VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
 
 CREATE TABLE TEAM(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);

diff --git a/...mmon/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql2008.script b/...mmon/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql2008.script
@@ -14,17 +14,17 @@ CREATE TABLE AUTHORITY (ID INT NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER);
 CREATE TABLE NO_ID (VALUE1 INT, VALUE2 INT);
 CREATE TABLE OWNER_OF_NO_ID (ID INT NOT NULL PRIMARY KEY, NO_ID_VALUE1 INT);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY INT PRIMARY KEY, UNIQUE_KEY INT UNIQUE, FOREIGN_KEY INT, CHECK_CONSTRAINT INT, NOT_NULL INT NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
-CREATE TABLE PATTERN (VALUE VARCHAR(10));
+CREATE TABLE PATTERN ([VALUE] VARCHAR(10));
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
+CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
 
 CREATE TABLE TEAM(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);

diff --git a/...t-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mysql.script b/...t-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mysql.script
@@ -14,17 +14,17 @@ CREATE TABLE AUTHORITY (ID INTEGER NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
 CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
 CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY INTEGER PRIMARY KEY, UNIQUE_KEY INTEGER UNIQUE, FOREIGN_KEY INTEGER, CHECK_CONSTRAINT INTEGER, NOT_NULL INTEGER NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
-CREATE TABLE PATTERN (VALUE VARCHAR(10));
+CREATE TABLE PATTERN (`VALUE` VARCHAR(10));
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER AUTO_INCREMENT PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
-CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
+CREATE TABLE AUTO_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, `VALUE` VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, `VALUE` VARCHAR(10));
+CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER AUTO_INCREMENT PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, `VALUE` VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
+CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
 
 CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

diff --git a/...-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-oracle.script b/...-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-oracle.script
@@ -18,17 +18,17 @@ CREATE TABLE AUTHORITY (ID NUMERIC NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
 CREATE TABLE NO_ID (VALUE1 NUMERIC, VALUE2 NUMERIC);
 CREATE TABLE OWNER_OF_NO_ID (ID NUMERIC NOT NULL PRIMARY KEY, NO_ID_VALUE1 NUMERIC);
 CREATE TABLE CONSTRAINT_CHECKING (PRIMARY_KEY NUMERIC PRIMARY KEY, UNIQUE_KEY NUMERIC UNIQUE, FOREIGN_KEY NUMERIC, CHECK_CONSTRAINT NUMERIC, NOT_NULL NUMERIC NOT NULL, CONSTRAINT CK_CONSTRAINT_CHECKING_1 CHECK (CHECK_CONSTRAINT > 0), CONSTRAINT FK_JOB_ID FOREIGN KEY (FOREIGN_KEY) REFERENCES JOB (ID));
-CREATE TABLE PATTERN (VALUE VARCHAR2(10));
+CREATE TABLE PATTERN ("VALUE" VARCHAR2(10));
 
-CREATE TABLE ID_GENERATOR(PK VARCHAR2(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
+CREATE TABLE ID_GENERATOR(PK VARCHAR2(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
 CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR2(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
-CREATE TABLE AUTO_STRATEGY(ID NUMERIC(8) PRIMARY KEY, VALUE VARCHAR2(10));
-CREATE TABLE IDENTITY_STRATEGY(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, VALUE VARCHAR2(10), PRIMARY KEY (ID));
-CREATE TABLE IDENTITY_STRATEGY2(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, UNIQUE_VALUE VARCHAR2(10) UNIQUE, VALUE VARCHAR2(10), PRIMARY KEY (ID));
-CREATE TABLE SEQUENCE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
-CREATE TABLE SEQUENCE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
-CREATE TABLE TABLE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
-CREATE TABLE TABLE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
+CREATE TABLE AUTO_STRATEGY(ID NUMERIC(8) PRIMARY KEY, "VALUE" VARCHAR2(10));
+CREATE TABLE IDENTITY_STRATEGY(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, "VALUE" VARCHAR2(10), PRIMARY KEY (ID));
+CREATE TABLE IDENTITY_STRATEGY2(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, UNIQUE_VALUE VARCHAR2(10) UNIQUE, "VALUE" VARCHAR2(10), PRIMARY KEY (ID));
+CREATE TABLE SEQUENCE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
+CREATE TABLE SEQUENCE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
+CREATE TABLE TABLE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
+CREATE TABLE TABLE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
 
 CREATE TABLE TEAM(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20));
 CREATE TABLE PLAYER(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID NUMERIC(8));