DATAJDBC-349 - Polishing.

Original pull requests: #248, #242.
Fixes superfluous commata and unsupported data types.
Cleaning up database objects before (re)creating them.

Author: schauder

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java

@@ -197,15 +197,16 @@ static class EntityWithColumnsRequiringConversions {
 		Date date;
 		LocalDateTime localDateTime;
 		// ensures conversion on id querying
-		@Id private LocalDateTime idTimestamp;
+		@Id
+		private LocalDateTime idTimestamp;
 
-		@MappedCollection(idColumn = "ID_TIMESTAMP") Set<EntityWithColumnsRequiringConversionsRelation> relation;
+		@MappedCollection(idColumn = "ID_TIMESTAMP")
+		Set<EntityWithColumnsRequiringConversionsRelation> relation;
 	}
 
 	// DATAJDBC-349
 	@Data
 	static class EntityWithColumnsRequiringConversionsRelation {
-		@Id private LocalDateTime idTimestamp;
 		String data;
 	}
 }

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-mssql.sql

@@ -49,14 +49,18 @@ CREATE TABLE BYTE_ARRAY_OWNER
   BINARY_DATA VARBINARY(20) NOT NULL
 );
 
+DROP TABLE IF EXISTS CHAIN0;
+DROP TABLE IF EXISTS CHAIN1;
+DROP TABLE IF EXISTS CHAIN2;
+DROP TABLE IF EXISTS CHAIN3;
 DROP TABLE IF EXISTS CHAIN4;
+
 CREATE TABLE CHAIN4
 (
   FOUR       BIGINT IDENTITY PRIMARY KEY,
   FOUR_VALUE VARCHAR(20)
 );
 
-DROP TABLE IF EXISTS CHAIN3;
 CREATE TABLE CHAIN3
 (
   THREE       BIGINT IDENTITY PRIMARY KEY,
@@ -65,7 +69,6 @@ CREATE TABLE CHAIN3
   FOREIGN KEY (CHAIN4) REFERENCES CHAIN4 (FOUR)
 );
 
-DROP TABLE IF EXISTS CHAIN2;
 CREATE TABLE CHAIN2
 (
   TWO       BIGINT IDENTITY PRIMARY KEY,
@@ -74,7 +77,6 @@ CREATE TABLE CHAIN2
   FOREIGN KEY (CHAIN3) REFERENCES CHAIN3 (THREE)
 );
 
-DROP TABLE IF EXISTS CHAIN1;
 CREATE TABLE CHAIN1
 (
   ONE       BIGINT IDENTITY PRIMARY KEY,
@@ -83,7 +85,6 @@ CREATE TABLE CHAIN1
   FOREIGN KEY (CHAIN2) REFERENCES CHAIN2 (TWO)
 );
 
-DROP TABLE IF EXISTS CHAIN0;
 CREATE TABLE CHAIN0
 (
   ZERO       BIGINT IDENTITY PRIMARY KEY,
@@ -92,6 +93,12 @@ CREATE TABLE CHAIN0
   FOREIGN KEY (CHAIN1) REFERENCES CHAIN1 (ONE)
 );
 
+DROP TABLE IF EXISTS NO_ID_CHAIN0;
+DROP TABLE IF EXISTS NO_ID_CHAIN1;
+DROP TABLE IF EXISTS NO_ID_CHAIN2;
+DROP TABLE IF EXISTS NO_ID_CHAIN3;
+DROP TABLE IF EXISTS NO_ID_CHAIN4;
+
 CREATE TABLE NO_ID_CHAIN4
 (
   FOUR       BIGINT IDENTITY PRIMARY KEY,
@@ -126,6 +133,12 @@ CREATE TABLE NO_ID_CHAIN0
   FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
 );
 
+DROP TABLE IF EXISTS NO_ID_LIST_CHAIN0;
+DROP TABLE IF EXISTS NO_ID_LIST_CHAIN1;
+DROP TABLE IF EXISTS NO_ID_LIST_CHAIN2;
+DROP TABLE IF EXISTS NO_ID_LIST_CHAIN3;
+DROP TABLE IF EXISTS NO_ID_LIST_CHAIN4;
+
 CREATE TABLE NO_ID_LIST_CHAIN4
 (
   FOUR       BIGINT IDENTITY PRIMARY KEY,
@@ -208,8 +221,11 @@ CREATE TABLE NO_ID_LIST_CHAIN0
     )
 );
 
-
-
+DROP TABLE IF EXISTS NO_ID_MAP_CHAIN0;
+DROP TABLE IF EXISTS NO_ID_MAP_CHAIN1;
+DROP TABLE IF EXISTS NO_ID_MAP_CHAIN2;
+DROP TABLE IF EXISTS NO_ID_MAP_CHAIN3;
+DROP TABLE IF EXISTS NO_ID_MAP_CHAIN4;
 
 CREATE TABLE NO_ID_MAP_CHAIN4
 (
@@ -293,6 +309,8 @@ CREATE TABLE NO_ID_MAP_CHAIN0
     )
 );
 
+DROP TABLE IF EXISTS VERSIONED_AGGREGATE;
+
 CREATE TABLE VERSIONED_AGGREGATE
 (
   ID BIGINT IDENTITY PRIMARY KEY,

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateSchemaIntegrationTests-mssql.sql

@@ -1,3 +1,6 @@
+DROP TABLE IF EXISTS OTHER;
+DROP SCHEMA IF EXISTS OTHER;
+
 CREATE SCHEMA OTHER;
 
 CREATE TABLE OTHER.DUMMY_ENTITY

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryCustomConversionIntegrationTests-mssql.sql

@@ -1,2 +1,5 @@
-CREATE TABLE ENTITY_WITH_STRINGY_BIG_DECIMAL ( id BIGINT IDENTITY PRIMARY KEY, Stringy_number DECIMAL(20,10))
+DROP TABLE OTHER_ENTITY;
+DROP TABLE ENTITY_WITH_STRINGY_BIG_DECIMAL;
+
+CREATE TABLE ENTITY_WITH_STRINGY_BIG_DECIMAL ( id BIGINT IDENTITY PRIMARY KEY, Stringy_number DECIMAL(20,10));
 CREATE TABLE OTHER_ENTITY ( ID BIGINT IDENTITY PRIMARY KEY, CREATED DATE, ENTITY_WITH_STRINGY_BIG_DECIMAL INTEGER);

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryPropertyConversionIntegrationTests-db2.sql

@@ -14,5 +14,5 @@ CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS (
 
 CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS_RELATION (
     id_Timestamp DATETIME NOT NULL PRIMARY KEY,
-    data VARCHAR(100),
+    data VARCHAR(100)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryPropertyConversionIntegrationTests-oracle.sql

@@ -14,5 +14,5 @@ CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS (
 
 CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS_RELATION (
     ID_TIMESTAMP TIMESTAMP PRIMARY KEY,
-    DATA VARCHAR2(100),
+    DATA VARCHAR2(100)
 );

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryPropertyConversionIntegrationTests-postgres.sql

@@ -1,4 +1,5 @@
 DROP TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS_RELATION;
 DROP TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS;
-CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS ( id_Timestamp TIMESTAMP PRIMARY KEY, bool boolean, SOME_ENUM VARCHAR(100), big_Decimal DECIMAL(65), big_Integer BIGINT, date TIMESTAMP, local_Date_Time TIMESTAMP, zoned_Date_Time VARCHAR(30))
-CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS_RELATION ( id_Timestamp DATETIME NOT NULL PRIMARY KEY, data VARCHAR(100));
+
+CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS ( id_Timestamp TIMESTAMP PRIMARY KEY, bool boolean, SOME_ENUM VARCHAR(100), big_Decimal DECIMAL(65), big_Integer BIGINT, date TIMESTAMP, local_Date_Time TIMESTAMP, zoned_Date_Time VARCHAR(30));
+CREATE TABLE ENTITY_WITH_COLUMNS_REQUIRING_CONVERSIONS_RELATION ( "ID_TIMESTAMP" TIMESTAMP PRIMARY KEY, data VARCHAR(100));

spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryResultSetExtractorIntegrationTests-mssql.sql

@@ -1,5 +1,6 @@
-DROP TABLE IF EXISTS person;
 DROP TABLE IF EXISTS address;
+DROP TABLE IF EXISTS person;
+
 CREATE TABLE person ( id int IDENTITY(1,1) PRIMARY KEY, name VARCHAR(100));
 CREATE TABLE address ( id int IDENTITY(1,1) PRIMARY KEY, street VARCHAR(100), person_id INT);
 ALTER TABLE address ADD FOREIGN KEY (person_id) REFERENCES person(id);