From 7651bfbec4c5624411476ffe87efa8bc702bbf29 Mon Sep 17 00:00:00 2001 From: babyfish-ct Date: Mon, 18 Nov 2024 03:28:12 +0800 Subject: [PATCH] Fix API error because some problems found during doc refactor --- project/gradle.properties | 2 +- .../org/babyfish/jimmer/spring/repo/PageParam.java | 12 ++++++++++++ .../jimmer/sql/kt/common/AbstractMutationTest.kt | 2 +- .../babyfish/jimmer/sql/kt/common/AbstractTest.kt | 2 +- .../org/babyfish/jimmer/sql/kt/filter/DeleteTest.kt | 2 +- .../jimmer/sql/kt/filter/DeleteWithTriggerTest.kt | 2 +- .../org/babyfish/jimmer/sql/kt/filter/SaveTest.kt | 2 +- .../jimmer/sql/kt/filter/SaveWithTriggerTest.kt | 2 +- .../org/babyfish/jimmer/sql/kt/mutation/DMLTest.kt | 3 +-- .../sql/kt/mutation/InheritanceMutationTest.kt | 2 +- .../babyfish/jimmer/sql/kt/o2o/O2OMutationTest.kt | 2 +- .../impl/mutation/AbstractAssociationOperator.java | 1 + .../sql/ast/impl/mutation/ChildTableOperator.java | 1 + .../sql/ast/impl/mutation/EntityInvestigator.java | 1 + .../ast/impl/mutation/MiddleTableInvestigator.java | 1 + .../sql/ast/impl/mutation/MiddleTableOperator.java | 1 + .../sql/ast/impl/mutation/MutableDeleteImpl.java | 1 + .../jimmer/sql/ast/impl/mutation/Operator.java | 1 + .../jimmer/sql/ast/impl/mutation/PreHandler.java | 1 + .../babyfish/jimmer/sql/ast/impl/mutation/Rows.java | 2 +- .../sql/ast/{impl => }/mutation/QueryReason.java | 2 +- .../babyfish/jimmer/sql/ast/mutation/SaveMode.java | 2 +- .../jimmer/sql/ast/query/ConfigurableRootQuery.java | 3 ++- .../babyfish/jimmer/sql/dialect/PostgresDialect.java | 2 +- .../jimmer/sql/runtime/ExecutionPurpose.java | 2 +- .../ast/impl/mutation/ModifyBySelectChildTest.java | 1 + .../jimmer/sql/ast/impl/mutation/RowsTest.java | 3 +-- .../jimmer/sql/common/AbstractMutationTest.java | 2 +- .../org/babyfish/jimmer/sql/common/AbstractTest.java | 2 +- .../babyfish/jimmer/sql/embedded/CommandTest.java | 2 +- .../embedded/CommandWhenTupleIsNotSupportedTest.java | 2 +- .../jimmer/sql/embedded/CommandWithTriggerTest.java | 2 +- .../jimmer/sql/embedded/EmbeddedEnumTest.java | 2 -- .../org/babyfish/jimmer/sql/filter/SaveTest.java | 2 +- .../jimmer/sql/mutation/CascadeSaveTest.java | 2 +- .../jimmer/sql/mutation/ConstraintViolationTest.java | 2 +- .../sql/mutation/DatabaseAutoIdUpsertTest.java | 2 +- .../sql/mutation/DeleteDetachedObjectTest.java | 2 +- .../jimmer/sql/mutation/DraftHandlerTest.java | 2 +- .../org/babyfish/jimmer/sql/mutation/GetIdTest.java | 2 +- .../babyfish/jimmer/sql/mutation/IdentityTest.java | 1 - .../jimmer/sql/mutation/InheritanceMutationTest.java | 2 +- .../sql/mutation/MultipleKeyConstraintTest.java | 2 +- .../org/babyfish/jimmer/sql/mutation/SaveTest.java | 2 +- .../jimmer/sql/mutation/ShortAssociationTest.java | 3 +-- .../trigger/AssociationMutationWithTriggerTest.java | 2 +- .../sql/trigger/CascadeSaveWithTriggerTest.java | 2 +- 47 files changed, 57 insertions(+), 41 deletions(-) rename project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/{impl => }/mutation/QueryReason.java (99%) diff --git a/project/gradle.properties b/project/gradle.properties index b16bd7aaa1..f099a0b1dc 100644 --- a/project/gradle.properties +++ b/project/gradle.properties @@ -1,2 +1,2 @@ group=org.babyfish.jimmer -version=0.9.18 +version=0.9.19 diff --git a/project/jimmer-spring-boot-starter/src/main/java/org/babyfish/jimmer/spring/repo/PageParam.java b/project/jimmer-spring-boot-starter/src/main/java/org/babyfish/jimmer/spring/repo/PageParam.java index 06518f3b01..29e8ecbdd8 100644 --- a/project/jimmer-spring-boot-starter/src/main/java/org/babyfish/jimmer/spring/repo/PageParam.java +++ b/project/jimmer-spring-boot-starter/src/main/java/org/babyfish/jimmer/spring/repo/PageParam.java @@ -11,6 +11,12 @@ private PageParam(int index, int size) { this.size = size; } + /** + * Construct page param by page index and page size + * @param index Start from 0 + * @param size Must be greater than or equal to 0 + * @return A new page param object + */ public static PageParam byIndex(int index, int size) { if (index < 0) { throw new IllegalArgumentException("index cannot be negative"); @@ -21,6 +27,12 @@ public static PageParam byIndex(int index, int size) { return new PageParam(index, size); } + /** + * Construct page param by page number and page size + * @param no Start from 1 + * @param size Must be greater than or equal to 0 + * @return A new page param object + */ public static PageParam byNo(int no, int size) { if (no < 0) { throw new IllegalArgumentException("no must be negative"); diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractMutationTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractMutationTest.kt index 842107ce2c..0f6d4deca5 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractMutationTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractMutationTest.kt @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.kt.common -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.ast.mutation.MutationResultItem import org.babyfish.jimmer.sql.kt.ast.KExecutable import org.babyfish.jimmer.sql.kt.ast.mutation.KBatchSaveResult diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractTest.kt index a8386e4c99..7775a9f8ae 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/common/AbstractTest.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import org.babyfish.jimmer.jackson.ImmutableModule import org.babyfish.jimmer.meta.ImmutableProp -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.kt.KSqlClient import org.babyfish.jimmer.sql.kt.cfg.KSqlClientDsl import org.babyfish.jimmer.sql.kt.newKSqlClient diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteTest.kt index b86c9c73fa..6f3dc1a996 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteTest.kt @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.kt.filter -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.kt.common.AbstractMutationTest import org.babyfish.jimmer.sql.kt.filter.common.FileFilter import org.babyfish.jimmer.sql.kt.model.filter.File diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteWithTriggerTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteWithTriggerTest.kt index 028fa87029..66a758b114 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteWithTriggerTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/DeleteWithTriggerTest.kt @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.kt.filter -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.kt.common.AbstractTriggerTest import org.babyfish.jimmer.sql.kt.filter.common.FileFilter import org.babyfish.jimmer.sql.kt.model.filter.File diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveTest.kt index 5f377956ab..50b3e949d2 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveTest.kt @@ -1,7 +1,7 @@ package org.babyfish.jimmer.sql.kt.filter import org.babyfish.jimmer.kt.new -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.collection.TypedList import org.babyfish.jimmer.sql.dialect.H2Dialect import org.babyfish.jimmer.sql.kt.KSqlClient diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveWithTriggerTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveWithTriggerTest.kt index 02e0a1c4ac..544d6e8573 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveWithTriggerTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/SaveWithTriggerTest.kt @@ -1,7 +1,7 @@ package org.babyfish.jimmer.sql.kt.filter import org.babyfish.jimmer.kt.new -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.kt.KSqlClient import org.babyfish.jimmer.sql.kt.cfg.KSqlClientDsl import org.babyfish.jimmer.sql.kt.common.AbstractTriggerTest diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/DMLTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/DMLTest.kt index 6644fc5aee..565124b80f 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/DMLTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/DMLTest.kt @@ -1,10 +1,9 @@ package org.babyfish.jimmer.sql.kt.mutation -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.ast.mutation.DeleteMode import org.babyfish.jimmer.sql.kt.ast.expression.* import org.babyfish.jimmer.sql.kt.common.AbstractMutationTest -import org.babyfish.jimmer.sql.kt.model.* import org.babyfish.jimmer.sql.kt.model.classic.author.firstName import org.babyfish.jimmer.sql.kt.model.classic.book.Book import org.babyfish.jimmer.sql.kt.model.classic.book.authors diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/InheritanceMutationTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/InheritanceMutationTest.kt index 6baa9db00c..88b3a1bb22 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/InheritanceMutationTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/InheritanceMutationTest.kt @@ -3,7 +3,7 @@ package org.babyfish.jimmer.sql.kt.mutation import org.babyfish.jimmer.kt.isLoaded import org.babyfish.jimmer.kt.new import org.babyfish.jimmer.sql.DraftInterceptor -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.kt.KSqlClient import org.babyfish.jimmer.sql.kt.common.AbstractMutationTest import org.babyfish.jimmer.sql.kt.common.PreparedIdGenerator diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/o2o/O2OMutationTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/o2o/O2OMutationTest.kt index 7f20871af7..f27cb5aa74 100644 --- a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/o2o/O2OMutationTest.kt +++ b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/o2o/O2OMutationTest.kt @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.kt.o2o -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason +import org.babyfish.jimmer.sql.ast.mutation.QueryReason import org.babyfish.jimmer.sql.dialect.H2Dialect import org.babyfish.jimmer.sql.kt.common.AbstractMutationTest import org.babyfish.jimmer.sql.kt.model.o2o.Customer diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/AbstractAssociationOperator.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/AbstractAssociationOperator.java index 9f2ef52d3f..d82beae75d 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/AbstractAssociationOperator.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/AbstractAssociationOperator.java @@ -2,6 +2,7 @@ import org.babyfish.jimmer.meta.ImmutableProp; import org.babyfish.jimmer.sql.ast.impl.render.BatchSqlBuilder; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.tuple.Tuple2; import org.babyfish.jimmer.sql.ast.tuple.Tuple3; import org.babyfish.jimmer.sql.meta.MiddleTable; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/ChildTableOperator.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/ChildTableOperator.java index 10214652e4..54259f283e 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/ChildTableOperator.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/ChildTableOperator.java @@ -15,6 +15,7 @@ import org.babyfish.jimmer.sql.ast.impl.render.BatchSqlBuilder; import org.babyfish.jimmer.sql.ast.impl.render.ComparisonPredicates; import org.babyfish.jimmer.sql.ast.impl.value.ValueGetter; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.query.ConfigurableRootQuery; import org.babyfish.jimmer.sql.ast.table.Table; import org.babyfish.jimmer.sql.ast.tuple.Tuple2; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntityInvestigator.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntityInvestigator.java index 474d4f718f..e77eb9668b 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntityInvestigator.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/EntityInvestigator.java @@ -2,6 +2,7 @@ import org.babyfish.jimmer.meta.*; import org.babyfish.jimmer.runtime.ImmutableSpi; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.fetcher.Fetcher; import org.babyfish.jimmer.sql.fetcher.IdOnlyFetchType; import org.babyfish.jimmer.sql.fetcher.impl.FetcherImpl; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableInvestigator.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableInvestigator.java index 5a862fd0d3..bad14b1346 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableInvestigator.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableInvestigator.java @@ -3,6 +3,7 @@ import org.babyfish.jimmer.meta.ImmutableType; import org.babyfish.jimmer.meta.PropId; import org.babyfish.jimmer.runtime.ImmutableSpi; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.tuple.Tuple2; import org.babyfish.jimmer.sql.fetcher.Fetcher; import org.babyfish.jimmer.sql.fetcher.impl.FetcherImpl; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableOperator.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableOperator.java index b232edda6f..af9d0c6452 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableOperator.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MiddleTableOperator.java @@ -11,6 +11,7 @@ import org.babyfish.jimmer.sql.ast.impl.value.GetterMetadata; import org.babyfish.jimmer.sql.ast.impl.value.ValueGetter; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.tuple.Tuple2; import org.babyfish.jimmer.sql.ast.tuple.Tuple3; import org.babyfish.jimmer.sql.dialect.Dialect; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MutableDeleteImpl.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MutableDeleteImpl.java index 3f7a78abd8..864842debe 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MutableDeleteImpl.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/MutableDeleteImpl.java @@ -15,6 +15,7 @@ import org.babyfish.jimmer.sql.ast.impl.table.TableImplementor; import org.babyfish.jimmer.sql.ast.mutation.DeleteMode; import org.babyfish.jimmer.sql.ast.mutation.MutableDelete; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.table.Table; import org.babyfish.jimmer.sql.ast.table.TableEx; import org.babyfish.jimmer.sql.ast.table.spi.TableProxy; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Operator.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Operator.java index 66f7d7ca6b..b61e86605f 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Operator.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Operator.java @@ -13,6 +13,7 @@ import org.babyfish.jimmer.sql.ast.impl.table.TableImplementor; import org.babyfish.jimmer.sql.ast.impl.value.PropertyGetter; import org.babyfish.jimmer.sql.ast.impl.value.ValueGetter; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.UnloadedVersionBehavior; import org.babyfish.jimmer.sql.ast.mutation.UserOptimisticLock; import org.babyfish.jimmer.sql.ast.table.Table; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/PreHandler.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/PreHandler.java index 77a4d5d8bf..25c6330371 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/PreHandler.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/PreHandler.java @@ -12,6 +12,7 @@ import org.babyfish.jimmer.sql.ast.impl.query.MutableRootQueryImpl; import org.babyfish.jimmer.sql.ast.impl.util.ConcattedIterator; import org.babyfish.jimmer.sql.ast.impl.value.PropertyGetter; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.SaveMode; import org.babyfish.jimmer.sql.ast.mutation.UnloadedVersionBehavior; import org.babyfish.jimmer.sql.ast.mutation.UserOptimisticLock; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Rows.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Rows.java index fb4633e9f5..f831e9eb36 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Rows.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Rows.java @@ -7,12 +7,12 @@ import org.babyfish.jimmer.sql.ast.impl.query.FilterLevel; import org.babyfish.jimmer.sql.ast.impl.query.Queries; import org.babyfish.jimmer.sql.ast.mutation.LockMode; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.query.MutableQuery; import org.babyfish.jimmer.sql.ast.table.Table; import org.babyfish.jimmer.sql.fetcher.Fetcher; import org.babyfish.jimmer.sql.runtime.ExecutionPurpose; import org.babyfish.jimmer.sql.runtime.JSqlClientImplementor; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.sql.Connection; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/QueryReason.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/QueryReason.java similarity index 99% rename from project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/QueryReason.java rename to project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/QueryReason.java index ae7cda332f..cf77403b2d 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/QueryReason.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/QueryReason.java @@ -1,4 +1,4 @@ -package org.babyfish.jimmer.sql.ast.impl.mutation; +package org.babyfish.jimmer.sql.ast.mutation; import org.babyfish.jimmer.sql.KeyUniqueConstraint; import org.babyfish.jimmer.sql.dialect.Dialect; diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/SaveMode.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/SaveMode.java index 9d87a59f4b..2efc2df21b 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/SaveMode.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/mutation/SaveMode.java @@ -23,7 +23,7 @@ public enum SaveMode { *

In this case, the {@code purpose} field of the * corresponding SQL statement in the SQL log will * provide the query reason. Users can refer to - * {@link org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason} + * {@link QueryReason} * to understand what happened, in an effort to * optimize to the former situation.

* diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/query/ConfigurableRootQuery.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/query/ConfigurableRootQuery.java index 8cb9f25155..4f51d7a851 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/query/ConfigurableRootQuery.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/query/ConfigurableRootQuery.java @@ -56,7 +56,8 @@ default boolean exists() { default boolean exists(Connection con) { return !limit(1, 0L) .reselect((q, t) -> q.select(Expression.constant(1))) - .execute(con).isEmpty(); + .execute(con) + .isEmpty(); } @NotNull diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/dialect/PostgresDialect.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/dialect/PostgresDialect.java index 5e7de2e182..403dea9e81 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/dialect/PostgresDialect.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/dialect/PostgresDialect.java @@ -235,7 +235,7 @@ public void upsert(UpsertContext ctx) { ctx.sql(" returning ").appendGeneratedId(); } } else if (ctx.hasGeneratedId()) { - ctx.sql(" do update set ").sql(FAKE_UPDATE_COMMENT).sql(" "); + ctx.sql(" do update set "); List conflictGetters = ctx.getConflictGetters(); ValueGetter cheapestGetter = conflictGetters.get(0); for (ValueGetter getter : conflictGetters) { diff --git a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/runtime/ExecutionPurpose.java b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/runtime/ExecutionPurpose.java index e03c46e681..485968cb5e 100644 --- a/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/runtime/ExecutionPurpose.java +++ b/project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/runtime/ExecutionPurpose.java @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.runtime; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; public interface ExecutionPurpose { diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/ModifyBySelectChildTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/ModifyBySelectChildTest.java index 37a5c2e668..0591778e1d 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/ModifyBySelectChildTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/ModifyBySelectChildTest.java @@ -2,6 +2,7 @@ import org.babyfish.jimmer.sql.DissociateAction; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.tuple.Tuple2; import org.babyfish.jimmer.sql.dialect.H2Dialect; import org.babyfish.jimmer.sql.event.TriggerType; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/RowsTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/RowsTest.java index 5177ad8ddf..112e13f5f7 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/RowsTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/ast/impl/mutation/RowsTest.java @@ -2,8 +2,7 @@ import org.babyfish.jimmer.meta.ImmutableType; import org.babyfish.jimmer.runtime.ImmutableSpi; -import org.babyfish.jimmer.sql.JSqlClient; -import org.babyfish.jimmer.sql.ast.impl.mutation.Rows; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.common.AbstractQueryTest; import org.babyfish.jimmer.sql.fetcher.Fetcher; import org.babyfish.jimmer.sql.model.TreeNode; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractMutationTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractMutationTest.java index 2cdbdd0efc..66da3cdb70 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractMutationTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractMutationTest.java @@ -2,7 +2,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.babyfish.jimmer.sql.ast.Executable; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.*; import org.babyfish.jimmer.sql.collection.TypedList; import org.babyfish.jimmer.sql.runtime.ExecutionPurpose; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractTest.java index 86b018e5a9..1344b7be25 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/common/AbstractTest.java @@ -4,7 +4,7 @@ import org.babyfish.jimmer.sql.Entities; import org.babyfish.jimmer.sql.JSqlClient; import org.babyfish.jimmer.sql.TransientResolver; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.di.DefaultTransientResolverProvider; import org.babyfish.jimmer.sql.dialect.H2Dialect; import org.babyfish.jimmer.sql.event.Triggers; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandTest.java index d8eae65b46..18fe4fb661 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandTest.java @@ -1,7 +1,7 @@ package org.babyfish.jimmer.sql.embedded; import org.babyfish.jimmer.sql.DissociateAction; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.model.embedded.*; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWhenTupleIsNotSupportedTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWhenTupleIsNotSupportedTest.java index d4414a920c..65db0c5fbd 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWhenTupleIsNotSupportedTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWhenTupleIsNotSupportedTest.java @@ -2,7 +2,7 @@ import org.babyfish.jimmer.sql.DissociateAction; import org.babyfish.jimmer.sql.JSqlClient; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.dialect.H2Dialect; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWithTriggerTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWithTriggerTest.java index 829500946a..3346ef14fb 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWithTriggerTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/CommandWithTriggerTest.java @@ -1,7 +1,7 @@ package org.babyfish.jimmer.sql.embedded; import org.babyfish.jimmer.sql.DissociateAction; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.model.embedded.*; import org.babyfish.jimmer.sql.trigger.AbstractTriggerTest; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/EmbeddedEnumTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/EmbeddedEnumTest.java index 387050ed00..a079b9e747 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/EmbeddedEnumTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/embedded/EmbeddedEnumTest.java @@ -1,8 +1,6 @@ package org.babyfish.jimmer.sql.embedded; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; import org.babyfish.jimmer.sql.common.AbstractMutationTest; -import org.babyfish.jimmer.sql.common.AbstractQueryTest; import org.babyfish.jimmer.sql.meta.impl.IdentityIdGenerator; import org.babyfish.jimmer.sql.model.embedded.*; import org.junit.jupiter.api.Test; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/filter/SaveTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/filter/SaveTest.java index a7b29ce58b..70ea9ef1ca 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/filter/SaveTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/filter/SaveTest.java @@ -1,7 +1,7 @@ package org.babyfish.jimmer.sql.filter; import org.babyfish.jimmer.sql.JSqlClient; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.filter.common.FileFilter; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/CascadeSaveTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/CascadeSaveTest.java index fc1d131fa4..0805912277 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/CascadeSaveTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/CascadeSaveTest.java @@ -4,7 +4,7 @@ import org.babyfish.jimmer.sql.DissociateAction; import org.babyfish.jimmer.sql.DraftInterceptor; import org.babyfish.jimmer.sql.TargetTransferMode; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.ast.mutation.AssociatedSaveMode; import org.babyfish.jimmer.sql.ast.mutation.SaveMode; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ConstraintViolationTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ConstraintViolationTest.java index 8a8b2d33ca..84df836c7d 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ConstraintViolationTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ConstraintViolationTest.java @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.mutation; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.SaveMode; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.common.Constants; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DatabaseAutoIdUpsertTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DatabaseAutoIdUpsertTest.java index 740fcd7989..0b83d37160 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DatabaseAutoIdUpsertTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DatabaseAutoIdUpsertTest.java @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.mutation; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.common.NativeDatabases; import org.babyfish.jimmer.sql.dialect.H2Dialect; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DeleteDetachedObjectTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DeleteDetachedObjectTest.java index 5256be4ae8..38dc35e099 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DeleteDetachedObjectTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DeleteDetachedObjectTest.java @@ -1,7 +1,7 @@ package org.babyfish.jimmer.sql.mutation; import org.babyfish.jimmer.sql.DissociateAction; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.model.*; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DraftHandlerTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DraftHandlerTest.java index f16d036ba6..f3bb10117e 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DraftHandlerTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/DraftHandlerTest.java @@ -4,7 +4,7 @@ import org.babyfish.jimmer.meta.TypedProp; import org.babyfish.jimmer.sql.DraftInterceptor; import org.babyfish.jimmer.sql.JSqlClient; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.SaveMode; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.common.Constants; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/GetIdTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/GetIdTest.java index 29bb20e030..0470cb86ad 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/GetIdTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/GetIdTest.java @@ -2,7 +2,7 @@ import com.mysql.cj.MysqlConnection; import org.babyfish.jimmer.sql.JSqlClient; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.SaveMode; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.common.NativeDatabases; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/IdentityTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/IdentityTest.java index 289db74aec..72b87f494a 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/IdentityTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/IdentityTest.java @@ -569,7 +569,6 @@ public void testUpsertPostgres() { it.sql( "insert into DEPARTMENT(NAME, DELETED_MILLIS) values(?, ?) " + "on conflict(NAME, DELETED_MILLIS) do update set " + - "/* fake update to return all ids */ " + "DELETED_MILLIS = excluded.DELETED_MILLIS returning ID" ); it.batchVariables(0, "Market", 0L); diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/InheritanceMutationTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/InheritanceMutationTest.java index 3eb4c8dd98..f7d2a3ff01 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/InheritanceMutationTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/InheritanceMutationTest.java @@ -3,7 +3,7 @@ import org.babyfish.jimmer.ImmutableObjects; import org.babyfish.jimmer.sql.DraftInterceptor; import org.babyfish.jimmer.sql.JSqlClient; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.meta.UserIdGenerator; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/MultipleKeyConstraintTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/MultipleKeyConstraintTest.java index 4481839e4c..9c21619e5e 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/MultipleKeyConstraintTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/MultipleKeyConstraintTest.java @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.mutation; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.exception.SaveException; import org.babyfish.jimmer.sql.meta.impl.IdentityIdGenerator; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/SaveTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/SaveTest.java index 140040b718..cc06fe9952 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/SaveTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/SaveTest.java @@ -4,7 +4,7 @@ import org.babyfish.jimmer.sql.DraftInterceptor; import org.babyfish.jimmer.sql.ast.Expression; import org.babyfish.jimmer.sql.ast.Predicate; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.ast.mutation.AssociatedSaveMode; import org.babyfish.jimmer.sql.ast.mutation.UnloadedVersionBehavior; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ShortAssociationTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ShortAssociationTest.java index bf0ef34cbb..fe768a805d 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ShortAssociationTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/ShortAssociationTest.java @@ -1,10 +1,9 @@ package org.babyfish.jimmer.sql.mutation; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.common.AbstractMutationTest; import org.babyfish.jimmer.sql.common.Constants; import org.babyfish.jimmer.sql.model.Book; -import org.babyfish.jimmer.sql.model.BookProps; import org.babyfish.jimmer.sql.model.Immutables; import org.junit.jupiter.api.Test; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/AssociationMutationWithTriggerTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/AssociationMutationWithTriggerTest.java index 12fe3e18e3..3ad34e6874 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/AssociationMutationWithTriggerTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/AssociationMutationWithTriggerTest.java @@ -1,6 +1,6 @@ package org.babyfish.jimmer.sql.trigger; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.tuple.Tuple2; import org.babyfish.jimmer.sql.model.AuthorProps; import org.babyfish.jimmer.sql.model.BookProps; diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/CascadeSaveWithTriggerTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/CascadeSaveWithTriggerTest.java index 982ade9046..72139cd1ae 100644 --- a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/CascadeSaveWithTriggerTest.java +++ b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/CascadeSaveWithTriggerTest.java @@ -4,7 +4,7 @@ import org.babyfish.jimmer.sql.DissociateAction; import org.babyfish.jimmer.sql.DraftInterceptor; import org.babyfish.jimmer.sql.TargetTransferMode; -import org.babyfish.jimmer.sql.ast.impl.mutation.QueryReason; +import org.babyfish.jimmer.sql.ast.mutation.QueryReason; import org.babyfish.jimmer.sql.ast.mutation.AffectedTable; import org.babyfish.jimmer.sql.meta.UserIdGenerator; import org.babyfish.jimmer.sql.model.*;