diff options
| author | James Moger <james.moger@gitblit.com> | 2017-01-31 21:27:25 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2017-01-31 21:27:25 -0500 |
| commit | dfe86af88afa2839c6acbb4c1322bbc4098cc6e3 (patch) | |
| tree | ad92035084eff61c9b392470bfc78d0dbd0db05b | |
| parent | d18e27e799f4d887b22a5fc3cfcf59ddadde92f1 (diff) | |
| download | iciql-dfe86af88afa2839c6acbb4c1322bbc4098cc6e3.tar.gz iciql-dfe86af88afa2839c6acbb4c1322bbc4098cc6e3.zip | |
Unit test adjustments for MySQL 5.7
| -rw-r--r-- | src/test/java/com/iciql/test/AnnotationsTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/iciql/test/IciqlSuite.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/iciql/test/ModelsTest.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/iciql/test/AnnotationsTest.java b/src/test/java/com/iciql/test/AnnotationsTest.java index f96fe76..a8d70ca 100644 --- a/src/test/java/com/iciql/test/AnnotationsTest.java +++ b/src/test/java/com/iciql/test/AnnotationsTest.java @@ -70,7 +70,7 @@ public class AnnotationsTest { boolean toUpper = meta.storesUpperCaseIdentifiers(); boolean toLower = meta.storesLowerCaseIdentifiers(); ResultSet rs = meta.getIndexInfo(null, prepName(schema, toUpper, toLower), - prepName("ANNOTATEDPRODUCT", toUpper, toLower), false, true); + prepName("AnnotatedProduct", toUpper, toLower), false, true); List<String> list = Utils.newArrayList(); while (rs.next()) { diff --git a/src/test/java/com/iciql/test/IciqlSuite.java b/src/test/java/com/iciql/test/IciqlSuite.java index bbbd5c6..20a2e61 100644 --- a/src/test/java/com/iciql/test/IciqlSuite.java +++ b/src/test/java/com/iciql/test/IciqlSuite.java @@ -110,7 +110,7 @@ public class IciqlSuite { new TestDb("Derby", "memory", "jdbc:derby:memory:iciql;create=true"), new TestDb("Derby", "file", "jdbc:derby:directory:testdbs/derby/iciql;create=true"), new TestDb("Derby", "tcp", "jdbc:derby://localhost:1527/testdbs/derby/iciql;create=true", "sa", "sa"), - new TestDb("MySQL", "tcp", "jdbc:mysql://localhost:3306/iciql?useSSL=false", "sa", "sa"), + new TestDb("MySQL", "tcp", "jdbc:mysql://localhost:3306/iciql?useSSL=false&nullNamePatternMatchesAll=true&nullCatalogMeansCurrent=true", "sa", "sa"), new TestDb("PostgreSQL", "tcp", "jdbc:postgresql://localhost:5432/iciql", "sa", "sa"), // diff --git a/src/test/java/com/iciql/test/ModelsTest.java b/src/test/java/com/iciql/test/ModelsTest.java index 5f77e97..579bf34 100644 --- a/src/test/java/com/iciql/test/ModelsTest.java +++ b/src/test/java/com/iciql/test/ModelsTest.java @@ -139,7 +139,7 @@ public class ModelsTest { } else if (dbName.equals("MySQL")) { // MySQL uses timestamp default values like // 0000-00-00 00:00:00 and CURRENT_TIMESTAMP - assertEquals(1673, models.get(0).length()); + assertEquals(1571, models.get(0).length()); } else if (dbName.equals("SQLite")) { assertEquals(1566, models.get(0).length()); } else { |