GROOVY-5305: Update dependencies (hsqldb)

Author: paulk-asert

Diff for: build.gradle

@@ -72,7 +72,7 @@ dependencies {
     testCompile "jmock:jmock:1.2.0"
     testCompile "jmock:jmock-cglib:1.2.0"
     testCompile "xmlunit:xmlunit:1.3"
-    testCompile "hsqldb:hsqldb:1.8.0.10"
+    testCompile "org.hsqldb:hsqldb:2.2.8"
     testCompile "ch.qos.logback:logback-classic:0.9.21"
     testCompile "log4j:log4j:1.2.16"
     testCompile "org.slf4j:jcl-over-slf4j:1.6.0"

Diff for: pom.xml

@@ -765,9 +765,9 @@
 
         <!-- used for SQL library -->
         <dependency>
-            <groupId>hsqldb</groupId>
+            <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.10</version>
+            <version>2.2.8</version>
             <scope>test</scope>
         </dependency>
 

Diff for: security/groovy.policy

@@ -252,8 +252,8 @@ grant codeBase "file:${user.dir}/src/test/groovy/sql/-" {
 };
 
 grant codeBase "file:${user.dir}/src/test/groovy/sql/SqlCompleteWithoutDataSourceTest.groovy" {
-    //TODO: what should this be see other TODO about narrowing down main directories
-    //permission java.io.FilePermission "${groovy.lib}${/}axion${/}jars${/}axion-1.0-M3-dev.jar", "read";
+    permission java.util.PropertyPermission "file.separator", "read";
+    permission java.util.PropertyPermission "line.separator", "read";
 };
 
 grant codeBase "file:${user.dir}/src/test/groovy/sql/SqlTest.groovy" {

Diff for: src/main/groovy/sql/Sql.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2011 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@
  * In simple cases, you can just provide
  * the necessary details to set up a connection (e.g. for hsqldb):
  * <pre>
- * def db = [url:'jdbc:hsqldb:mem:testDB', user:'sa', password:'', driver:'org.hsqldb.jdbcDriver']
+ * def db = [url:'jdbc:hsqldb:mem:testDB', user:'sa', password:'', driver:'org.hsqldb.jdbc.JDBCDriver']
  * def sql = Sql.newInstance(db.url, db.user, db.password, db.driver)
  * </pre>
  * or if you have an existing connection (perhaps from a connection pool) or a
@@ -350,7 +350,7 @@ public static Sql newInstance(String url, String driverClassName) throws SQLExce
      *     url:'jdbc:hsqldb:mem:testDB',
      *     user:'sa',
      *     password:'',
-     *     driver:'org.hsqldb.jdbcDriver',
+     *     driver:'org.hsqldb.jdbc.JDBCDriver',
      *     cacheStatements: true,
      *     resultSetConcurrency: CONCUR_READ_ONLY
      * )
@@ -1719,19 +1719,19 @@ public GroovyRowResult firstRow(String sql, Object[] params) throws SQLException
      * <p/>
      * Example usages:
      * <pre>
-     * sql.execute "drop table if exists PERSON"
+     * sql.execute "DROP TABLE IF EXISTS person"
      *
      * sql.execute """
-     *     create table PERSON (
-     *         id integer not null,
-     *         firstname varchar(100),
-     *         lastname varchar(100),
-     *         location_id integer
+     *     CREATE TABLE person (
+     *         id INTEGER NOT NULL,
+     *         firstname VARCHAR(100),
+     *         lastname VARCHAR(100),
+     *         location_id INTEGER
      *     )
      * """
      *
      * sql.execute """
-     *     insert into PERSON (id, firstname, lastname, location_id) values (4, 'Paul', 'King', 40)
+     *     INSERT INTO person (id, firstname, lastname, location_id) VALUES (4, 'Paul', 'King', 40)
      * """
      * assert sql.updateCount == 1
      * </pre>

Diff for: src/test/groovy/sql/PersonTest.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@ package groovy.sql
 
 import javax.sql.DataSource
 
+import static groovy.sql.SqlTestConstants.DB_DATASOURCE
+import static groovy.sql.SqlTestConstants.DB_URL_PREFIX
+
 class PersonTest extends GroovyTestCase {
 
     void testFoo() {
@@ -66,15 +69,14 @@ order by firstName DESC, age'''
         assert dataSet.sql == expectedSql
         assert dataSet.parameters == expectedParams
     }
-    
+
     protected DataSource createDataSource() {
-        def ds = new org.hsqldb.jdbc.jdbcDataSource()
-        ds.database = "jdbc:hsqldb:mem:foo" + getMethodName()
-        ds.user = 'sa'
-        ds.password = ''
-        return ds
+        return DB_DATASOURCE.newInstance(
+                database: DB_URL_PREFIX + getMethodName(),
+                user: 'sa',
+                password: '')
     }
-    
+
     protected def createDataSet() {
         def type = Person
         assert type != null , "failed to load Person class"

Diff for: src/test/groovy/sql/SqlBatchTest.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2011 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 package groovy.sql
 
 import javax.sql.DataSource
-import java.sql.Connection
+
+import static groovy.sql.SqlTestConstants.DB_DATASOURCE
+import static groovy.sql.SqlTestConstants.DB_URL_PREFIX
 
 /**
  * Test Sql batch features
@@ -25,17 +27,15 @@ import java.sql.Connection
  */
 class SqlBatchTest extends GroovyTestCase {
     Sql sql
-    def personFood
     private others = ['Jean':'Gabin', 'Lino':'Ventura']
 
     void setUp() {
-        DataSource ds = new org.hsqldb.jdbc.jdbcDataSource()
-        ds.database = "jdbc:hsqldb:mem:foo" + getMethodName()
-        ds.user = 'sa'
-        ds.password = ''
-        Connection con = ds.connection
-        sql = new Sql(con)
-        sql.execute("CREATE TABLE person ( id INTEGER, firstname VARCHAR, lastname VARCHAR, PRIMARY KEY (id))")
+        DataSource ds = DB_DATASOURCE.newInstance(
+                database: DB_URL_PREFIX + getMethodName(),
+                user: 'sa',
+                password: '')
+        sql = new Sql(ds.connection)
+        sql.execute("CREATE TABLE person ( id INTEGER, firstname VARCHAR(10), lastname VARCHAR(10), PRIMARY KEY (id))")
 
         // populate some data
         def people = sql.dataSet("PERSON")

Diff for: src/test/groovy/sql/SqlCacheTest.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,9 @@ import javax.sql.DataSource
 import java.sql.Connection
 import org.codehaus.groovy.runtime.InvokerHelper
 
+import static groovy.sql.SqlTestConstants.DB_DATASOURCE
+import static groovy.sql.SqlTestConstants.DB_URL_PREFIX
+
 /**
  * Unit test of Sql cache feature 
  * @author Marc DeXeT
@@ -36,11 +39,11 @@ class SqlCacheTest extends GroovyTestCase {
     int createStatementCallCounter
 
     void setUp() {
-        ds = new org.hsqldb.jdbc.jdbcDataSource()
-        ds.database = "jdbc:hsqldb:mem:foo" + getMethodName()
-        ds.user = 'sa'
-        ds.password = ''
-        con = ds.getConnection()
+        ds = DB_DATASOURCE.newInstance(
+                database: DB_URL_PREFIX + getMethodName(),
+                user: 'sa',
+                password: '')
+        con = ds.connection
         def methodOverride = [
                 createStatement: {Object[] args ->
                     createStatementCallCounter++
@@ -55,9 +58,9 @@ class SqlCacheTest extends GroovyTestCase {
         ]
         wrappedCon = ProxyGenerator.INSTANCE.instantiateDelegate(methodOverride, [Connection], con)
         sql = new Sql(wrappedCon)
-        sql.execute("create table PERSON ( id integer, firstname varchar, lastname varchar )")
-        sql.execute("create table FOOD ( id integer, type varchar, name varchar)")
-        sql.execute("create table PERSON_FOOD ( personid integer, foodid integer)")
+        sql.execute("create table PERSON ( id INTEGER, firstname VARCHAR(10), lastname VARCHAR(10) )")
+        sql.execute("create table FOOD ( id INTEGER, type VARCHAR(10), name VARCHAR(10))")
+        sql.execute("create table PERSON_FOOD ( personid INTEGER, foodid INTEGER)")
 
         // now let's populate the datasets
         def people = sql.dataSet("PERSON")

Diff for: src/test/groovy/sql/SqlCallTest.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package groovy.sql
 
-import java.sql.Connection
 import javax.sql.DataSource
 
+import static groovy.sql.SqlTestConstants.DB_URL_PREFIX
+import static groovy.sql.SqlTestConstants.DB_DATASOURCE
+
 /**
  * Test Sql transaction features using a Sql built from a connection
  *
@@ -28,12 +30,11 @@ class SqlCallTest extends GroovyTestCase {
     Sql sql
 
     protected Sql setUpSql() {
-        DataSource ds = new org.hsqldb.jdbc.jdbcDataSource()
-        ds.database = "jdbc:hsqldb:mem:foo" + getMethodName()
-        ds.user = 'sa'
-        ds.password = ''
-        Connection con = ds.connection
-        return new Sql(con)
+        DataSource ds = DB_DATASOURCE.newInstance(
+                database: DB_URL_PREFIX + getMethodName(),
+                user: 'sa',
+                password: '')
+        return new Sql(ds.connection)
     }
 
     protected tryDrop(String tableName) {
@@ -46,7 +47,7 @@ class SqlCallTest extends GroovyTestCase {
         sql = setUpSql()
         ["PERSON"].each{ tryDrop(it) }
 
-        sql.execute("CREATE TABLE person ( id INTEGER, firstname VARCHAR, lastname VARCHAR, PRIMARY KEY (id))")
+        sql.execute("CREATE TABLE person ( id INTEGER, firstname VARCHAR(10), lastname VARCHAR(10), PRIMARY KEY (id))")
 
         // populate some data
         def people = sql.dataSet("PERSON")

Diff for: src/test/groovy/sql/SqlCompleteTest.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2011 the original author or authors.
+ * Copyright 2003-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package groovy.sql
 
+import static groovy.sql.SqlTestConstants.DB_DATASOURCE
+
 class SqlCompleteTest extends TestHelper {
 
     boolean personMetaClosureCalled = false
@@ -303,10 +305,10 @@ class SqlCompleteTest extends TestHelper {
         features.each {
             /** @todo HSQLDB doesn't yet support ResultSet updating
              if (it.id == 1) {
-             it.name = it.name + " Rocks!"
-             println("Changing name to ${it.name}")
+                 it.name = it.name + " Rocks!"
+                 println("Changing name to ${it.name}")
              }
-             */
+             /* */
             results.add(it.name)
         }
         def expected = ["GDO", "GPath", "GroovyMarkup"]
@@ -431,10 +433,10 @@ class SqlCompleteTest extends TestHelper {
 
     void testNewInstanceMapMustContainNonNullUrl() {
         shouldFail(IllegalArgumentException) {
-            Sql.newInstance(driver: 'org.hsqldb.jdbcDriver', user: 'scott', password: 'tiger')
+            Sql.newInstance(driver: DB_DATASOURCE.name, user: 'scott', password: 'tiger')
         }
         shouldFail(IllegalArgumentException) {
-            Sql.newInstance(url: null, driver: 'org.hsqldb.jdbcDriver', user: 'scott', password: 'tiger')
+            Sql.newInstance(url: null, driver: DB_DATASOURCE.name, user: 'scott', password: 'tiger')
         }
     }
 
@@ -454,16 +456,16 @@ class SqlCompleteTest extends TestHelper {
 
     void testNewInstanceMapShouldRequireUserAndPasswordIfOneIsProvided() {
         shouldFail(IllegalArgumentException) {
-            Sql.newInstance(url: getURI(), driver: 'org.hsqldb.jdbcDriver', user: 'scott')
+            Sql.newInstance(url: getURI(), driver: DB_DATASOURCE.name, user: 'scott')
         }
         shouldFail(IllegalArgumentException) {
-            Sql.newInstance(url: getURI(), driver: 'org.hsqldb.jdbcDriver', password: 'tiger')
+            Sql.newInstance(url: getURI(), driver: DB_DATASOURCE.name, password: 'tiger')
         }
     }
 
     void testNewInstanceMapNotDestructiveGROOVY5216() {
         String url = getURI()
-        String driver = 'org.hsqldb.jdbcDriver'
+        String driver = DB_DATASOURCE.name
         String user = 'sa'
         String password = ''
 

Diff for: src/test/groovy/sql/SqlCompleteWithoutDataSourceTest.groovy

@@ -1,7 +1,23 @@
+/*
+ * Copyright 2003-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package groovy.sql
 
 import java.sql.DriverManager
-import org.hsqldb.jdbcDriver
+
+import static groovy.sql.SqlTestConstants.DB_DATASOURCE
 
 /**
  * Tests the use of the Sql class using just a Connection 
@@ -10,8 +26,7 @@ import org.hsqldb.jdbcDriver
 class SqlCompleteWithoutDataSourceTest extends SqlCompleteTest {
 
     protected def newSql(String uri) {
-        def driver = Class.forName('org.hsqldb.jdbcDriver')
-        println("Loading driver ${driver}")
+        Class.forName(DB_DATASOURCE.name)
         return new Sql(DriverManager.getConnection(uri))
     }
 }

Diff for: src/test/groovy/sql/SqlRowsTest.groovy

@@ -6,8 +6,8 @@ class SqlRowsTest extends TestHelper {
         Sql sql = super.createSql()
 
         ["JOINTESTA", "JOINTESTB"].each{ tryDrop(it) }
-        sql.execute("create table JOINTESTA ( id integer, bid integer, name varchar)")
-        sql.execute("create table JOINTESTB ( id integer, name varchar)")
+        sql.execute("create table JOINTESTA ( id INTEGER, bid INTEGER, name VARCHAR(10))")
+        sql.execute("create table JOINTESTB ( id INTEGER, name VARCHAR(10))")
 
         def jointesta = sql.dataSet("JOINTESTA")
         jointesta.add( id:1, bid:3, name:'A 1' )