groovy git commit: GROOVY-8397: temporarily turn off all metadata checking

[pa...@apache.org]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 8fe269ed5 -> d6fb799c4


GROOVY-8397: temporarily turn off all metadata checking


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d6fb799c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d6fb799c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d6fb799c

Branch: refs/heads/GROOVY_2_4_X
Commit: d6fb799c40294bdb7c659d5d7a5884743d6b2126
Parents: 8fe269e
Author: paulk <pa...@asert.com.au>
Authored: Thu Nov 30 17:09:57 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Nov 30 17:09:57 2017 +1000

----------------------------------------------------------------------
 .../src/main/java/groovy/sql/Sql.java           | 34 ++++++++++++++------
 .../groovy/groovy/sql/SqlCompleteTest.groovy    |  1 +
 2 files changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/d6fb799c/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index ae347fc..68aa026 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -20,7 +20,13 @@ package groovy.sql;
 
 import groovy.lang.Closure;
 import groovy.lang.GString;
+import groovy.lang.MissingPropertyException;
+import groovy.lang.Tuple;
+import groovy.transform.stc.ClosureParams;
+import groovy.transform.stc.SimpleType;
+import org.codehaus.groovy.runtime.InvokerHelper;
 
+import javax.sql.DataSource;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -33,19 +39,18 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.sql.DataSource;
-
-import groovy.lang.MissingPropertyException;
-import groovy.lang.Tuple;
-import groovy.transform.stc.ClosureParams;
-import groovy.transform.stc.SimpleType;
-import org.codehaus.groovy.runtime.InvokerHelper;
-
 import static org.codehaus.groovy.runtime.SqlGroovyMethods.toRowResult;
 
 /**
@@ -266,6 +271,16 @@ public class Sql {
 
     private boolean withinBatch;
 
+    public boolean isEnableMetaDataChecking() {
+        return enableMetaDataChecking;
+    }
+
+    public void setEnableMetaDataChecking(boolean enableMetaDataChecking) {
+        this.enableMetaDataChecking = enableMetaDataChecking;
+    }
+
+    private boolean enableMetaDataChecking = false;
+
     private final Map<String, Statement> statementCache = new HashMap<String, Statement>();
     private final Map<String, String> namedParamSqlCache = new HashMap<String, String>();
     private final Map<String, List<Tuple>> namedParamIndexPropCache = new HashMap<String, List<Tuple>>();
@@ -4159,6 +4174,7 @@ public class Sql {
     }
 
     private ParameterMetaData getParameterMetaDataSafe(PreparedStatement statement) throws SQLException {
+        if (!enableMetaDataChecking) return null;
         try {
             return statement.getParameterMetaData();
         } catch(SQLException se) {

http://git-wip-us.apache.org/repos/asf/groovy/blob/d6fb799c/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
index ad399d9..6cc6fd3 100644
--- a/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
+++ b/subprojects/groovy-sql/src/test/groovy/groovy/sql/SqlCompleteTest.groovy
@@ -142,6 +142,7 @@ class SqlCompleteTest extends SqlHelperTestCase {
     }
 
     void testRowsWithEmptyMapParams() {
+        sql.enableMetaDataChecking = true
         def results = sql.rows("select * from PERSON where firstname like '%am%' and lastname like '%a%'", [:])
         assert results.collectEntries{ [it.firstname, it.lastname] } == ["James": "Strachan", "Sam": "Pullara"]
     }