From a1cf4ccf710940d115e0f5bd0a34d988f2bc0246 Mon Sep 17 00:00:00 2001 From: Cedric Champeau Date: Mon, 9 Oct 2023 17:45:45 +0200 Subject: [PATCH] Disable transactions for R2DBC These are not supported with Micronaut 3.x --- .../r2dbc/mariadb/JdbcWithCustomizationMariaDBSQLTest.groovy | 2 +- .../r2dbc/mariadb/StandaloneStartMariaDBSQLTest.groovy | 2 +- .../r2dbc/mariadb/WithJdbcStartMariaDBSQLTest.groovy | 2 +- .../testresources/r2dbc/mssql/StandaloneStartMSSQLTest.groovy | 2 +- .../testresources/r2dbc/mssql/WithJdbcStartMSSQLTest.groovy | 2 +- .../testresources/r2dbc/mysql/StandaloneStartMySQLTest.groovy | 2 +- .../testresources/r2dbc/mysql/WithJdbcStartMySQLTest.groovy | 2 +- .../testresources/r2dbc/oracle/StandaloneStartOracleTest.groovy | 2 +- .../testresources/r2dbc/oracle/WithJdbcStartOracleTest.groovy | 2 +- .../r2dbc/pool/StandaloneStartPostgreSQLTest.groovy | 2 +- .../testresources/r2dbc/pool/WithJdbcStartPostgreSQLTest.groovy | 2 +- .../r2dbc/postgres/StandaloneStartPostgreSQLTest.groovy | 2 +- .../r2dbc/postgres/WithJdbcStartPostgreSQLTest.groovy | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/JdbcWithCustomizationMariaDBSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/JdbcWithCustomizationMariaDBSQLTest.groovy index 68e9daf2d..9f6174630 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/JdbcWithCustomizationMariaDBSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/JdbcWithCustomizationMariaDBSQLTest.groovy @@ -6,7 +6,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["customized-jdbc"] ) +@MicronautTest(environments = ["customized-jdbc"], transactional = false ) class JdbcWithCustomizationMariaDBSQLTest extends AbstractJDBCSpec { @Inject diff --git a/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/StandaloneStartMariaDBSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/StandaloneStartMariaDBSQLTest.groovy index b6ab5eb57..f3a52bceb 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/StandaloneStartMariaDBSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/StandaloneStartMariaDBSQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["standalone"] ) +@MicronautTest(environments = ["standalone"], transactional = false ) class StandaloneStartMariaDBSQLTest extends AbstractJDBCSpec { @Inject ReactiveBookRepository repository diff --git a/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/WithJdbcStartMariaDBSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/WithJdbcStartMariaDBSQLTest.groovy index fbc50f4da..d0446e442 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/WithJdbcStartMariaDBSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mariadb/src/test/groovy/io/micronaut/testresources/r2dbc/mariadb/WithJdbcStartMariaDBSQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["jdbc"] ) +@MicronautTest(environments = ["jdbc"], transactional = false ) class WithJdbcStartMariaDBSQLTest extends AbstractJDBCSpec { @Inject diff --git a/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/StandaloneStartMSSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/StandaloneStartMSSQLTest.groovy index 89882248e..ad953b3b7 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/StandaloneStartMSSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/StandaloneStartMSSQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["standalone"] ) +@MicronautTest(environments = ["standalone"], transactional = false ) class StandaloneStartMSSQLTest extends AbstractJDBCSpec { @Inject ReactiveBookRepository repository diff --git a/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/WithJdbcStartMSSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/WithJdbcStartMSSQLTest.groovy index b26ec6b10..f0758fc08 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/WithJdbcStartMSSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mssql/src/test/groovy/io/micronaut/testresources/r2dbc/mssql/WithJdbcStartMSSQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["jdbc"] ) +@MicronautTest(environments = ["jdbc"], transactional = false ) class WithJdbcStartMSSQLTest extends AbstractJDBCSpec { @Inject diff --git a/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/StandaloneStartMySQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/StandaloneStartMySQLTest.groovy index 5590544de..76a08ae80 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/StandaloneStartMySQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/StandaloneStartMySQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["standalone"] ) +@MicronautTest(environments = ["standalone"], transactional = false ) class StandaloneStartMySQLTest extends AbstractJDBCSpec { @Inject ReactiveBookRepository repository diff --git a/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/WithJdbcStartMySQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/WithJdbcStartMySQLTest.groovy index 7a38c09b0..37b06077b 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/WithJdbcStartMySQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-mysql/src/test/groovy/io/micronaut/testresources/r2dbc/mysql/WithJdbcStartMySQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["jdbc"] ) +@MicronautTest(environments = ["jdbc"], transactional = false ) class WithJdbcStartMySQLTest extends AbstractJDBCSpec { @Inject diff --git a/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/StandaloneStartOracleTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/StandaloneStartOracleTest.groovy index d2c07fed0..2ac611cc9 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/StandaloneStartOracleTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/StandaloneStartOracleTest.groovy @@ -6,7 +6,7 @@ import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject import spock.lang.IgnoreIf -@MicronautTest(environments = ["standalone"] ) +@MicronautTest(environments = ["standalone"], transactional = false ) @IgnoreIf({ !jvm.java11Compatible }) class StandaloneStartOracleTest extends AbstractJDBCSpec { @Inject diff --git a/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/WithJdbcStartOracleTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/WithJdbcStartOracleTest.groovy index a8544f02b..ff602f429 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/WithJdbcStartOracleTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-oracle-xe/src/test/groovy/io/micronaut/testresources/r2dbc/oracle/WithJdbcStartOracleTest.groovy @@ -6,7 +6,7 @@ import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject import spock.lang.IgnoreIf -@MicronautTest(environments = ["jdbc"] ) +@MicronautTest(environments = ["jdbc"], transactional = false ) @IgnoreIf({ !jvm.java11Compatible }) class WithJdbcStartOracleTest extends AbstractJDBCSpec { diff --git a/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/StandaloneStartPostgreSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/StandaloneStartPostgreSQLTest.groovy index ee8010c4c..217f80ef2 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/StandaloneStartPostgreSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/StandaloneStartPostgreSQLTest.groovy @@ -8,7 +8,7 @@ import io.r2dbc.pool.ConnectionPool import io.r2dbc.spi.ConnectionFactory import jakarta.inject.Inject -@MicronautTest(environments = ["standalone"] ) +@MicronautTest(environments = ["standalone"], transactional = false ) class StandaloneStartPostgreSQLTest extends AbstractJDBCSpec { @Inject ReactiveBookRepository repository diff --git a/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/WithJdbcStartPostgreSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/WithJdbcStartPostgreSQLTest.groovy index ceca1ab49..f3ee33108 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/WithJdbcStartPostgreSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-pool/src/test/groovy/io/micronaut/testresources/r2dbc/pool/WithJdbcStartPostgreSQLTest.groovy @@ -8,7 +8,7 @@ import io.r2dbc.pool.ConnectionPool import io.r2dbc.spi.ConnectionFactory import jakarta.inject.Inject -@MicronautTest(environments = ["jdbc"] ) +@MicronautTest(environments = ["jdbc"], transactional = false ) class WithJdbcStartPostgreSQLTest extends AbstractJDBCSpec { @Inject diff --git a/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/StandaloneStartPostgreSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/StandaloneStartPostgreSQLTest.groovy index e284f414e..e03632b75 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/StandaloneStartPostgreSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/StandaloneStartPostgreSQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["standalone"] ) +@MicronautTest(environments = ["standalone"], transactional = false ) class StandaloneStartPostgreSQLTest extends AbstractJDBCSpec { @Inject ReactiveBookRepository repository diff --git a/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/WithJdbcStartPostgreSQLTest.groovy b/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/WithJdbcStartPostgreSQLTest.groovy index 1bdf1c3f0..e42138df9 100644 --- a/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/WithJdbcStartPostgreSQLTest.groovy +++ b/test-resources-r2dbc/test-resources-r2dbc-postgresql/src/test/groovy/io/micronaut/testresources/r2dbc/postgres/WithJdbcStartPostgreSQLTest.groovy @@ -5,7 +5,7 @@ import io.micronaut.testresources.jdbc.AbstractJDBCSpec import io.micronaut.testresources.jdbc.Book import jakarta.inject.Inject -@MicronautTest(environments = ["jdbc"] ) +@MicronautTest(environments = ["jdbc"], transactional = false ) class WithJdbcStartPostgreSQLTest extends AbstractJDBCSpec { @Inject