Skip to content

Commit ef418b7

Browse files
nakamura-tonakamura-to
authored
Merge pull request #1173 from domaframework/dependencies/h2
Update H2 Database Engine to v2.3.232
2 parents 7d1b96e + 7c821dc commit ef418b7

File tree

20 files changed

+104
-87
lines changed

20 files changed

+104
-87
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ configure(integrationTestProjects) {
206206

207207
dependencies {
208208
testImplementation(platform("org.testcontainers:testcontainers-bom:1.20.1"))
209-
testRuntimeOnly("com.h2database:h2:1.4.200")
209+
testRuntimeOnly("com.h2database:h2:2.3.232")
210210
testRuntimeOnly("mysql:mysql-connector-java:8.0.33")
211211
testRuntimeOnly("com.oracle.database.jdbc:ojdbc8-production:18.15.0.0")
212212
testRuntimeOnly("org.postgresql:postgresql:42.7.4")

‎doma-core/src/main/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformer.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ public SqlNode visitSelectStatementNode(SelectStatementNode node, Void p) {
2828
} else {
2929
orderBy = new OrderByClauseNode("");
3030
}
31-
orderBy.appendNode(new FragmentNode(" limit "));
3231
if (limit > 0) {
32+
orderBy.appendNode(new FragmentNode(" limit "));
3333
orderBy.appendNode(new FragmentNode(String.valueOf(limit)));
34-
} else {
35-
orderBy.appendNode(new FragmentNode("-1"));
3634
}
3735
if (offset >= 0) {
3836
orderBy.appendNode(new FragmentNode(" offset "));

‎doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testOffsetLimit_forUpdate_semicolon() {
6363

6464
@Test
6565
public void testOffsetOnly() {
66-
String expected = "select * from emp order by emp.id limit -1 offset 5";
66+
String expected = "select * from emp order by emp.id offset 5";
6767
H2PagingTransformer transformer = new H2PagingTransformer(5, -1);
6868
SqlParser parser = new SqlParser("select * from emp order by emp.id");
6969
SqlNode sqlNode = transformer.transform(parser.parse());

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-db2.script‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ CREATE TABLE AUTHORITY (ID INTEGER NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
1717
CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
1818
CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
1919
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));
20-
CREATE TABLE PATTERN (VALUE VARCHAR(10));
20+
CREATE TABLE PATTERN ("VALUE" VARCHAR(10));
2121

22-
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
22+
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2323
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
24-
CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, VALUE VARCHAR(10));
25-
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, VALUE VARCHAR(10));
26-
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
27-
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
28-
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
29-
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
24+
CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, "VALUE" VARCHAR(10));
25+
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1 INCREMENT BY 1) PRIMARY KEY, "VALUE" VARCHAR(10));
26+
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
27+
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
28+
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
29+
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
3030

3131
CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3232
CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-h2.script‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ CREATE TABLE AUTHORITY (ID INTEGER NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
1717
CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
1818
CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
1919
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));
20-
CREATE TABLE PATTERN (VALUE VARCHAR(10));
21-
CREATE TABLE ROOM (ID INTEGER NOT NULL PRIMARY KEY, COLORS ARRAY);
20+
CREATE TABLE PATTERN ("VALUE" VARCHAR(10));
21+
CREATE TABLE ROOM (ID INTEGER NOT NULL PRIMARY KEY, COLORS varchar(10) array);
2222

23-
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
23+
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2424
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
25-
CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
26-
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
27-
CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER NOT NULL IDENTITY PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, VALUE VARCHAR(10));
28-
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
29-
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
30-
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
31-
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
25+
CREATE TABLE AUTO_STRATEGY(ID INTEGER NOT NULL generated by default as identity PRIMARY KEY, "VALUE" VARCHAR(10));
26+
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER NOT NULL generated by default as identity PRIMARY KEY, "VALUE" VARCHAR(10));
27+
CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER NOT NULL generated by default as identity PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, "VALUE" VARCHAR(10));
28+
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
29+
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
30+
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
31+
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
3232

3333
CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3434
CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-hsqldb.script‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
2222
CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
2323
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));
2424
ALTER TABLE CONSTRAINT_CHECKING ADD UNIQUE (UNIQUE_KEY);
25-
CREATE TABLE PATTERN (VALUE VARCHAR(10));
25+
CREATE TABLE PATTERN ("VALUE" VARCHAR(10));
2626

27-
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
27+
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2828
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
29-
CREATE TABLE AUTO_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
30-
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
31-
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
32-
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
33-
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
34-
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
29+
CREATE TABLE AUTO_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
30+
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
31+
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
32+
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
33+
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
34+
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, "VALUE" VARCHAR(10));
3535

3636
CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3737
CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql.script‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ CREATE TABLE AUTHORITY (ID INT NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER);
1414
CREATE TABLE NO_ID (VALUE1 INT, VALUE2 INT);
1515
CREATE TABLE OWNER_OF_NO_ID (ID INT NOT NULL PRIMARY KEY, NO_ID_VALUE1 INT);
1616
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));
17-
CREATE TABLE PATTERN (VALUE VARCHAR(10));
17+
CREATE TABLE PATTERN ([VALUE] VARCHAR(10));
1818

19-
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
19+
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2020
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
21-
CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
22-
CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
23-
CREATE TABLE IDENTITY_STRATEGY2(ID INT IDENTITY PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, VALUE VARCHAR(10));
24-
CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
25-
CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
26-
CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
27-
CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
28-
CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
21+
CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
22+
CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
23+
CREATE TABLE IDENTITY_STRATEGY2(ID INT IDENTITY PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, [VALUE] VARCHAR(10));
24+
CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
25+
CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
26+
CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
27+
CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
28+
CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
2929

3030
CREATE TABLE TEAM(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3131
CREATE TABLE PLAYER(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql2008.script‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ CREATE TABLE AUTHORITY (ID INT NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER);
1414
CREATE TABLE NO_ID (VALUE1 INT, VALUE2 INT);
1515
CREATE TABLE OWNER_OF_NO_ID (ID INT NOT NULL PRIMARY KEY, NO_ID_VALUE1 INT);
1616
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));
17-
CREATE TABLE PATTERN (VALUE VARCHAR(10));
17+
CREATE TABLE PATTERN ([VALUE] VARCHAR(10));
1818

19-
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
19+
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2020
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
21-
CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
22-
CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, VALUE VARCHAR(10));
23-
CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
24-
CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
25-
CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
26-
CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
27-
CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
21+
CREATE TABLE AUTO_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
22+
CREATE TABLE IDENTITY_STRATEGY(ID INT IDENTITY PRIMARY KEY, [VALUE] VARCHAR(10));
23+
CREATE TABLE SEQUENCE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
24+
CREATE TABLE SEQUENCE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
25+
CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
26+
CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
27+
CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, [VALUE] VARCHAR(10));
2828

2929
CREATE TABLE TEAM(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3030
CREATE TABLE PLAYER(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mysql.script‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ CREATE TABLE AUTHORITY (ID INTEGER NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
1414
CREATE TABLE NO_ID (VALUE1 INTEGER, VALUE2 INTEGER);
1515
CREATE TABLE OWNER_OF_NO_ID (ID INTEGER NOT NULL PRIMARY KEY, NO_ID_VALUE1 INTEGER);
1616
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));
17-
CREATE TABLE PATTERN (VALUE VARCHAR(10));
17+
CREATE TABLE PATTERN (`VALUE` VARCHAR(10));
1818

19-
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
19+
CREATE TABLE ID_GENERATOR(PK VARCHAR(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2020
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
21-
CREATE TABLE AUTO_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, VALUE VARCHAR(10));
22-
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, VALUE VARCHAR(10));
23-
CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER AUTO_INCREMENT PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, VALUE VARCHAR(10));
24-
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
25-
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
26-
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
27-
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
21+
CREATE TABLE AUTO_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, `VALUE` VARCHAR(10));
22+
CREATE TABLE IDENTITY_STRATEGY(ID INTEGER AUTO_INCREMENT PRIMARY KEY, `VALUE` VARCHAR(10));
23+
CREATE TABLE IDENTITY_STRATEGY2(ID INTEGER AUTO_INCREMENT PRIMARY KEY, UNIQUE_VALUE VARCHAR(10) UNIQUE, `VALUE` VARCHAR(10));
24+
CREATE TABLE SEQUENCE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
25+
CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
26+
CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
27+
CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, `VALUE` VARCHAR(10));
2828

2929
CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3030
CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);

‎integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-oracle.script‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ CREATE TABLE AUTHORITY (ID NUMERIC NOT NULL PRIMARY KEY, AUTHORITY_TYPE INTEGER)
1818
CREATE TABLE NO_ID (VALUE1 NUMERIC, VALUE2 NUMERIC);
1919
CREATE TABLE OWNER_OF_NO_ID (ID NUMERIC NOT NULL PRIMARY KEY, NO_ID_VALUE1 NUMERIC);
2020
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));
21-
CREATE TABLE PATTERN (VALUE VARCHAR2(10));
21+
CREATE TABLE PATTERN ("VALUE" VARCHAR2(10));
2222

23-
CREATE TABLE ID_GENERATOR(PK VARCHAR2(20) NOT NULL PRIMARY KEY, VALUE INTEGER NOT NULL);
23+
CREATE TABLE ID_GENERATOR(PK VARCHAR2(20) NOT NULL PRIMARY KEY, VAL INTEGER NOT NULL);
2424
CREATE TABLE MY_ID_GENERATOR(MY_PK VARCHAR2(20) NOT NULL PRIMARY KEY, MY_VALUE INTEGER NOT NULL);
25-
CREATE TABLE AUTO_STRATEGY(ID NUMERIC(8) PRIMARY KEY, VALUE VARCHAR2(10));
26-
CREATE TABLE IDENTITY_STRATEGY(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, VALUE VARCHAR2(10), PRIMARY KEY (ID));
27-
CREATE TABLE IDENTITY_STRATEGY2(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, UNIQUE_VALUE VARCHAR2(10) UNIQUE, VALUE VARCHAR2(10), PRIMARY KEY (ID));
28-
CREATE TABLE SEQUENCE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
29-
CREATE TABLE SEQUENCE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
30-
CREATE TABLE TABLE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
31-
CREATE TABLE TABLE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
25+
CREATE TABLE AUTO_STRATEGY(ID NUMERIC(8) PRIMARY KEY, "VALUE" VARCHAR2(10));
26+
CREATE TABLE IDENTITY_STRATEGY(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, "VALUE" VARCHAR2(10), PRIMARY KEY (ID));
27+
CREATE TABLE IDENTITY_STRATEGY2(ID NUMERIC(8) GENERATED ALWAYS AS IDENTITY, UNIQUE_VALUE VARCHAR2(10) UNIQUE, "VALUE" VARCHAR2(10), PRIMARY KEY (ID));
28+
CREATE TABLE SEQUENCE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
29+
CREATE TABLE SEQUENCE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
30+
CREATE TABLE TABLE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
31+
CREATE TABLE TABLE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, "VALUE" VARCHAR2(10));
3232

3333
CREATE TABLE TEAM(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20));
3434
CREATE TABLE PLAYER(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID NUMERIC(8));

0 commit comments

Comments
 (0)