Repository: metamodel Updated Branches: refs/heads/master 1f6cd03c5 -> fc2752abd
METAMODEL-176: Fixed Also added DataSet.close() to a few places where it was giving log warnings during build/test Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/e3e8357b Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/e3e8357b Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/e3e8357b Branch: refs/heads/master Commit: e3e8357b9c5fadce3a7f00b73dff625219bea06f Parents: 15c94fc Author: Kasper Sørensen <[email protected]> Authored: Tue Aug 18 10:13:54 2015 +0200 Committer: Kasper Sørensen <[email protected]> Committed: Tue Aug 18 10:13:54 2015 +0200 ---------------------------------------------------------------------- jdbc/pom.xml | 1 + .../test/java/org/apache/metamodel/jdbc/DerbyTest.java | 1 + .../org/apache/metamodel/jdbc/JdbcTestTemplates.java | 11 +++++++++++ 3 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/e3e8357b/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index cd66794..378ebf0 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -106,6 +106,7 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> http://git-wip-us.apache.org/repos/asf/metamodel/blob/e3e8357b/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java index 27e76a9..cee8454 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java @@ -140,6 +140,7 @@ public class DerbyTest extends TestCase { assertTrue(dataSet.next()); assertTrue(dataSet.next()); assertFalse(dataSet.next()); + dataSet.close(); } public void testGetSchemaNormalTableTypes() throws Exception { http://git-wip-us.apache.org/repos/asf/metamodel/blob/e3e8357b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java index ae2d3c9..e04e4c6 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java @@ -156,42 +156,49 @@ public class JdbcTestTemplates { assertTrue(ds.next()); assertEquals("1", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // regular NOT EQUALS ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").ne("C02").execute(); assertTrue(ds.next()); assertEquals("3", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // regular GREATER THAN ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("id").gt(2).execute(); assertTrue(ds.next()); assertEquals("2", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // regular LESS THAN ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("id").lt(2).execute(); assertTrue(ds.next()); assertEquals("1", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // IS NULL ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").isNull().execute(); assertTrue(ds.next()); assertEquals("1", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // IS NOT NULL ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").isNotNull().execute(); assertTrue(ds.next()); assertEquals("3", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // LIKE ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").like("C%").execute(); assertTrue(ds.next()); assertEquals("3", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // regular IN (with string) ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").in("C01", "C02") @@ -199,12 +206,14 @@ public class JdbcTestTemplates { assertTrue(ds.next()); assertEquals("2", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // regular IN (with decimals) ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("id").in(1.0, 2.0, 4.0).execute(); assertTrue(ds.next()); assertEquals("3", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); // irregular IN (with null value) - (currently uses SQL's standard way // of understanding NULL - see ticket #1058) @@ -217,6 +226,7 @@ public class JdbcTestTemplates { assertTrue(ds.next()); assertEquals("0", ds.getRow().getValue(0).toString()); assertFalse(ds.next()); + ds.close(); } public static void meaningOfOneSizeChar(Connection conn) throws Exception { @@ -259,6 +269,7 @@ public class JdbcTestTemplates { assertTrue(ds.next()); assertNull(ds.getRow().getValue(0)); assertFalse(ds.next()); + ds.close(); } public static void automaticConversionWhenInsertingString(Connection conn) throws Exception {
