Repository: polygene-java Updated Branches: refs/heads/develop 36cef00a2 -> 67267eaba
sql-es: fix mysql tests tear down Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/67267eab Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/67267eab Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/67267eab Branch: refs/heads/develop Commit: 67267eaba83455065e1a30c0d51b1758178e46c9 Parents: 36cef00 Author: Paul Merlin <[email protected]> Authored: Mon Feb 27 00:09:14 2017 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Feb 27 00:09:14 2017 +0100 ---------------------------------------------------------------------- .../apache/polygene/entitystore/sql/MySQLEntityStoreTest.java | 4 ++-- extensions/entitystore-sql/src/test/resources/logback.xml | 4 +--- .../src/test/resources/mysql-datasource.properties | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/67267eab/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java index 9183801..0718ddb 100644 --- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java +++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java @@ -92,7 +92,7 @@ public class MySQLEntityStoreTest int mysqlPort = DOCKER.getExposedContainerPort( "3306/tcp" ); config.forMixin( DataSourceConfiguration.class ).declareDefaults() .url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort - + "/jdbc_test_db?profileSQL=true&useLegacyDatetimeCode=false&serverTimezone=UTC" ); + + "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC" ); // START SNIPPET: assembly } // END SNIPPET: assembly @@ -109,7 +109,7 @@ public class MySQLEntityStoreTest connection.setAutoCommit( false ); try( Statement stmt = connection.createStatement() ) { - stmt.execute( String.format( "DELETE FROM %s", SQLs.TABLE_NAME ) ); + stmt.execute( String.format( "TRUNCATE %s", SQLs.TABLE_NAME ) ); connection.commit(); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/67267eab/extensions/entitystore-sql/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sql/src/test/resources/logback.xml b/extensions/entitystore-sql/src/test/resources/logback.xml index 7bb4780..03fb4dd 100644 --- a/extensions/entitystore-sql/src/test/resources/logback.xml +++ b/extensions/entitystore-sql/src/test/resources/logback.xml @@ -30,8 +30,6 @@ <appender-ref ref="stdout" /> </root> - <logger name="org.apache.polygene.entitystore.sql" level="trace"/> - <!-- Put this one to trace level to see all SQL strings --> - <logger name="org.apache.polygene.entitystore.sql.internal.database.DatabaseSQLStringsBuilder" level="debug"/> + <logger name="org.apache.polygene.entitystore.sql" level="debug"/> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/67267eab/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties b/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties index 6ace8dc..964c7d6 100644 --- a/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties +++ b/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties @@ -19,7 +19,7 @@ # enabled=true -#url=jdbc:mysql://localhost:3306/jdbc_test_db?profileSQL=true&useLegacyDatetimeCode=false&serverTimezone=UTC -driver=com.mysql.jdbc.Driver +#url=jdbc:mysql://localhost:3306/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC +driver=com.mysql.cj.jdbc.Driver username=root password=
