Skip to content

Commit 449c3d2

Browse files
momosetknmomosetkn
committed
Remove onlyIf for upsert
1 parent d08e630 commit 449c3d2

File tree

6 files changed

+2
-26
lines changed

6 files changed

+2
-26
lines changed

‎integration-test-java/src/test/java/org/seasar/doma/it/auto/AutoBatchInsertTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ public void testEmbeddable(Config config) throws Exception {
334334
}
335335

336336
@Test
337-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
338337
public void insert_DuplicateKeyType_UPDATE(Config config) throws Exception {
339338
DeptDao dao = new DeptDaoImpl(config);
340339
Dept dept1 = new Dept(new Identity<Dept>(5), 50, "PLANNING", new Location<>("TOKYO"), null);
@@ -382,7 +381,6 @@ public void insert_DuplicateKeyType_UPDATE(Config config) throws Exception {
382381
}
383382

384383
@Test
385-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
386384
public void insert_DuplicateKeyType_IGNORE(Config config) throws Exception {
387385
DeptDao dao = new DeptDaoImpl(config);
388386
Dept dept1 = new Dept(new Identity<Dept>(5), 50, "PLANNING", new Location<>("TOKYO"), null);

‎integration-test-java/src/test/java/org/seasar/doma/it/auto/AutoInsertTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ public void testNestedEntity(Config config) throws Exception {
331331
}
332332

333333
@Test
334-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
335334
public void insert_DuplicateKeyType_UPDATE_nonDuplicated(Config config) throws Exception {
336335
DeptDao dao = new DeptDaoImpl(config);
337336
Dept dept = new Dept(new Identity<Dept>(5), 50, "PLANNING", new Location<>("TOKYO"), null);
@@ -355,7 +354,6 @@ public void insert_DuplicateKeyType_UPDATE_nonDuplicated(Config config) throws E
355354
}
356355

357356
@Test
358-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
359357
public void insert_DuplicateKeyType_UPDATE_duplicated(Config config) throws Exception {
360358
DeptDao dao = new DeptDaoImpl(config);
361359
Dept dept = new Dept(new Identity<Dept>(1), 60, "DEVELOPMENT", new Location<>("KYOTO"), null);
@@ -385,7 +383,6 @@ public void insert_DuplicateKeyType_UPDATE_duplicated(Config config) throws Exce
385383
}
386384

387385
@Test
388-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
389386
public void insert_DuplicateKeyType_IGNORE_nonDuplicated(Config config) throws Exception {
390387
DeptDao dao = new DeptDaoImpl(config);
391388
Dept dept = new Dept(new Identity<Dept>(5), 50, "PLANNING", new Location<>("TOKYO"), null);
@@ -409,7 +406,6 @@ public void insert_DuplicateKeyType_IGNORE_nonDuplicated(Config config) throws E
409406
}
410407

411408
@Test
412-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
413409
public void insert_DuplicateKeyType_IGNORE_duplicated(Config config) throws Exception {
414410
DeptDao dao = new DeptDaoImpl(config);
415411
Dept dept = new Dept(new Identity<Dept>(1), 60, "DEVELOPMENT", new Location<>("KYOTO"), null);

‎integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlBatchInsertTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
import java.util.List;
1111
import org.junit.jupiter.api.Test;
1212
import org.junit.jupiter.api.extension.ExtendWith;
13-
import org.seasar.doma.it.Dbms;
1413
import org.seasar.doma.it.IntegrationTestEnvironment;
15-
import org.seasar.doma.it.Run;
1614
import org.seasar.doma.jdbc.BatchResult;
1715
import org.seasar.doma.jdbc.Config;
1816
import org.seasar.doma.jdbc.criteria.Entityql;
@@ -69,7 +67,6 @@ void empty() {
6967
}
7068

7169
@Test
72-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
7370
public void batch_onDuplicateKeyUpdate() {
7471
Department_ d = new Department_();
7572

@@ -109,7 +106,6 @@ public void batch_onDuplicateKeyUpdate() {
109106
}
110107

111108
@Test
112-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
113109
public void batch_onDuplicateKeyIgnore() {
114110
Department_ d = new Department_();
115111

‎integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlInsertTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public void uuid() {
6161
}
6262

6363
@Test
64-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
6564
public void onDuplicateKeyUpdate_nonDuplicated() {
6665
Department_ d = new Department_();
6766

@@ -82,7 +81,6 @@ public void onDuplicateKeyUpdate_nonDuplicated() {
8281
}
8382

8483
@Test
85-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
8684
public void onDuplicateKeyUpdate_duplicated() {
8785
Department_ d = new Department_();
8886

@@ -107,7 +105,6 @@ public void onDuplicateKeyUpdate_duplicated() {
107105
}
108106

109107
@Test
110-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
111108
public void onDuplicateKeyIgnore_nonDuplicated() {
112109
Department_ d = new Department_();
113110

@@ -128,7 +125,6 @@ public void onDuplicateKeyIgnore_nonDuplicated() {
128125
}
129126

130127
@Test
131-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
132128
public void onDuplicateKeyIgnore_duplicated() {
133129
Department_ d = new Department_();
134130

‎integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlSelectTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ void where_in_subQuery() {
370370
}
371371

372372
@Test
373-
@Run(onlyIf = {Dbms.H2, Dbms.MYSQL, Dbms.POSTGRESQL})
373+
@Run(onlyIf = {Dbms.H2, Dbms.MYSQL, Dbms.POSTGRESQL, Dbms.H2, Dbms.ORACLE})
374374
void where_in3() {
375375
Employee_ e = new Employee_();
376376

@@ -392,7 +392,7 @@ void where_in3() {
392392
}
393393

394394
@Test
395-
@Run(onlyIf = {Dbms.H2, Dbms.MYSQL, Dbms.POSTGRESQL})
395+
@Run(onlyIf = {Dbms.H2, Dbms.MYSQL, Dbms.POSTGRESQL, Dbms.H2, Dbms.ORACLE})
396396
void where_in3_subQuery() {
397397
Employee_ e = new Employee_();
398398
Employee_ e2 = new Employee_();

‎integration-test-java/src/test/java/org/seasar/doma/it/criteria/NativeSqlInsertTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import java.util.Arrays;
66
import org.junit.jupiter.api.Test;
77
import org.junit.jupiter.api.extension.ExtendWith;
8-
import org.seasar.doma.it.Dbms;
98
import org.seasar.doma.it.IntegrationTestEnvironment;
10-
import org.seasar.doma.it.Run;
119
import org.seasar.doma.jdbc.Config;
1210
import org.seasar.doma.jdbc.SqlLogType;
1311
import org.seasar.doma.jdbc.criteria.NativeSql;
@@ -72,7 +70,6 @@ void insert() {
7270
}
7371

7472
@Test
75-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
7673
void insert_onDuplicateKeyUpdate_duplicate() {
7774
Department_ d = new Department_();
7875

@@ -112,7 +109,6 @@ void insert_onDuplicateKeyUpdate_duplicate() {
112109
}
113110

114111
@Test
115-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
116112
void insert_onDuplicateKeyUpdate_nonDuplicate() {
117113
Department_ d = new Department_();
118114

@@ -148,7 +144,6 @@ void insert_onDuplicateKeyUpdate_nonDuplicate() {
148144
}
149145

150146
@Test
151-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
152147
void insert_onDuplicateKeyUpdate_emptyKey() {
153148
Department_ d = new Department_();
154149

@@ -187,7 +182,6 @@ void insert_onDuplicateKeyUpdate_emptyKey() {
187182
}
188183

189184
@Test
190-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
191185
void insert_onDuplicateKeyUpdate_emptySetValue() {
192186
Department_ d = new Department_();
193187

@@ -221,7 +215,6 @@ void insert_onDuplicateKeyUpdate_emptySetValue() {
221215
}
222216

223217
@Test
224-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
225218
void insert_onDuplicateKeyUpdate_emptyKey_emptySetValue() {
226219
Department_ d = new Department_();
227220

@@ -254,7 +247,6 @@ void insert_onDuplicateKeyUpdate_emptyKey_emptySetValue() {
254247
}
255248

256249
@Test
257-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
258250
void insert_onDuplicateKeyIgnore_duplicate() {
259251
Department_ d = new Department_();
260252

@@ -284,7 +276,6 @@ void insert_onDuplicateKeyIgnore_duplicate() {
284276
}
285277

286278
@Test
287-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
288279
void insert_onDuplicateKeyIgnore_nonDuplicate() {
289280
Department_ d = new Department_();
290281

@@ -314,7 +305,6 @@ void insert_onDuplicateKeyIgnore_nonDuplicate() {
314305
}
315306

316307
@Test
317-
@Run(onlyIf = {Dbms.MYSQL, Dbms.POSTGRESQL}) // TODO: Implement it to work in other dialects
318308
void insert_onDuplicateKeyIgnore_emptyKey() {
319309
Department_ d = new Department_();
320310

0 commit comments

Comments
 (0)