From 460f472eb0fa8336c3643bc89d6b38f15d61fca7 Mon Sep 17 00:00:00 2001 From: davidlzs Date: Wed, 23 Nov 2022 20:09:07 -0600 Subject: [PATCH 1/3] Filter out synthetic fields in test --- .../org/sql2o/reflect/AbstractFieldSetterFactoryTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/org/sql2o/reflect/AbstractFieldSetterFactoryTest.java b/core/src/test/java/org/sql2o/reflect/AbstractFieldSetterFactoryTest.java index c3b065bf..c463ea7f 100644 --- a/core/src/test/java/org/sql2o/reflect/AbstractFieldSetterFactoryTest.java +++ b/core/src/test/java/org/sql2o/reflect/AbstractFieldSetterFactoryTest.java @@ -5,6 +5,7 @@ import org.sql2o.reflection.Setter; import java.lang.reflect.Field; +import java.util.Arrays; /** * User: dimzon @@ -61,7 +62,9 @@ public void testAllTypes() throws IllegalAccessException { assertFalse(pojo1.equals(pojo2)); - Field[] fields = pojo1.getClass().getDeclaredFields(); + Field[] fields = Arrays.stream(pojo1.getClass().getDeclaredFields()) + .filter(f -> !f.isSynthetic()) + .toArray(Field[]::new); for (Field field : fields) { Setter setter = fsf.newSetter(field); assertSame(field.getType(),setter.getType()); From 98ed5975600a3bef823ff5ffe4ba0e9f904abea8 Mon Sep 17 00:00:00 2001 From: David Liu Date: Fri, 25 Nov 2022 11:03:33 -0600 Subject: [PATCH 2/3] Use testcontainers Postgres module to test sql2o-postgres extension --- extensions/postgres/pom.xml | 6 ++++++ .../java/org/sql2o/extensions/postgres/PostgresTest.java | 3 --- .../org/sql2o/extensions/postgres/PostgresTestSupport.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/extensions/postgres/pom.xml b/extensions/postgres/pom.xml index be880696..1192d8dc 100644 --- a/extensions/postgres/pom.xml +++ b/extensions/postgres/pom.xml @@ -36,6 +36,12 @@ 9.1-901.jdbc4 true + + org.testcontainers + postgresql + 1.17.6 + test + com.impossibl.pgjdbc-ng pgjdbc-ng diff --git a/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTest.java b/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTest.java index de623380..b16f5932 100644 --- a/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTest.java +++ b/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTest.java @@ -43,9 +43,6 @@ public void testIssue10StatementsOnPostgres_noTransaction(){ try { try (Connection connection = sql2o.open()) { connection.createQuery("create table test_table(id SERIAL, val varchar(20))").executeUpdate(); - } - - try (Connection connection = sql2o.open()) { Long key = connection.createQuery("insert into test_table (val) values(:val)", true) .addParameter("val", "something").executeUpdate().getKey(Long.class); assertNotNull(key); diff --git a/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTestSupport.java b/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTestSupport.java index 982a6b3c..d007575e 100644 --- a/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTestSupport.java +++ b/extensions/postgres/src/test/java/org/sql2o/extensions/postgres/PostgresTestSupport.java @@ -33,7 +33,7 @@ public class PostgresTestSupport { @Parameterized.Parameters(name = "{index} - {4}") public static Collection getData(){ return Arrays.asList(new Object[][]{ - {"jdbc:postgresql:testdb", "test", "testtest", "Official postgres driver"}, + {"jdbc:tc:postgresql:9.6.8:///testdb", "test", "testtest", "Official postgres driver"}, // {"jdbc:pgsql://localhost/testdb", "test", "testtest", "Impossibl postgres driver"} }); } From ff1d248bc01a88da450cff868b0b295b4c07f23e Mon Sep 17 00:00:00 2001 From: David Liu Date: Fri, 25 Nov 2022 15:06:56 -0600 Subject: [PATCH 3/3] Add sql2o-mysql extension to address MySQL JDBC 8.0.23 changes to getObject on datetime column returns java.time.LocalDateTime quirk --- extensions/pom.xml | 1 + extensions/sql2o-mysql/pom.xml | 39 +++++++++++++ .../java/org/sql2o/quirks/MySQLQuirks.java | 19 ++++++ .../org/sql2o/quirks/MySQLQuirksProvider.java | 23 ++++++++ .../src/main/resources/META-INF/MANIFEST.MF | 2 + .../services/org.sql2o.quirks.QuirksProvider | 11 ++++ .../java/org/sql2o/extensions/MySQLTest.java | 58 +++++++++++++++++++ 7 files changed, 153 insertions(+) create mode 100644 extensions/sql2o-mysql/pom.xml create mode 100644 extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirks.java create mode 100644 extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirksProvider.java create mode 100644 extensions/sql2o-mysql/src/main/resources/META-INF/MANIFEST.MF create mode 100644 extensions/sql2o-mysql/src/main/resources/META-INF/services/org.sql2o.quirks.QuirksProvider create mode 100644 extensions/sql2o-mysql/src/test/java/org/sql2o/extensions/MySQLTest.java diff --git a/extensions/pom.xml b/extensions/pom.xml index 2ac682c6..cba196c6 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -27,6 +27,7 @@ db2 + sql2o-mysql diff --git a/extensions/sql2o-mysql/pom.xml b/extensions/sql2o-mysql/pom.xml new file mode 100644 index 00000000..74919575 --- /dev/null +++ b/extensions/sql2o-mysql/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + sql2o-mysql + jar + sql2o-mysql + MySQL extension for sql2o + http://www.sql2o.org + + org.sql2o.extensions + extensions-parent + 1.6.1-SNAPSHOT + + + + + + mysql + mysql-connector-java + 8.0.31 + true + + + org.testcontainers + mysql + 1.17.6 + test + + + \ No newline at end of file diff --git a/extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirks.java b/extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirks.java new file mode 100644 index 00000000..8bed24b2 --- /dev/null +++ b/extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirks.java @@ -0,0 +1,19 @@ +package org.sql2o.quirks; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class MySQLQuirks extends NoQuirks { + public MySQLQuirks() { + super(); + } + + @Override + public Object getRSVal(ResultSet rs, int idx) throws SQLException { + Object o = rs.getObject(idx); + if (o != null && o.getClass().getCanonicalName().startsWith("java.time.LocalDateTime")){ + o = rs.getObject(idx, java.sql.Timestamp.class); + } + return o; + } +} diff --git a/extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirksProvider.java b/extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirksProvider.java new file mode 100644 index 00000000..4aebfd3c --- /dev/null +++ b/extensions/sql2o-mysql/src/main/java/org/sql2o/quirks/MySQLQuirksProvider.java @@ -0,0 +1,23 @@ +package org.sql2o.quirks; + +/** + * Created by davidlzs on 25.11.22. + */ +public class MySQLQuirksProvider implements QuirksProvider { + + + @Override + public Quirks provide() { + return new MySQLQuirks(); + } + + @Override + public boolean isUsableForUrl(String url) { + return url.startsWith("jdbc:mysql:"); + } + + @Override + public boolean isUsableForClass(String className) { + return className.startsWith("com.mysql."); + } +} diff --git a/extensions/sql2o-mysql/src/main/resources/META-INF/MANIFEST.MF b/extensions/sql2o-mysql/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..e05eec1d --- /dev/null +++ b/extensions/sql2o-mysql/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Library-Name: Sql2o.extensions.mysql +Library-Description: MySQL plugin for sql2o diff --git a/extensions/sql2o-mysql/src/main/resources/META-INF/services/org.sql2o.quirks.QuirksProvider b/extensions/sql2o-mysql/src/main/resources/META-INF/services/org.sql2o.quirks.QuirksProvider new file mode 100644 index 00000000..c25748ee --- /dev/null +++ b/extensions/sql2o-mysql/src/main/resources/META-INF/services/org.sql2o.quirks.QuirksProvider @@ -0,0 +1,11 @@ +# +# Copyright (c) 2014 Lars Aaberg +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +org.sql2o.quirks.MySQLQuirksProvider \ No newline at end of file diff --git a/extensions/sql2o-mysql/src/test/java/org/sql2o/extensions/MySQLTest.java b/extensions/sql2o-mysql/src/test/java/org/sql2o/extensions/MySQLTest.java new file mode 100644 index 00000000..2bfdec18 --- /dev/null +++ b/extensions/sql2o-mysql/src/test/java/org/sql2o/extensions/MySQLTest.java @@ -0,0 +1,58 @@ +package org.sql2o.extensions; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sql2o.Connection; +import org.sql2o.Sql2o; +import org.sql2o.data.Row; +import org.sql2o.data.Table; +import org.sql2o.quirks.MySQLQuirks; + +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Collection; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +@RunWith(Parameterized.class) +public class MySQLTest { + private final Sql2o sql2o; + private final Logger logger = LoggerFactory.getLogger(MySQLTest.class); + + public MySQLTest(String url, String user, String pass, String testName) { + logger.info(testName); + sql2o = new Sql2o(url, user, pass, new MySQLQuirks()); + logger.info("starting MySQLTest"); + } + + @Parameterized.Parameters() + public static Collection getData(){ + return Arrays.asList(new Object[][]{ + {"jdbc:tc:mysql:5.7.34:///testdb", "test", "testtest", "Official MySQL driver"}, + }); + } + + @Test + public void testMySQL_whenJDBCReturnLocalDateTime() { + try (Connection connection = sql2o.open()) { + connection.createQuery("create table test_table(created_datetime datetime(6))").executeUpdate(); + //MySQL date(6) stores value to microseconds (6 digits) precision + Timestamp now = Timestamp.valueOf("2021-10-20 21:29:42.345678"); + connection.createQuery("insert into test_table (created_datetime) values(:created_datetime)") + .addParameter("created_datetime", now).executeUpdate(); + + String selectSql = "select created_datetime from test_table"; + Table resultTable = connection.createQuery(selectSql).executeAndFetchTable(); + + assertThat(resultTable.rows().size(), is(1)); + Row resultRow = resultTable.rows().get(0); + + assertThat(resultRow.getObject("created_datetime", Timestamp.class), equalTo(now)); + } + } +}