activerecord-jdbc-adapter 1.3.0.rc1 → 1.3.0

data/src/java/arjdbc/jdbc/AdapterJavaService.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -41,5 +41,5 @@ public class AdapterJavaService implements BasicLibraryService {
         ArJdbcModule.load(runtime);
         return true;
     }
-    
+
 }

data/src/java/arjdbc/jdbc/JdbcConnectionFactory.java

@@ -1,4 +1,5 @@
 /***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  *
@@ -33,12 +34,12 @@ import java.sql.SQLException;
  * @author nicksieger
  */
 public interface JdbcConnectionFactory {
-    
+
     /**
      * Retrieve a (new) connection from the factory.
      * @return a connection
-     * @throws SQLException 
+     * @throws SQLException
      */
     Connection newConnection() throws SQLException;
-    
+
 }

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2011 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
@@ -453,9 +453,8 @@ public class RubyJdbcConnection extends RubyObject {
             }
         }
         else {
-            callMethod(context, "warn",
-                context.getRuntime().newString("WARN: adapter not set for: " + inspect() +
-                    " make sure you pass it on initialize(config, adapter)"));
+            warn(context, "WARN: adapter not set for: " + inspect() +
+                " make sure you pass it on initialize(config, adapter)");
         }
         return jdbcConnection;
     }
@@ -542,7 +541,7 @@ public class RubyJdbcConnection extends RubyObject {
                 try {
                     statement = createStatement(context, connection);
                     if ( doExecute(statement, query) ) {
-                        return mapResults(context, connection.getMetaData(), statement, false);
+                        return mapResults(context, connection, statement, false);
                     } else {
                         return mapGeneratedKeysOrUpdateCount(context, connection, statement);
                     }
@@ -791,7 +790,6 @@ public class RubyJdbcConnection extends RubyObject {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 final Ruby runtime = context.getRuntime();
-                final DatabaseMetaData metaData = connection.getMetaData();
 
                 Statement statement = null; ResultSet resultSet = null;
                 try {
@@ -811,10 +809,10 @@ public class RubyJdbcConnection extends RubyObject {
                     if ( block != null && block.isGiven() ) {
                         // yield(id1, name1) ... row 1 result data
                         // yield(id2, name2) ... row 2 result data
-                        return yieldResultRows(context, runtime, metaData, resultSet, block);
+                        return yieldResultRows(context, runtime, connection, resultSet, block);
                     }
 
-                    return mapToRawResult(context, runtime, metaData, resultSet, false);
+                    return mapToRawResult(context, runtime, connection, resultSet, false);
                 }
                 catch (final SQLException e) {
                     debugErrorSQL(context, query);
@@ -938,9 +936,8 @@ public class RubyJdbcConnection extends RubyObject {
     private IRubyObject mapQueryResult(final ThreadContext context,
         final Connection connection, final ResultSet resultSet) throws SQLException {
         final Ruby runtime = context.getRuntime();
-        final DatabaseMetaData metaData = connection.getMetaData();
-        final ColumnData[] columns = setupColumns(runtime, metaData, resultSet.getMetaData(), false);
-        return mapToResult(context, runtime, metaData, resultSet, columns);
+        final ColumnData[] columns = extractColumns(runtime, connection, resultSet, false);
+        return mapToResult(context, runtime, connection, resultSet, columns);
     }
 
     /**
@@ -976,10 +973,11 @@ public class RubyJdbcConnection extends RubyObject {
     @JRubyMethod(name = "supported_data_types")
     public IRubyObject supported_data_types(final ThreadContext context) throws SQLException {
         final Ruby runtime = context.getRuntime();
-        final DatabaseMetaData metaData = getConnection(true).getMetaData();
-        final IRubyObject types; final ResultSet typeDesc = metaData.getTypeInfo();
+        final Connection connection = getConnection(true);
+        final ResultSet typeDesc = connection.getMetaData().getTypeInfo();
+        final IRubyObject types;
         try {
-            types = mapToRawResult(context, runtime, metaData, typeDesc, true);
+            types = mapToRawResult(context, runtime, connection, typeDesc, true);
         }
         finally { close(typeDesc); }
 
@@ -999,8 +997,8 @@ public class RubyJdbcConnection extends RubyObject {
         return withConnection(context, new Callable<List<RubyString>>() {
             public List<RubyString> call(final Connection connection) throws SQLException {
                 final Ruby runtime = context.getRuntime();
+                final String _tableName = caseConvertIdentifierForJdbc(connection, tableName);
                 final DatabaseMetaData metaData = connection.getMetaData();
-                final String _tableName = caseConvertIdentifierForJdbc(metaData, tableName);
                 ResultSet resultSet = null;
                 final List<RubyString> keyNames = new ArrayList<RubyString>();
                 try {
@@ -1009,7 +1007,7 @@ public class RubyJdbcConnection extends RubyObject {
 
                     while (resultSet.next()) {
                         String columnName = resultSet.getString(PRIMARY_KEYS_COLUMN_NAME);
-                        columnName = caseConvertIdentifierForRails(metaData, columnName);
+                        columnName = caseConvertIdentifierForRails(connection, columnName);
                         keyNames.add( RubyString.newUnicodeString(runtime, columnName) );
                     }
                 }
@@ -1156,9 +1154,9 @@ public class RubyJdbcConnection extends RubyObject {
                 final Ruby runtime = context.getRuntime();
                 final RubyClass indexDefinition = getIndexDefinition(runtime);
 
+                String _tableName = caseConvertIdentifierForJdbc(connection, tableName);
+                String _schemaName = caseConvertIdentifierForJdbc(connection, schemaName);
                 final DatabaseMetaData metaData = connection.getMetaData();
-                String _tableName = caseConvertIdentifierForJdbc(metaData, tableName);
-                String _schemaName = caseConvertIdentifierForJdbc(metaData, schemaName);
 
                 final List<RubyString> primaryKeys = primaryKeys(context, _tableName);
                 ResultSet indexInfoSet = null;
@@ -1296,12 +1294,12 @@ public class RubyJdbcConnection extends RubyObject {
             column.callMethod(context, "type").toString() == (Object) "binary";
 
         final RubyClass recordClass = record.getMetaClass(); // record.class
-        final IRubyObject connection = record.callMethod(context, "connection");
+        final IRubyObject adapter = recordClass.callMethod(context, "connection");
 
         IRubyObject columnName = column.callMethod(context, "name");
-        columnName = connection.callMethod(context, "quote_column_name", columnName);
+        columnName = adapter.callMethod(context, "quote_column_name", columnName);
         IRubyObject tableName = recordClass.callMethod(context, "table_name");
-        tableName = connection.callMethod(context, "quote_table_name", tableName);
+        tableName = adapter.callMethod(context, "quote_table_name", tableName);
         final IRubyObject idKey = recordClass.callMethod(context, "primary_key"); // 'id'
         // callMethod(context, "quote", primaryKey);
         final IRubyObject idColumn = // record.class.columns_hash['id']
@@ -1342,6 +1340,12 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
+    protected String caseConvertIdentifierForRails(final Connection connection, final String value)
+        throws SQLException {
+        if ( value == null ) return null;
+        return caseConvertIdentifierForRails(connection.getMetaData(), value);
+    }
+
     /**
      * Convert an identifier coming back from the database to a case which Rails is expecting.
      *
@@ -1356,16 +1360,21 @@ public class RubyJdbcConnection extends RubyObject {
     protected static String caseConvertIdentifierForRails(final DatabaseMetaData metaData, final String value)
         throws SQLException {
         if ( value == null ) return null;
-
         return metaData.storesUpperCaseIdentifiers() ? value.toLowerCase() : value;
     }
 
+    protected String caseConvertIdentifierForJdbc(final Connection connection, final String value)
+        throws SQLException {
+        if ( value == null ) return null;
+        return caseConvertIdentifierForJdbc(connection.getMetaData(), value);
+    }
+
     /**
      * Convert an identifier destined for a method which cares about the databases internal
      * storage case.  Methods like DatabaseMetaData.getPrimaryKeys() needs the table name to match
-     * the internal storage name.  Arbtrary queries and the like DO NOT need to do this.
+     * the internal storage name.  Arbitrary queries and the like DO NOT need to do this.
      */
-    protected String caseConvertIdentifierForJdbc(final DatabaseMetaData metaData, final String value)
+    protected static String caseConvertIdentifierForJdbc(final DatabaseMetaData metaData, final String value)
         throws SQLException {
         if ( value == null ) return null;
 
@@ -1375,7 +1384,6 @@ public class RubyJdbcConnection extends RubyObject {
         else if ( metaData.storesLowerCaseIdentifiers() ) {
             return value.toLowerCase();
         }
-
         return value;
     }
 
@@ -1465,7 +1473,7 @@ public class RubyJdbcConnection extends RubyObject {
      * @throws SQLException
      */
     protected IRubyObject mapToResult(final ThreadContext context, final Ruby runtime,
-            final DatabaseMetaData metaData, final ResultSet resultSet,
+            final Connection connection, final ResultSet resultSet,
             final ColumnData[] columns) throws SQLException {
 
         final ResultHandler resultHandler = ResultHandler.getInstance(runtime);
@@ -1635,20 +1643,29 @@ public class RubyJdbcConnection extends RubyObject {
         return runtime.getKernel().callMethod("BigDecimal", runtime.newString(value));
     }
 
-    protected static boolean rawDateTime = Boolean.getBoolean("arjdbc.datetime.raw");
+    protected static Boolean rawDateTime;
+    static {
+        final String dateTimeRaw = System.getProperty("arjdbc.datetime.raw");
+        if ( dateTimeRaw != null ) {
+            rawDateTime = Boolean.parseBoolean(dateTimeRaw);
+        }
+        // NOTE: we do this since it will have a different value depending on
+        // AR version - since 4.0 false by default otherwise will be true ...
+    }
 
-    @JRubyMethod(name = "raw_date_time?")
+    @JRubyMethod(name = "raw_date_time?", meta = true)
     public static IRubyObject useRawDateTime(final ThreadContext context, final IRubyObject self) {
-        return context.getRuntime().newBoolean(rawDateTime);
+        if ( rawDateTime == null ) return context.getRuntime().getNil();
+        return context.getRuntime().newBoolean( rawDateTime.booleanValue() );
     }
 
-    @JRubyMethod(name = "raw_date_time=")
+    @JRubyMethod(name = "raw_date_time=", meta = true)
     public static IRubyObject setRawDateTime(final IRubyObject self, final IRubyObject value) {
         if ( value instanceof RubyBoolean ) {
             rawDateTime = ((RubyBoolean) value).isTrue();
         }
         else {
-            rawDateTime = value.isNil();
+            rawDateTime = value.isNil() ? null : Boolean.TRUE;
         }
         return value;
     }
@@ -1664,7 +1681,7 @@ public class RubyJdbcConnection extends RubyObject {
         }
 
         final RubyString strValue = RubyString.newUnicodeString(runtime, value.toString());
-        if ( rawDateTime ) return strValue;
+        if ( rawDateTime != null && rawDateTime.booleanValue() ) return strValue;
 
         final IRubyObject adapter = callMethod(context, "adapter"); // self.adapter
         if ( adapter.isNil() ) return strValue; // NOTE: we warn on init_connection
@@ -1682,7 +1699,7 @@ public class RubyJdbcConnection extends RubyObject {
         }
 
         final RubyString strValue = RubyString.newUnicodeString(runtime, value.toString());
-        if ( rawDateTime ) return strValue;
+        if ( rawDateTime != null && rawDateTime.booleanValue() ) return strValue;
 
         final IRubyObject adapter = callMethod(context, "adapter"); // self.adapter
         if ( adapter.isNil() ) return strValue; // NOTE: we warn on init_connection
@@ -1700,7 +1717,7 @@ public class RubyJdbcConnection extends RubyObject {
         }
 
         final RubyString strValue = timestampToRubyString(runtime, value.toString());
-        if ( rawDateTime ) return strValue;
+        if ( rawDateTime != null && rawDateTime.booleanValue() ) return strValue;
 
         final IRubyObject adapter = callMethod(context, "adapter"); // self.adapter
         if ( adapter.isNil() ) return strValue; // NOTE: we warn on init_connection
@@ -1728,9 +1745,39 @@ public class RubyJdbcConnection extends RubyObject {
         return timestampToRubyString(runtime, value.toString());
     }
 
+    protected static Boolean rawBoolean;
+    static {
+        final String booleanRaw = System.getProperty("arjdbc.boolean.raw");
+        if ( booleanRaw != null ) {
+            rawBoolean = Boolean.parseBoolean(booleanRaw);
+        }
+    }
+
+    @JRubyMethod(name = "raw_boolean?", meta = true)
+    public static IRubyObject useRawBoolean(final ThreadContext context, final IRubyObject self) {
+        if ( rawBoolean == null ) return context.getRuntime().getNil();
+        return context.getRuntime().newBoolean( rawBoolean.booleanValue() );
+    }
+
+    @JRubyMethod(name = "raw_boolean=", meta = true)
+    public static IRubyObject setRawBoolean(final IRubyObject self, final IRubyObject value) {
+        if ( value instanceof RubyBoolean ) {
+            rawBoolean = ((RubyBoolean) value).isTrue();
+        }
+        else {
+            rawBoolean = value.isNil() ? null : Boolean.TRUE;
+        }
+        return value;
+    }
+
     protected IRubyObject booleanToRuby(final ThreadContext context,
         final Ruby runtime, final ResultSet resultSet, final int column)
         throws SQLException {
+        if ( rawBoolean != null && rawBoolean.booleanValue() ) {
+            final String value = resultSet.getString(column);
+            if ( resultSet.wasNull() ) return runtime.getNil();
+            return RubyString.newUnicodeString(runtime, value);
+        }
         final boolean value = resultSet.getBoolean(column);
         if ( resultSet.wasNull() ) return runtime.getNil();
         return booleanToRuby(runtime, resultSet, value);
@@ -1863,15 +1910,7 @@ public class RubyJdbcConnection extends RubyObject {
                 column = (IRubyObject) _param[0]; param = _param[1];
             }
 
-            final IRubyObject type;
-            if ( column != null && ! column.isNil() ) {
-                type = column.callMethod(context, "type");
-            }
-            else {
-                type = null;
-            }
-
-            setStatementParameter(context, runtime, connection, statement, i + 1, param, type);
+            setStatementParameter(context, runtime, connection, statement, i + 1, param, column);
         }
     }
 
@@ -1987,8 +2026,16 @@ public class RubyJdbcConnection extends RubyObject {
 
         final String internedType;
         if ( column != null && ! column.isNil() ) {
-            final RubySymbol columnType = resolveColumnType(context, runtime, column);
-            internedType = columnType.asJavaString();
+            // NOTE: there's no ActiveRecord "convention" really for this ...
+            // this is based on Postgre's initial support for arrays :
+            // `column.type` contains the base type while there's `column.array?`
+            if ( column.respondsTo("array?") && column.callMethod(context, "array?").isTrue() ) {
+                internedType = "array";
+            }
+            else {
+                final RubySymbol columnType = resolveColumnType(context, runtime, column);
+                internedType = columnType.asJavaString();
+            }
         }
         else {
             if ( value instanceof RubyInteger ) {
@@ -2452,7 +2499,7 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    /* protected */ void setArrayParameter(final ThreadContext context,
+    protected void setArrayParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
         final int index, final Object value,
         final IRubyObject column, final int type) throws SQLException {
@@ -2462,25 +2509,34 @@ public class RubyJdbcConnection extends RubyObject {
         else {
             if ( value == null ) statement.setNull(index, Types.ARRAY);
             else {
-                // TODO get array element type name ?!
-                Array array = connection.createArrayOf(null, (Object[]) value);
+                String typeName = resolveArrayBaseTypeName(context, value, column, type);
+                Array array = connection.createArrayOf(typeName, (Object[]) value);
                 statement.setArray(index, array);
             }
         }
     }
 
-    /* protected */ void setArrayParameter(final ThreadContext context,
+    protected void setArrayParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
         final int index, final IRubyObject value,
         final IRubyObject column, final int type) throws SQLException {
         if ( value.isNil() ) statement.setNull(index, Types.ARRAY);
         else {
-            // TODO get array element type name ?!
-            Array array = connection.createArrayOf(null, ((RubyArray) value).toArray());
+            String typeName = resolveArrayBaseTypeName(context, value, column, type);
+            Array array = connection.createArrayOf(typeName, ((RubyArray) value).toArray());
             statement.setArray(index, array);
         }
     }
 
+    protected String resolveArrayBaseTypeName(final ThreadContext context,
+        final Object value, final IRubyObject column, final int type) {
+        // return column.callMethod(context, "sql_type").toString();
+        String sqlType = column.callMethod(context, "sql_type").toString();
+        final int index = sqlType.indexOf('('); // e.g. "character varying(255)"
+        if ( index > 0 ) sqlType = sqlType.substring(0, index);
+        return sqlType;
+    }
+
     protected void setXmlParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
         final int index, final Object value,
@@ -2637,6 +2693,14 @@ public class RubyJdbcConnection extends RubyObject {
             debugMessage(context, "connection considered broken due: " + e.toString());
             return false;
         }
+        catch (AbstractMethodError e) { // non-JDBC 4.0 driver
+            warn( context,
+                "WARN: driver does not support checking if connection isValid()" +
+                " please make sure you're using a JDBC 4.0 compilant driver or" +
+                " set `connection_alive_sql: ...` in your database configuration" );
+            debugStackTrace(context, e);
+            throw e;
+        }
         finally { close(statement); }
     }
 
@@ -2671,11 +2735,10 @@ public class RubyJdbcConnection extends RubyObject {
             final String tablePattern, final String[] types,
             final boolean checkExistsOnly) throws SQLException {
 
+        final String _tablePattern = caseConvertIdentifierForJdbc(connection, tablePattern);
+        final String _schemaPattern = caseConvertIdentifierForJdbc(connection, schemaPattern);
         final DatabaseMetaData metaData = connection.getMetaData();
 
-        final String _tablePattern = caseConvertIdentifierForJdbc(metaData, tablePattern);
-        final String _schemaPattern = caseConvertIdentifierForJdbc(metaData, schemaPattern);
-
         ResultSet tablesSet = null;
         try {
             tablesSet = metaData.getTables(catalog, _schemaPattern, _tablePattern, types);
@@ -2705,13 +2768,16 @@ public class RubyJdbcConnection extends RubyObject {
      * @return List<RubyString>
      * @throws SQLException
      */
+    // NOTE: change to accept a connection instead of meta-data
     protected RubyArray mapTables(final Ruby runtime, final DatabaseMetaData metaData,
             final String catalog, final String schemaPattern, final String tablePattern,
             final ResultSet tablesSet) throws SQLException {
         final RubyArray tables = runtime.newArray();
         while ( tablesSet.next() ) {
             String name = tablesSet.getString(TABLES_TABLE_NAME);
+
             name = caseConvertIdentifierForRails(metaData, name);
+
             tables.add(RubyString.newUnicodeString(runtime, name));
         }
         return tables;
@@ -2920,14 +2986,14 @@ public class RubyJdbcConnection extends RubyObject {
      }
 
     protected IRubyObject mapResults(final ThreadContext context,
-            final DatabaseMetaData metaData, final Statement statement,
+            final Connection connection, final Statement statement,
             final boolean downCase) throws SQLException {
 
         final Ruby runtime = context.getRuntime();
         IRubyObject result;
         ResultSet resultSet = statement.getResultSet();
         try {
-            result = mapToRawResult(context, runtime, metaData, resultSet, downCase);
+            result = mapToRawResult(context, runtime, connection, resultSet, downCase);
         }
         finally { close(resultSet); }
 
@@ -2939,7 +3005,7 @@ public class RubyJdbcConnection extends RubyObject {
         do {
             resultSet = statement.getResultSet();
             try {
-                result = mapToRawResult(context, runtime, metaData, resultSet, downCase);
+                result = mapToRawResult(context, runtime, connection, resultSet, downCase);
             }
             finally { close(resultSet); }
 
@@ -2966,6 +3032,20 @@ public class RubyJdbcConnection extends RubyObject {
      * @param downCase should column names only be in lower case?
      */
     @SuppressWarnings("unchecked")
+    private IRubyObject mapToRawResult(final ThreadContext context, final Ruby runtime,
+            final Connection connection, final ResultSet resultSet,
+            final boolean downCase) throws SQLException {
+
+        final ColumnData[] columns = extractColumns(runtime, connection, resultSet, downCase);
+
+        final RubyArray results = runtime.newArray();
+        // [ { 'col1': 1, 'col2': 2 }, { 'col1': 3, 'col2': 4 } ]
+        populateFromResultSet(context, runtime, (List<IRubyObject>) results, resultSet, columns);
+        return results;
+    }
+
+    @Deprecated
+    @SuppressWarnings("unchecked")
     private IRubyObject mapToRawResult(final ThreadContext context, final Ruby runtime,
             final DatabaseMetaData metaData, final ResultSet resultSet,
             final boolean downCase) throws SQLException {
@@ -2979,10 +3059,10 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     private IRubyObject yieldResultRows(final ThreadContext context, final Ruby runtime,
-            final DatabaseMetaData metaData, final ResultSet resultSet,
+            final Connection connection, final ResultSet resultSet,
             final Block block) throws SQLException {
 
-        final ColumnData[] columns = extractColumns(runtime, metaData, resultSet, false);
+        final ColumnData[] columns = extractColumns(runtime, connection, resultSet, false);
 
         final IRubyObject[] blockArgs = new IRubyObject[columns.length];
         while ( resultSet.next() ) {
@@ -3005,6 +3085,13 @@ public class RubyJdbcConnection extends RubyObject {
      * @return columns data
      * @throws SQLException
      */
+    protected ColumnData[] extractColumns(final Ruby runtime,
+        final Connection connection, final ResultSet resultSet,
+        final boolean downCase) throws SQLException {
+        return setupColumns(runtime, connection, resultSet.getMetaData(), downCase);
+    }
+
+    @Deprecated
     protected ColumnData[] extractColumns(final Ruby runtime,
         final DatabaseMetaData metaData, final ResultSet resultSet,
         final boolean downCase) throws SQLException {
@@ -3358,12 +3445,10 @@ public class RubyJdbcConnection extends RubyObject {
             name = nameParts[2];
         }
 
-        final DatabaseMetaData metaData = connection.getMetaData();
-
         if (schema != null) {
-            schema = caseConvertIdentifierForJdbc(metaData, schema);
+            schema = caseConvertIdentifierForJdbc(connection, schema);
         }
-        name = caseConvertIdentifierForJdbc(metaData, name);
+        name = caseConvertIdentifierForJdbc(connection, name);
 
         if (schema != null && ! databaseSupportsSchemas()) {
             catalog = schema;
@@ -3395,11 +3480,16 @@ public class RubyJdbcConnection extends RubyObject {
             this.index = idx;
         }
 
+        @Override
+        public String toString() {
+            return "'" + name + "'i" + index + "t" + type + "";
+        }
+
     }
 
-    private static ColumnData[] setupColumns(
+    private ColumnData[] setupColumns(
             final Ruby runtime,
-            final DatabaseMetaData metaData,
+            final Connection connection,
             final ResultSetMetaData resultMetaData,
             final boolean downCase) throws SQLException {
 
@@ -3407,14 +3497,39 @@ public class RubyJdbcConnection extends RubyObject {
         final ColumnData[] columns = new ColumnData[columnCount];
 
         for ( int i = 1; i <= columnCount; i++ ) { // metadata is one-based
-            final String name;
-            if (downCase) {
-                name = resultMetaData.getColumnLabel(i).toLowerCase();
+            String name = resultMetaData.getColumnLabel(i);
+            if ( downCase ) {
+                name = name.toLowerCase();
             } else {
-                name = caseConvertIdentifierForRails(metaData, resultMetaData.getColumnLabel(i));
+                name = caseConvertIdentifierForRails(connection, name);
             }
+            final RubyString columnName = RubyString.newUnicodeString(runtime, name);
             final int columnType = resultMetaData.getColumnType(i);
+            columns[i - 1] = new ColumnData(columnName, columnType, i);
+        }
+
+        return columns;
+    }
+
+    @Deprecated
+    private ColumnData[] setupColumns(
+            final Ruby runtime,
+            final DatabaseMetaData metaData,
+            final ResultSetMetaData resultMetaData,
+            final boolean downCase) throws SQLException {
+
+        final int columnCount = resultMetaData.getColumnCount();
+        final ColumnData[] columns = new ColumnData[columnCount];
+
+        for ( int i = 1; i <= columnCount; i++ ) { // metadata is one-based
+            String name = resultMetaData.getColumnLabel(i);
+            if ( downCase ) {
+                name = name.toLowerCase();
+            } else {
+                name = caseConvertIdentifierForRails(metaData, name);
+            }
             final RubyString columnName = RubyString.newUnicodeString(runtime, name);
+            final int columnType = resultMetaData.getColumnType(i);
             columns[i - 1] = new ColumnData(columnName, columnType, i);
         }
 
@@ -3491,6 +3606,10 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
+    protected void warn(final ThreadContext context, final String message) {
+        callMethod(context, "warn", context.getRuntime().newString(message));
+    }
+
     private static RubyArray createCallerBacktrace(final ThreadContext context) {
         final Ruby runtime = context.getRuntime();
         runtime.incrementCallerCount();