From 65048700cfb9c6380208165f03e756a0d3c9148e Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 17 Jul 2024 11:18:17 +0200 Subject: [PATCH] Run test only on HsqlDb. JdbcRepositoryEmbeddedIntegrationTests no longer runs for all databases, since it doesn't tests anything specific to differen RDBMSs. Therefore the test also got renamed. See #1565 --- ...positoryEmbeddedHsqlIntegrationTests.java} | 5 +++- ...toryEmbeddedHsqlIntegrationTests-hsql.sql} | 0 ...RepositoryEmbeddedIntegrationTests-db2.sql | 27 ------------------- ...cRepositoryEmbeddedIntegrationTests-h2.sql | 23 ---------------- ...sitoryEmbeddedIntegrationTests-mariadb.sql | 23 ---------------- ...positoryEmbeddedIntegrationTests-mssql.sql | 27 ------------------- ...positoryEmbeddedIntegrationTests-mysql.sql | 23 ---------------- ...ositoryEmbeddedIntegrationTests-oracle.sql | 26 ------------------ ...itoryEmbeddedIntegrationTests-postgres.sql | 27 ------------------- 9 files changed, 4 insertions(+), 177 deletions(-) rename spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/{JdbcRepositoryEmbeddedIntegrationTests.java => JdbcRepositoryEmbeddedHsqlIntegrationTests.java} (98%) rename spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/{JdbcRepositoryEmbeddedIntegrationTests-hsql.sql => JdbcRepositoryEmbeddedHsqlIntegrationTests-hsql.sql} (100%) delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-db2.sql delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-h2.sql delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mariadb.sql delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mssql.sql delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mysql.sql delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-oracle.sql delete mode 100644 spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-postgres.sql diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedHsqlIntegrationTests.java similarity index 98% rename from spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java rename to spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedHsqlIntegrationTests.java index 23f4b2b5d3..104157a9db 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedHsqlIntegrationTests.java @@ -29,6 +29,8 @@ import org.springframework.data.annotation.Id; import org.springframework.data.domain.Sort; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; +import org.springframework.data.jdbc.testing.DatabaseType; +import org.springframework.data.jdbc.testing.EnabledOnDatabase; import org.springframework.data.jdbc.testing.IntegrationTest; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.relational.core.mapping.Column; @@ -50,7 +52,8 @@ * @author Jens Schauder */ @IntegrationTest -public class JdbcRepositoryEmbeddedIntegrationTests { +@EnabledOnDatabase(DatabaseType.HSQL) +public class JdbcRepositoryEmbeddedHsqlIntegrationTests { @Configuration @Import(TestConfiguration.class) diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-hsql.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedHsqlIntegrationTests-hsql.sql similarity index 100% rename from spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-hsql.sql rename to spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedHsqlIntegrationTests-hsql.sql diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-db2.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-db2.sql deleted file mode 100644 index 4bff06c8a3..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-db2.sql +++ /dev/null @@ -1,27 +0,0 @@ -DROP TABLE dummy_entity; -DROP TABLE SORT_EMBEDDED_ENTITY; -DROP TABLE WITH_DOT_COLUMN; - -CREATE TABLE dummy_entity -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY ( START WITH 1 ) PRIMARY KEY, - TEST VARCHAR(100), - PREFIX2_ATTR BIGINT, - PREFIX_TEST VARCHAR(100), - PREFIX_PREFIX2_ATTR BIGINT -); - -CREATE TABLE SORT_EMBEDDED_ENTITY -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY ( START WITH 1 ) PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - -CREATE TABLE WITH_DOT_COLUMN -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY ( START WITH 1 ) PRIMARY KEY, - "address.city" VARCHAR(255) -); \ No newline at end of file diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-h2.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-h2.sql deleted file mode 100644 index b9bdb6c665..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-h2.sql +++ /dev/null @@ -1,23 +0,0 @@ -CREATE TABLE dummy_entity -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY ( START WITH 1 ) PRIMARY KEY, - TEST VARCHAR(100), - PREFIX2_ATTR BIGINT, - PREFIX_TEST VARCHAR(100), - PREFIX_PREFIX2_ATTR BIGINT -); - -CREATE TABLE SORT_EMBEDDED_ENTITY -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY ( START WITH 1 ) PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - -CREATE TABLE WITH_DOT_COLUMN -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY ( START WITH 1 ) PRIMARY KEY, - "address.city" VARCHAR(255) -); \ No newline at end of file diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mariadb.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mariadb.sql deleted file mode 100644 index 6057c50c6f..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mariadb.sql +++ /dev/null @@ -1,23 +0,0 @@ -CREATE TABLE dummy_entity -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - TEST VARCHAR(100), - PREFIX2_ATTR BIGINT, - PREFIX_TEST VARCHAR(100), - PREFIX_PREFIX2_ATTR BIGINT -); - -CREATE TABLE SORT_EMBEDDED_ENTITY -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - -CREATE TABLE WITH_DOT_COLUMN -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - `address.city` VARCHAR(255) -); \ No newline at end of file diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mssql.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mssql.sql deleted file mode 100644 index af13a08bfb..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mssql.sql +++ /dev/null @@ -1,27 +0,0 @@ -DROP TABLE IF EXISTS dummy_entity; -DROP TABLE IF EXISTS SORT_EMBEDDED_ENTITY; -DROP TABLE IF EXISTS WITH_DOT_COLUMN; - -CREATE TABLE dummy_entity -( - id BIGINT IDENTITY PRIMARY KEY, - TEST VARCHAR(100), - PREFIX2_ATTR BIGINT, - PREFIX_TEST VARCHAR(100), - PREFIX_PREFIX2_ATTR BIGINT -); - -CREATE TABLE SORT_EMBEDDED_ENTITY -( - id BIGINT IDENTITY PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - -CREATE TABLE WITH_DOT_COLUMN -( - id BIGINT IDENTITY PRIMARY KEY, - "address.city" VARCHAR(255) -); \ No newline at end of file diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mysql.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mysql.sql deleted file mode 100644 index 6057c50c6f..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-mysql.sql +++ /dev/null @@ -1,23 +0,0 @@ -CREATE TABLE dummy_entity -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - TEST VARCHAR(100), - PREFIX2_ATTR BIGINT, - PREFIX_TEST VARCHAR(100), - PREFIX_PREFIX2_ATTR BIGINT -); - -CREATE TABLE SORT_EMBEDDED_ENTITY -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - -CREATE TABLE WITH_DOT_COLUMN -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - `address.city` VARCHAR(255) -); \ No newline at end of file diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-oracle.sql deleted file mode 100644 index 5ea281541d..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-oracle.sql +++ /dev/null @@ -1,26 +0,0 @@ -DROP TABLE DUMMY_ENTITY CASCADE CONSTRAINTS PURGE; -DROP TABLE SORT_EMBEDDED_ENTITY CASCADE CONSTRAINTS PURGE; -DROP TABLE WITH_DOT_COLUMN CASCADE CONSTRAINTS PURGE; - -CREATE TABLE DUMMY_ENTITY ( - ID NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY, - TEST VARCHAR2(100), - PREFIX2_ATTR NUMBER , - PREFIX_TEST VARCHAR2(100), - PREFIX_PREFIX2_ATTR NUMBER -); - - -CREATE TABLE SORT_EMBEDDED_ENTITY ( - id NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - - -CREATE TABLE WITH_DOT_COLUMN ( - id NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY, - "address.city" VARCHAR(255) -); \ No newline at end of file diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-postgres.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-postgres.sql deleted file mode 100644 index da7226e262..0000000000 --- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryEmbeddedIntegrationTests-postgres.sql +++ /dev/null @@ -1,27 +0,0 @@ -DROP TABLE dummy_entity; -DROP TABLE "SORT_EMBEDDED_ENTITY"; -DROP TABLE WITH_DOT_COLUMN; - -CREATE TABLE dummy_entity -( - id SERIAL PRIMARY KEY, - TEST VARCHAR(100), - PREFIX2_ATTR BIGINT, - PREFIX_TEST VARCHAR(100), - PREFIX_PREFIX2_ATTR BIGINT -); - -CREATE TABLE "SORT_EMBEDDED_ENTITY" -( - id SERIAL PRIMARY KEY, - first_name VARCHAR(100), - address VARCHAR(255), - email VARCHAR(255), - phone_number VARCHAR(255) -); - -CREATE TABLE WITH_DOT_COLUMN -( - id SERIAL PRIMARY KEY, - "address.city" VARCHAR(255) -); \ No newline at end of file