Change for domaframework/doma#748 [skip ci] (#210)

nakamura-to · web-flow · commit ade3c629e000 · 2021-10-24T14:22:47.000+09:00
diff --git a/common/src/main/java/org/seasar/doma/it/AppConfig.java b/common/src/main/java/org/seasar/doma/it/AppConfig.java
@@ -7,12 +7,12 @@
 import org.seasar.doma.jdbc.Naming;
 import org.seasar.doma.jdbc.RequiresNewController;
 import org.seasar.doma.jdbc.SimpleDataSource;
-import org.seasar.doma.jdbc.Slf4jJdbcLogger;
 import org.seasar.doma.jdbc.dialect.Dialect;
 import org.seasar.doma.jdbc.tx.LocalTransaction;
 import org.seasar.doma.jdbc.tx.LocalTransactionDataSource;
 import org.seasar.doma.jdbc.tx.LocalTransactionManager;
 import org.seasar.doma.jdbc.tx.TransactionManager;
+import org.seasar.doma.slf4j.Slf4jJdbcLogger;
 
 public class AppConfig implements Config {
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-domaVersion=2.49.0
+domaVersion=2.49.1-SNAPSHOT
 org.gradle.caching=true
 jdbcUrl=
 jdbcUser=
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KDifferenceBetweenTwoDsls.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KDifferenceBetweenTwoDsls.kt
@@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
-import org.seasar.doma.jdbc.criteria.KNativeSql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KNativeSql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KDifferenceBetweenTwoDsls(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlBatchDeleteTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlBatchDeleteTest.kt
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KEntityqlBatchDeleteTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlBatchInsertTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlBatchInsertTest.kt
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KEntityqlBatchInsertTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlBatchUpdateTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlBatchUpdateTest.kt
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KEntityqlBatchUpdateTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlDeleteTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlDeleteTest.kt
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KEntityqlDeleteTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlInsertTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlInsertTest.kt
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KEntityqlInsertTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlSelectTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlSelectTest.kt
@@ -10,11 +10,11 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
 import org.seasar.doma.jdbc.SqlLogType
-import org.seasar.doma.jdbc.criteria.KEntityql
-import org.seasar.doma.jdbc.criteria.expression.KExpressions
 import org.seasar.doma.jdbc.criteria.option.AssociationOption
 import org.seasar.doma.jdbc.criteria.statement.EmptyWhereClauseException
-import org.seasar.doma.jdbc.criteria.statement.KListable
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.expression.KExpressions
+import org.seasar.doma.kotlin.jdbc.criteria.statement.KListable
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KEntityqlSelectTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlUpdateTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KEntityqlUpdateTest.kt
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 import java.math.BigDecimal
 
 @ExtendWith(IntegrationTestEnvironment::class)
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KImmutableTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KImmutableTest.kt
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
-import org.seasar.doma.jdbc.criteria.KEntityql
+import org.seasar.doma.kotlin.jdbc.criteria.KEntityql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KImmutableTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlDeleteTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlDeleteTest.kt
@@ -7,8 +7,8 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
 import org.seasar.doma.jdbc.SqlLogType
-import org.seasar.doma.jdbc.criteria.KNativeSql
 import org.seasar.doma.jdbc.criteria.statement.EmptyWhereClauseException
+import org.seasar.doma.kotlin.jdbc.criteria.KNativeSql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KNativeSqlDeleteTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlInsertTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlInsertTest.kt
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.jdbc.Config
 import org.seasar.doma.jdbc.SqlLogType
-import org.seasar.doma.jdbc.criteria.KNativeSql
+import org.seasar.doma.kotlin.jdbc.criteria.KNativeSql
 
 @ExtendWith(IntegrationTestEnvironment::class)
 class KNativeSqlInsertTest(config: Config) {
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlSelectTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlSelectTest.kt
@@ -13,12 +13,12 @@ import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.it.Run
 import org.seasar.doma.jdbc.Config
 import org.seasar.doma.jdbc.SqlLogType
-import org.seasar.doma.jdbc.criteria.KNativeSql
 import org.seasar.doma.jdbc.criteria.expression.Expressions
-import org.seasar.doma.jdbc.criteria.expression.KExpressions
 import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel
 import org.seasar.doma.jdbc.criteria.statement.EmptyWhereClauseException
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2
+import org.seasar.doma.kotlin.jdbc.criteria.KNativeSql
+import org.seasar.doma.kotlin.jdbc.criteria.expression.KExpressions
 import java.math.BigDecimal
 import java.time.LocalDate
 
diff --git a/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlUpdateTest.kt b/kotlin/src/test/kotlin/org/seasar/doma/it/criteria/KNativeSqlUpdateTest.kt
@@ -9,13 +9,13 @@ import org.seasar.doma.it.IntegrationTestEnvironment
 import org.seasar.doma.it.Run
 import org.seasar.doma.jdbc.Config
 import org.seasar.doma.jdbc.SqlLogType
-import org.seasar.doma.jdbc.criteria.KNativeSql
 import org.seasar.doma.jdbc.criteria.declaration.JoinDeclaration
 import org.seasar.doma.jdbc.criteria.declaration.WhereDeclaration
 import org.seasar.doma.jdbc.criteria.expression.Expressions
-import org.seasar.doma.jdbc.criteria.expression.KExpressions
 import org.seasar.doma.jdbc.criteria.expression.SelectExpression
 import org.seasar.doma.jdbc.criteria.statement.EmptyWhereClauseException
+import org.seasar.doma.kotlin.jdbc.criteria.KNativeSql
+import org.seasar.doma.kotlin.jdbc.criteria.expression.KExpressions
 import java.math.BigDecimal
 
 @ExtendWith(IntegrationTestEnvironment::class)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-domaVersion=2.49.0`
	`1`	`+domaVersion=2.49.1-SNAPSHOT`
`2`	`2`	`org.gradle.caching=true`
`3`	`3`	`jdbcUrl=`
`4`	`4`	`jdbcUser=`