Upsert implementation by msupic · Pull Request #3940 · micronaut-projects/micronaut-data

msupic · 2026-07-02T12:09:20Z

Upsert implementation overview

This PR adds native SQL upsert support for Micronaut Data SQL repositories.

Repository API

Upsert is supported only through explicitly declared repository methods. No inherited CrudRepository methods were added.

Supported declaration styles:

ProductReview upsert(ProductReview entity);

List<ProductReview> upsertAll(Iterable<ProductReview> entities);

@Upsert
ProductReview put(ProductReview entity);

@Upsert
List<ProductReview> putAll(Iterable<ProductReview> entities);

The Upsert annotation also supports custom conflict columns through conflictsOn:

@Upsert(conflictsOn = "email")
CustomerProfile upsert(CustomerProfile profile);

@Upsert(conflictsOn = {"sku", "warehouse"})
WarehouseInventory upsert(WarehouseInventory inventory);

Reactive and async return types are also supported:

@Upsert(conflictsOn = "email")
Mono<CustomerProfile> upsertMono(CustomerProfile profile);

@Upsert(conflictsOn = "email")
CompletableFuture<CustomerProfile> upsertFuture(CustomerProfile profile);

@Upsert(conflictsOn = "email")
Flux<CustomerProfile> upsertAllFlux(Iterable<CustomerProfile> profiles);

@Upsert(conflictsOn = "email")
CompletableFuture<List<CustomerProfile>> upsertAllFuture(Iterable<CustomerProfile> profiles);

Dialect support

Native upsert SQL is generated per dialect:

Dialect	SQL shape
H2	MERGE INTO ... KEY(...) VALUES (...)
MySQL / MariaDB	INSERT ... ON DUPLICATE KEY UPDATE ...
PostgreSQL	INSERT ... ON CONFLICT (...) DO UPDATE SET ...
SQLite	INSERT ... ON CONFLICT (...) DO UPDATE SET ...
SQL Server	MERGE INTO ... WITH (HOLDLOCK) ...
Oracle	MERGE INTO ... USING (SELECT ... FROM DUAL) ...
ANSI	ANSI-style MERGE

…into upsert-impl

…ng ids

msupic · 2026-07-02T12:13:47Z

This PR introduces OracleJdbcRepositoryOperations and SqlServerJdbcRepositoryOperations as dialect-specific extensions of DefaultJdbcRepositoryOperations.

OracleJdbcRepositoryOperations is needed because Oracle upsert with generated ID returning uses Oracle-specific JDBC APIs, including oracle.jdbc.OraclePreparedStatement. This is especially important for upsertAll, where we want to execute a real JDBC batch and read returned IDs for the batch items, instead of falling back to executing each upsert one by one. Keeping this code in an Oracle-specific operations class also means it is only used when the Oracle JDBC driver is available on the classpath.

I applied the same separation for SQL Server through SqlServerJdbcRepositoryOperations. SQL Server does not require a driver-specific class in the same way Oracle does, but its upsert generated ID handling uses MERGE ... OUTPUT inserted.<id-column>, which is still dialect-specific runtime behavior. Keeping that logic separate helps keep DefaultJdbcRepositoryOperations focused on the generic JDBC execution path.

@dstepanov - If this approach looks good to you, we can continue moving Oracle-specific code out of DefaultJdbcRepositoryOperations into OracleJdbcRepositoryOperations, which should make the default implementation easier to follow.

Copilot

Pull request overview

This PR introduces native SQL upsert support across Micronaut Data SQL repositories by adding an @Upsert lifecycle annotation, a compile-time method matcher, dialect-specific SQL generation, and runtime execution paths (including generated-id returning for Oracle and SQL Server). It also adds extensive TCK entities/repositories and JDBC/R2DBC test coverage, plus new user-guide documentation.

Changes:

Add @Upsert API + processor support (UpsertMethodMatcher) and wire operation types through the model/runtime.
Implement SQL upsert SQL generation in SqlQueryBuilder and add specialized JDBC/R2DBC operations for Oracle/SQL Server generated-id returning.
Add documentation (“Upserting”) and introduce JDBC/R2DBC/SQLite test suites plus new TCK entities/repositories for upsert scenarios.

Reviewed changes

Copilot reviewed 106 out of 106 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
test-suite-data-jdbc-sqlite/src/test/java/io/micronaut/data/jdbc/sqlite/SQLiteWarehouseInventoryRepository.java	Adds SQLite repository bean for upsert TCK + finder used by tests.
test-suite-data-jdbc-sqlite/src/test/java/io/micronaut/data/jdbc/sqlite/SQLiteUpsertTest.java	Adds SQLite JDBC tests validating insert/update upsert behavior.
test-suite-data-jdbc-sqlite/src/test/java/io/micronaut/data/jdbc/sqlite/SQLiteProductReviewRepository.java	Adds SQLite repository bean for ProductReview upsert tests.
test-suite-data-jdbc-sqlite/src/test/java/io/micronaut/data/jdbc/sqlite/SQLiteCustomerProfileUuidRepository.java	Adds SQLite repository bean for UUID upsert coverage (not directly exercised in shown test).
test-suite-data-jdbc-sqlite/src/test/java/io/micronaut/data/jdbc/sqlite/SQLiteCustomerProfileRepository.java	Adds SQLite repository bean for CustomerProfile upsert tests + finder used by tests.
src/main/docs/guide/toc.yml	Adds “Upserting” to docs TOC under data updates.
src/main/docs/guide/shared/dataUpdates/upserts.adoc	New guide section describing upsert API, constraints, and dialect behavior.
data-tck/src/main/java/io/micronaut/data/tck/repositories/upsert/WarehouseInventoryRepository.java	Adds TCK repository contract for conflict-column upsert.
data-tck/src/main/java/io/micronaut/data/tck/repositories/upsert/ProductReviewRepository.java	Adds TCK repository contract for identity-based upsert + `@Upsert` alternate method names.
data-tck/src/main/java/io/micronaut/data/tck/repositories/upsert/CustomerProfileUuidRepository.java	Adds TCK repository contract for upsert with generated UUID identity and conflict column.
data-tck/src/main/java/io/micronaut/data/tck/repositories/upsert/CustomerProfileRepository.java	Adds TCK repository contract for sync/async/reactive upsert return shapes.
data-tck/src/main/java/io/micronaut/data/tck/jdbc/entities/upsert/WarehouseInventory.java	New TCK entity with unique index conflict target (sku, warehouse).
data-tck/src/main/java/io/micronaut/data/tck/jdbc/entities/upsert/ProductReview.java	New TCK entity with assigned identity for default-conflict upsert tests.
data-tck/src/main/java/io/micronaut/data/tck/jdbc/entities/upsert/CustomerProfileUuid.java	New TCK entity with generated UUID identity + unique email conflict target.
data-tck/src/main/java/io/micronaut/data/tck/jdbc/entities/upsert/CustomerProfile.java	New TCK entity with generated identity + unique email conflict target.
data-runtime/src/main/java/io/micronaut/data/runtime/intercept/AbstractQueryInterceptor.java	Wires `UPSERT` into stored-query operation-type resolution.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/sqlserver/upsert/MSWarehouseInventoryRepository.java	SQL Server R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/sqlserver/upsert/MSProductReviewRepository.java	SQL Server R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/sqlserver/upsert/MSCustomerProfileUuidRepository.java	SQL Server R2DBC test repository binding for TCK UUID upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/sqlserver/upsert/MSCustomerProfileSequenceRepository.java	SQL Server R2DBC test repository for sequence-generated identity upsert returning.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/sqlserver/upsert/MSCustomerProfileRepository.java	SQL Server R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/sqlserver/upsert/CustomerProfileSequence.java	SQL Server R2DBC test entity for sequence-generated identity.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/postgres/upsert/PostgresWarehouseInventoryRepository.java	Postgres R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/postgres/upsert/PostgresProductReviewRepository.java	Postgres R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/postgres/upsert/PostgresCustomerProfileUuidRepository.java	Postgres R2DBC test repository binding for TCK UUID upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/postgres/upsert/PostgresCustomerProfileSequenceRepository.java	Postgres R2DBC test repository for sequence-generated identity upsert returning.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/postgres/upsert/PostgresCustomerProfileRepository.java	Postgres R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/postgres/upsert/CustomerProfileSequence.java	Postgres R2DBC test entity for sequence-generated identity.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/oraclexe/upsert/OracleXEWarehouseInventoryRepository.java	Oracle XE R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/oraclexe/upsert/OracleXEProductReviewRepository.java	Oracle XE R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/oraclexe/upsert/OracleXECustomerProfileUuidRepository.java	Oracle XE R2DBC test repository binding for TCK UUID upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/oraclexe/upsert/OracleXECustomerProfileSequenceRepository.java	Oracle XE R2DBC test repository for sequence-generated identity upsert returning.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/oraclexe/upsert/OracleXECustomerProfileRepository.java	Oracle XE R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/oraclexe/upsert/CustomerProfileSequence.java	Oracle XE R2DBC test entity for sequence-generated identity.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/mysql/upsert/MySqlWarehouseInventoryRepository.java	MySQL R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/mysql/upsert/MySqlProductReviewRepository.java	MySQL R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/mysql/upsert/MySqlCustomerProfileUuidRepository.java	MySQL R2DBC test repository binding for TCK UUID upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/mysql/upsert/MySqlCustomerProfileRepository.java	MySQL R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/h2/upsert/H2WarehouseInventoryRepository.java	H2 R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/h2/upsert/H2ProductReviewRepository.java	H2 R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/h2/upsert/H2CustomerProfileUuidRepository.java	H2 R2DBC test repository binding for TCK UUID upsert contract.
data-r2dbc/src/test/java/io/micronaut/data/r2dbc/h2/upsert/H2CustomerProfileRepository.java	H2 R2DBC test repository binding for TCK upsert contract.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/sqlserver/SqlServerUpsertSpec.groovy	Adds SQL Server R2DBC upsert spec exercising TCK + sequence-id returning cases.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/postgres/vector/PostgresDbInit.java	Removes old vector-specific init hook (merged into shared Postgres init).
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/postgres/PostgresUpsertSpec.groovy	Adds Postgres R2DBC upsert spec and wires spec-name properties.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/postgres/PostgresDbInit.java	Enhances Postgres R2DBC init: readiness wait (local only) + extension creation for specific specs.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/oraclexe/OracleXEUpsertSpec.groovy	Adds Oracle XE R2DBC upsert spec covering generated-id returning cases.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/operations/R2dbcRepositoryOperationsConditionsSpec.groovy	Tests per-dialect R2DBC operations bean selection logic.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/mysql/MySqlUpsertSpec.groovy	Adds MySQL R2DBC upsert spec and flags unsupported UUID returning.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/mariadb/MariaDbUpsertSpec.groovy	Adds MariaDB R2DBC upsert spec and flags unsupported UUID returning.
data-r2dbc/src/test/groovy/io/micronaut/data/r2dbc/h2/H2UpsertSpec.groovy	Adds H2 R2DBC upsert spec.
data-r2dbc/src/main/java/io/micronaut/data/r2dbc/operations/SqlServerR2dbcRepositoryOperations.java	New SQL Server R2DBC operations implementation handling MERGE OUTPUT id reads for upsert.
data-r2dbc/src/main/java/io/micronaut/data/r2dbc/operations/R2dbcRepositoryOperationsConditions.java	New shared R2DBC operations conditions for Oracle/SQL Server/default selection.
data-r2dbc/src/main/java/io/micronaut/data/r2dbc/operations/OracleR2dbcRepositoryOperations.java	New Oracle R2DBC operations implementation handling RETURNING INTO for upsert generated-id.
data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildTableSpec.groovy	Adds SQL Server sequence generation DDL test coverage.
data-processor/src/main/resources/META-INF/services/io.micronaut.data.processor.visitors.finders.MethodMatcher	Registers `UpsertMethodMatcher` with the processor.
data-processor/src/main/java/io/micronaut/data/processor/visitors/RepositoryTypeElementVisitor.java	Includes `@Upsert` in lifecycle method entity-type inference.
data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/UpsertMethodMatcher.java	New processor matcher generating upsert stored queries + validating constraints.
data-processor/src/main/java/io/micronaut/data/processor/visitors/finders/FindersUtils.java	Routes `UPSERT` operation type through update-style interceptor selection.
data-model/src/main/java/io/micronaut/data/model/runtime/StoredQuery.java	Adds `StoredQuery.OperationType.UPSERT`.
data-model/src/main/java/io/micronaut/data/model/query/builder/sql/SqlQueryBuilder.java	Adds SQL Server sequence DDL tweaks + upsert query building entry point.
data-model/src/main/java/io/micronaut/data/model/query/builder/QueryBuilder.java	Adds `buildUpsert` API and `UpsertQueryDefinition`.
data-model/src/main/java/io/micronaut/data/intercept/annotation/DataMethodQuery.java	Adds `UPSERT` operation type.
data-model/src/main/java/io/micronaut/data/intercept/annotation/DataMethod.java	Adds `UPSERT` operation type.
data-model/src/main/java/io/micronaut/data/annotation/Upsert.java	New public `@Upsert` lifecycle annotation.
data-jdbc/src/test/java/io/micronaut/data/jdbc/sqlserver/upsert/MSWarehouseInventoryRepository.java	SQL Server JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/sqlserver/upsert/MSProductReviewRepository.java	SQL Server JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/sqlserver/upsert/MSCustomerProfileUuidRepository.java	SQL Server JDBC test repository binding for TCK UUID upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/sqlserver/upsert/MSCustomerProfileSequenceRepository.java	SQL Server JDBC test repository for sequence-generated identity upsert returning.
data-jdbc/src/test/java/io/micronaut/data/jdbc/sqlserver/upsert/MSCustomerProfileRepository.java	SQL Server JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/sqlserver/upsert/CustomerProfileSequence.java	SQL Server JDBC test entity for sequence-generated identity.
data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/upsert/PostgresWarehouseInventoryRepository.java	Postgres JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/upsert/PostgresProductReviewRepository.java	Postgres JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/upsert/PostgresCustomerProfileUuidRepository.java	Postgres JDBC test repository binding for TCK UUID upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/upsert/PostgresCustomerProfileSequenceRepository.java	Postgres JDBC test repository for sequence-generated identity upsert returning.
data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/upsert/PostgresCustomerProfileRepository.java	Postgres JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/upsert/CustomerProfileSequence.java	Postgres JDBC test entity for sequence-generated identity.
data-jdbc/src/test/java/io/micronaut/data/jdbc/oraclexe/upsert/OracleXEWarehouseInventoryRepository.java	Oracle XE JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/oraclexe/upsert/OracleXEProductReviewRepository.java	Oracle XE JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/oraclexe/upsert/OracleXECustomerProfileUuidRepository.java	Oracle XE JDBC test repository binding for TCK UUID upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/oraclexe/upsert/OracleXECustomerProfileSequenceRepository.java	Oracle XE JDBC test repository for sequence-generated identity upsert returning.
data-jdbc/src/test/java/io/micronaut/data/jdbc/oraclexe/upsert/OracleXECustomerProfileRepository.java	Oracle XE JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/oraclexe/upsert/CustomerProfileSequence.java	Oracle XE JDBC test entity for sequence-generated identity.
data-jdbc/src/test/java/io/micronaut/data/jdbc/mysql/upsert/MySqlWarehouseInventoryRepository.java	MySQL JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/mysql/upsert/MySqlProductReviewRepository.java	MySQL JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/mysql/upsert/MySqlCustomerProfileUuidRepository.java	MySQL JDBC test repository binding for TCK UUID upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/mysql/upsert/MySqlCustomerProfileRepository.java	MySQL JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/h2/upsert/H2WarehouseInventoryRepository.java	H2 JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/h2/upsert/H2ProductReviewRepository.java	H2 JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/h2/upsert/H2CustomerProfileUuidRepository.java	H2 JDBC test repository binding for TCK UUID upsert contract.
data-jdbc/src/test/java/io/micronaut/data/jdbc/h2/upsert/H2CustomerProfileRepository.java	H2 JDBC test repository binding for TCK upsert contract.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/sqlserver/SqlServerUpsertSpec.groovy	Adds SQL Server JDBC upsert spec + sequence-id returning cases.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/postgres/PostgresUpsertSpec.groovy	Adds Postgres JDBC upsert spec + sequence-id returning cases.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/oraclexe/OracleXEUpsertSpec.groovy	Adds Oracle XE JDBC upsert spec + sequence-id returning cases.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/operations/JdbcRepositoryOperationsConditionsSpec.groovy	Tests per-dialect JDBC operations bean selection logic.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/mysql/MySqlUpsertSpec.groovy	Adds MySQL JDBC upsert spec and flags unsupported UUID returning.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/mariadb/MariaUpsertSpec.groovy	Adds MariaDB JDBC upsert spec and flags unsupported UUID returning.
data-jdbc/src/test/groovy/io/micronaut/data/jdbc/h2/H2UpsertSpec.groovy	Adds H2 JDBC upsert spec.
data-jdbc/src/main/java/io/micronaut/data/jdbc/operations/SqlServerJdbcRepositoryOperations.java	New SQL Server JDBC operations implementation handling MERGE OUTPUT id reads for upsert.
data-jdbc/src/main/java/io/micronaut/data/jdbc/operations/JdbcRepositoryOperationsConditions.java	New shared JDBC operations conditions for Oracle/SQL Server/default selection.

graemerocher · 2026-07-06T11:52:29Z

+     * @param context The condition context
+     * @return The configured datasource names
+     */
+    private static List<String> resolveConfiguredDataSourceNames(ConditionContext context) {


feels like there should be some utility for this since it is seems like a common requirements to get the configured datasource names. It should also probably cache

I created DataSourceConfigurationUtils and moved resolveDataSourceName and resolveConfiguredDataSourceNames methods to it. The resolveConfiguredDataSourceNames method caches resolved data source names and keeps the cache in BeanContext attributes

graemerocher · 2026-07-06T11:53:02Z

+@Requires(classes = OraclePreparedStatement.class)
+@Requires(condition = OracleJdbcRepositoryOperationsCondition.class)
+@Internal
+public final class OracleJdbcRepositoryOperations extends DefaultJdbcRepositoryOperations {


does it need to be public?

DefaultJdbcRepositoryOperations is public too that was probably the reason why I put OracleJdbcRepositoryOperations and SqlServerJdbcRepositoryOperations to be public too, but I think those two don't have to be public so I modify it.

graemerocher · 2026-07-06T11:57:06Z

+import static io.micronaut.data.annotation.GeneratedValue.Type.AUTO;
+import static io.micronaut.data.annotation.GeneratedValue.Type.SEQUENCE;
+
+final class SqlUpsertQueryBuilder {


add maintainer focused javadoc to this class describing its purpose and implementation

Added javadoc

graemerocher · 2026-07-06T11:59:51Z

+The default conflict target is the entity identity.
+Use ann:data.annotation.Upsert[] with `conflictsOn` to use another persistent property, or a set of persistent properties, as the conflict target.
+
+[source,java]


can we replace these hard coded snippets with the snippet: macro and actual tested source code?

graemerocher · 2026-07-06T12:00:27Z

+@Upsert
+Contact put(Contact contact);
+
+@Upsert(conflictsOn = "email")


since we generated JPA metadata at build time would be good to show an example that uses type safe property names instead of strings

@graemerocher If we want to use type safe property names in the Upsert annoation, the entity must be compiled in another module. Currently Micronaut static metamodel generator is used only in data-tck module, so I would need to create a new entity in data-tck module and add data-tck dependency to a doc-examples project. Is that correct?

I mean it should work if it is in the same module since javac supports multiple rounds of compilation

Javac does support multiple processing rounds, but I tried this pattern

@Upsert(conflictsOn = Passenger_.EMAIL)

and Passenger_ is not resolvable when Micronaut Data processes the repository’s Upsert annotation. The metamodel source is generated in a later round, while UpsertMethodMatcher validates conflictsOn in the earlier round and sees an error type rather than the generated "email" constant.

I will try to modify the code to use postponedRepositories in RepositoryTypeElementVisitor

yeah this sounds like a bug

I tried to do that using AI but without success.

The following is AI response:

Postponing RepositoryTypeElementVisitor when conflictsOn is <error> makes Passenger_.EMAIL resolve in the next javac round, but Micronaut’s bean-definition processor has already emitted the repository proxy in the first round. The resulting repository compiles but fails at runtime because its method has no compiled query metadata.
So this cannot be fixed safely in UpsertMethodMatcher or RepositoryTypeElementVisitor alone. It needs Micronaut core annotation-processing support that postpones both repository processing and bean-definition generation, then reprocesses the original repository in the later round.

hmm ok, probably worth an issue with a reproducer for core

Ok, once this PR gets merged, I will create an issue and reproducer.

…ourceNames and resolveDataSourceName methods from JdbcRepositoryOperationsConditions and R2dbcRepositoryOperationsConditions to it

…positoryOperations

…into upsert-impl

sonarqubecloud · 2026-07-23T13:27:30Z

Quality Gate failed

Failed conditions
9 New Critical Issues (required ≤ 0)

See analysis details on SonarQube Cloud

💡 Need a hand with PR review? Try Gitar by Sonar!

dstepanov · 2026-08-11T09:44:48Z

+            }
+        }
+
+        private void upsert() {


I don't like this custom repository operations, can we simply create a query that is a function for oracle or is an ordinary query for other cases

msupic added 30 commits June 11, 2026 10:23

Upsert implementation - wip

4be0cfc

Upsert implementation - wip

ddb055e

Upsert implementation - wip

7360d30

Upsert implementation - wip

b044e35

Upsert implementation - wip

7d53ae7

Upsert implementation - added tests for sqlserver and postgres

c3af05e

Upsert implementation - minor refactoring

a743cb3

Upsert implementation - added conflictProperties

2b5038e

Upsert implementation - added conflictProperties

b815148

Upsert implementation - wip

f450bde

Upsert implementation - wip

175c6af

Upsert implementation - wip

b7c406c

Upsert implementation - wip

e0a3164

Upsert implementation - wip

fcf6598

Upsert implementation - modified test entities

8064427

Upsert implementation - return generated ids

c082222

Upsert implementation - added more tests

ddf0f9e

Upsert implementation - added more tests

44d7dc3

Upsert implementation - refactoring of OracleJdbcRepositoryOperations

220d4e6

Upsert implementation - wip

95af8a7

Merge branch '5.1.x' of github.com:micronaut-projects/micronaut-data …

1a8caa9

…into upsert-impl

Upsert implementation - updated upsert tests

1385289

Upsert implementation - sql server upsert implementation when returni…

8930e15

…ng ids

Upsert implementation - SqlQueryBuilder refactoring

ca5f2a5

Upsert implementation - SqlUpsertQueryBuilder refactoring

0ffe2e8

Upsert implementation - SqlUpsertQueryBuilder refactoring

f1c36d4

Upsert implementation - SqlUpsertQueryBuilder refactoring

1e19364

Upsert implementation - SqlUpsertQueryBuilder refactoring

17fff91

Upsert implementation - SqlUpsertQueryBuilder refactoring

9485276

Upsert implementation - SqlUpsertQueryBuilder refactoring

6c6c4c3

msupic added 9 commits July 1, 2026 16:55

Replaced conflictProperties with conflictsOn in Upsert annotation

9f4cb94

Rolled back temp changes

7c0129f

Added docs

0a0fd14

Merged 5.1.x into this branch

26dc520

Upsert impl for sqlite

f7955b2

Upsert tests for sqlite

5da34f0

Updated docs

6d83a7c

Updated docs

2f7a7bf

Rolled back

ab1bed9

msupic requested review from dstepanov, graemerocher and radovanradic July 2, 2026 12:10

graemerocher added the type: enhancement New feature or request label Jul 2, 2026

radovanradic requested a review from Copilot July 3, 2026 07:56

Copilot started reviewing on behalf of radovanradic July 3, 2026 07:59 View session

Copilot AI reviewed Jul 3, 2026

View reviewed changes

Addressed copilot comments

c0e0dd6

radovanradic approved these changes Jul 3, 2026

View reviewed changes

graemerocher requested changes Jul 6, 2026

View reviewed changes

msupic added 5 commits July 22, 2026 13:47

Created DataSourceConfigurationUtils and moved resolveConfiguredDataS…

ae7af3e

…ourceNames and resolveDataSourceName methods from JdbcRepositoryOperationsConditions and R2dbcRepositoryOperationsConditions to it

Removed final from SqlServerJdbcRepositoryOperations and OracleJdbcRe…

c159be9

…positoryOperations

Added javadoc to SqlUpsertQueryBuilder

aee1245

Modified upsert docs to use snippet macro

d81c489

Merge branch '5.2.x' of github.com:micronaut-projects/micronaut-data …

2ee748d

…into upsert-impl

msupic changed the base branch from 5.1.x to 5.2.x July 23, 2026 10:43

Trigger CI build

8a38d20

graemerocher approved these changes Aug 10, 2026

View reviewed changes

dstepanov requested changes Aug 11, 2026

View reviewed changes

Uh oh!

Conversation

msupic commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Upsert implementation overview

Repository API

Dialect support

Uh oh!

msupic commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

msupic Jul 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

msupic Jul 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud Bot commented Jul 23, 2026

Quality Gate failed

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

msupic commented Jul 2, 2026 •

edited

Loading

msupic commented Jul 2, 2026 •

edited

Loading

msupic Jul 23, 2026 •

edited

Loading

msupic Jul 23, 2026 •

edited

Loading