activerecord-jdbc-adapter 1.3.17 → 1.3.18

data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java

@@ -59,13 +59,13 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
 
     public static RubyClass createMSSQLJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
         final RubyClass clazz = getConnectionAdapters(runtime). // ActiveRecord::ConnectionAdapters
-            defineClassUnder("MSSQLJdbcConnection", jdbcConnection, MSSQL_JDBCCONNECTION_ALLOCATOR);
+            defineClassUnder("MSSQLJdbcConnection", jdbcConnection, ALLOCATOR);
         clazz.defineAnnotatedMethods(MSSQLRubyJdbcConnection.class);
         getConnectionAdapters(runtime).setConstant("MssqlJdbcConnection", clazz); // backwards-compat
         return clazz;
     }
 
-    private static ObjectAllocator MSSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
             return new MSSQLRubyJdbcConnection(runtime, klass);
         }
@@ -111,6 +111,17 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         return tables;
     }
 
+    @Override
+    protected RubyArray mapColumnsResult(final ThreadContext context,
+        final DatabaseMetaData metaData, final TableName components, final ResultSet results)
+        throws SQLException {
+
+        final RubyClass Column = getJdbcColumnClass(context);
+        final boolean lookupCastType = Column.isMethodBound("cast_type", false);
+        // NOTE: MSSQL depends on Column#primary? no matter the AR version - thus always set @primary
+        return mapColumnsResult(context, metaData, components, results, Column, lookupCastType, true);
+    }
+
     /**
      * Microsoft SQL 2000+ support schemas
      */

data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java

@@ -23,6 +23,12 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
+// NOTE: file contains code adapted from **oracle-enhanced** adapter, license follows
+/*
+Copyright (c) 2008-2011 Graham Jenkins, Michael Schoen, Raimonds Simanovskis
+
+... LICENSING TERMS ARE THE VERY SAME AS ACTIVERECORD-JDBC-ADAPTER'S ABOVE ...
+*/
 package arjdbc.oracle;
 
 import arjdbc.jdbc.Callable;
@@ -37,11 +43,12 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
+import java.sql.ResultSetMetaData;
 import java.sql.Statement;
 import java.sql.Types;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
@@ -77,37 +84,35 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
     };
 
     @JRubyMethod(name = "next_sequence_value", required = 1)
-    public IRubyObject next_sequence_value(final ThreadContext context,
-        final IRubyObject sequence) throws SQLException {
+    public IRubyObject next_sequence_value(final ThreadContext context, final IRubyObject sequence) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
-                Statement statement = null; ResultSet valSet = null;
+                Statement statement = null; ResultSet value = null;
                 try {
                     statement = connection.createStatement();
-                    valSet = statement.executeQuery("SELECT "+ sequence +".NEXTVAL id FROM dual");
-                    if ( ! valSet.next() ) return context.getRuntime().getNil();
-                    return context.getRuntime().newFixnum( valSet.getLong(1) );
+                    value = statement.executeQuery("SELECT "+ sequence +".NEXTVAL id FROM dual");
+                    if ( ! value.next() ) return context.getRuntime().getNil();
+                    return context.getRuntime().newFixnum( value.getLong(1) );
                 }
                 catch (final SQLException e) {
                     debugMessage(context, "failed to get " + sequence + ".NEXTVAL : " + e.getMessage());
                     throw e;
                 }
-                finally { close(valSet); close(statement); }
+                finally { close(value); close(statement); }
             }
         });
     }
 
     @JRubyMethod(name = "execute_insert_returning", required = 2)
     public IRubyObject execute_insert_returning(final ThreadContext context,
-        final IRubyObject sql, final IRubyObject binds) throws SQLException {
+        final IRubyObject sql, final IRubyObject binds) {
         final String query = sql.convertToString().getUnicodeValue();
         final int outType = Types.VARCHAR;
         if ( binds == null || binds.isNil() ) { // no prepared statements
             return executePreparedCall(context, query, Collections.EMPTY_LIST, outType);
         }
-        else { // allow prepared statements with empty binds parameters
-            return executePreparedCall(context, query, (List) binds, outType);
-        }
+        // allow prepared statements with empty binds parameters
+        return executePreparedCall(context, query, (List) binds, outType);
     }
 
     private IRubyObject executePreparedCall(final ThreadContext context, final String query,
@@ -258,15 +263,54 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
     protected RubyArray mapTables(final Ruby runtime, final DatabaseMetaData metaData,
             final String catalog, final String schemaPattern, final String tablePattern,
             final ResultSet tablesSet) throws SQLException {
-        final List<IRubyObject> tables = new ArrayList<IRubyObject>(32);
+        final RubyArray tables = RubyArray.newArray(runtime, 32);
         while ( tablesSet.next() ) {
             String name = tablesSet.getString(TABLES_TABLE_NAME);
             name = caseConvertIdentifierForRails(metaData, name);
             // Handle stupid Oracle 10g RecycleBin feature
             if ( name.startsWith("bin$") ) continue;
-            tables.add(RubyString.newUnicodeString(runtime, name));
+            tables.append(RubyString.newUnicodeString(runtime, name));
+        }
+        return tables;
+    }
+
+    @Override
+    protected ColumnData[] extractColumns(final Ruby runtime,
+        final Connection connection, final ResultSet resultSet,
+        final boolean downCase) throws SQLException {
+
+        final ResultSetMetaData resultMetaData = resultSet.getMetaData();
+
+        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(connection, name);
+            }
+            final RubyString columnName = RubyString.newUnicodeString(runtime, name);
+
+            int columnType = resultMetaData.getColumnType(i);
+            if (columnType == Types.NUMERIC) {
+                // avoid extracting all NUMBER columns as BigDecimal :
+                if (resultMetaData.getScale(i) == 0) {
+                    final int prec = resultMetaData.getPrecision(i);
+                    if ( prec < 10 ) { // fits into int
+                        columnType = Types.INTEGER;
+                    }
+                    else if ( prec < 19 ) { // fits into long
+                        columnType = Types.BIGINT;
+                    }
+                }
+            }
+
+            columns[i - 1] = new ColumnData(columnName, columnType, i);
         }
-        return runtime.newArray(tables);
+
+        return columns;
     }
 
     // storesMixedCaseIdentifiers() return false;
@@ -285,4 +329,137 @@ public class OracleRubyJdbcConnection extends RubyJdbcConnection {
         return value == null ? null : value.toUpperCase();
     }
 
+    // based on OracleEnhanced's Ruby connection.describe
+    @JRubyMethod(name = "describe", required = 1)
+    public IRubyObject describe(final ThreadContext context, final IRubyObject name) {
+        final RubyArray desc = describe(context, name.toString(), null);
+        return desc == null ? context.nil : desc; // TODO raise instead of nil
+    }
+
+    @JRubyMethod(name = "describe", required = 2)
+    public IRubyObject describe(final ThreadContext context, final IRubyObject name, final IRubyObject owner) {
+        final RubyArray desc = describe(context, name.toString(), owner.isNil() ? null : owner.toString());
+        return desc == null ? context.nil : desc; // TODO raise instead of nil
+    }
+
+    private RubyArray describe(final ThreadContext context, final String name, final String owner) {
+        final String dbLink; String defaultOwner, theName = name; int delim;
+        if ( ( delim = theName.indexOf('@') ) > 0 ) {
+            dbLink = theName.substring(delim).toUpperCase(); // '@DBLINK'
+            theName = theName.substring(0, delim);
+            defaultOwner = null; // will SELECT username FROM all_dbLinks ...
+        }
+        else {
+            dbLink = ""; defaultOwner = owner; // config[:username] || meta_data.user_name
+        }
+
+        theName = isValidTableName(theName) ? theName.toUpperCase() : unquoteTableName(theName);
+
+        final String tableName; final String tableOwner;
+        if ( ( delim = theName.indexOf('.') ) > 0 ) {
+            tableOwner = theName.substring(0, delim);
+            tableName = theName.substring(delim + 1);
+        }
+        else {
+            tableName = theName;
+            tableOwner = (defaultOwner == null && dbLink.length() > 0) ? selectOwner(context, dbLink) : defaultOwner;
+        }
+
+        return withConnection(context, new Callable<RubyArray>() {
+            public RubyArray call(final Connection connection) throws SQLException {
+                String owner = tableOwner == null ? connection.getMetaData().getUserName() : tableOwner;
+                final String sql =
+                "SELECT owner, table_name, 'TABLE' name_type" +
+                " FROM all_tables" + dbLink +
+                " WHERE owner = '" + owner + "' AND table_name = '" + tableName + "'" +
+                " UNION ALL " +
+                "SELECT owner, view_name table_name, 'VIEW' name_type" +
+                " FROM all_views" + dbLink +
+                " WHERE owner = '" + owner + "' AND view_name = '" + tableName + "'" +
+                " UNION ALL " +
+                "SELECT table_owner, DECODE(db_link, NULL, table_name, table_name||'@'||db_link), 'SYNONYM' name_type" +
+                " FROM all_synonyms" + dbLink +
+                " WHERE owner = '" + owner + "' AND synonym_name = '" + tableName + "'" +
+                " UNION ALL " +
+                "SELECT table_owner, DECODE(db_link, NULL, table_name, table_name||'@'||db_link), 'SYNONYM' name_type" +
+                " FROM all_synonyms" + dbLink +
+                " WHERE owner = 'PUBLIC' AND synonym_name = '" + tableName + "'" ;
+
+                Statement statement = null; ResultSet result = null;
+                try {
+                    statement = connection.createStatement();
+                    result = statement.executeQuery(sql);
+
+                    if ( ! result.next() ) return null; // NOTE: should raise
+
+                    owner = result.getString("owner");
+                    final String table_name = result.getString("table_name");
+                    final String name_type = result.getString("name_type");
+
+                    if ( "SYNONYM".equals(name_type) ) {
+                        final StringBuilder name = new StringBuilder();
+                        if ( owner != null && owner.length() > 0 ) {
+                            name.append(owner).append('.');
+                        }
+                        name.append(table_name);
+                        if ( dbLink != null ) name.append(dbLink);
+                        return describe(context, name.toString(), owner);
+                    }
+
+                    final RubyArray arr = RubyArray.newArray(context.runtime, 3);
+                    arr.append( context.runtime.newString(owner) );
+                    arr.append( context.runtime.newString(table_name) );
+                    if ( dbLink != null ) arr.append( context.runtime.newString(dbLink) );
+                    return arr;
+                }
+                catch (final SQLException e) {
+                    debugMessage(context, "failed to describe '" + name + "' : " + e.getMessage());
+                    throw e;
+                }
+                finally { close(result); close(statement); }
+            }
+        });
+    }
+
+    private String selectOwner(final ThreadContext context, final String dbLink) {
+        return withConnection(context, new Callable<String>() {
+            public String call(final Connection connection) throws SQLException {
+                Statement statement = null; ResultSet result = null;
+                final String sql = "SELECT username FROM all_db_links WHERE db_link = '" + dbLink + "'";
+                try {
+                    statement = connection.createStatement();
+                    result = statement.executeQuery(sql);
+                    // if ( ! result.next() ) return null;
+                    return result.getString(1);
+                }
+                catch (final SQLException e) {
+                    debugMessage(context, "\"" + sql + "\" failed : " + e.getMessage());
+                    throw e;
+                }
+                finally { close(result); close(statement); }
+            }
+        });
+    }
+
+    private static final Pattern VALID_TABLE_NAME;
+    static {
+        final String NONQUOTED_OBJECT_NAME = "[A-Za-z][A-z0-9$#]{0,29}";
+        final String NONQUOTED_DATABASE_LINK = "[A-Za-z][A-z0-9$#\\.@]{0,127}";
+        VALID_TABLE_NAME = Pattern.compile(
+        "\\A(?:" + NONQUOTED_OBJECT_NAME + "\\.)?" + NONQUOTED_OBJECT_NAME + "(?:@" + NONQUOTED_DATABASE_LINK + ")?\\Z");
+    }
+
+    private static boolean isValidTableName(final String name) {
+        return VALID_TABLE_NAME.matcher(name).matches();
+    }
+
+    private static String unquoteTableName(String name) {
+        name = name.trim();
+        final int len = name.length();
+        if (len > 0 && name.charAt(0) == '"' && name.charAt(len - 1) == '"') {
+            return name.substring(1, len - 1);
+        }
+        return name;
+    }
+
 }

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -327,7 +327,9 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             if ( rubyValue.isNil() ) {
                 statement.setNull(index, Types.OTHER); return;
             }
-            value = column.getMetaClass().callMethod(context, "json_to_string", rubyValue);
+            if (!isAr42(column)) { // Value has already been cast for AR42
+                value = column.getMetaClass().callMethod(context, "json_to_string", rubyValue);
+            }
         }
         else if ( value == null ) {
             statement.setNull(index, Types.OTHER); return;
@@ -369,7 +371,9 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             if ( rubyValue.isNil() ) {
                 statement.setNull(index, Types.OTHER); return;
             }
-            value = column.getMetaClass().callMethod(context, "cidr_to_string", rubyValue);
+            if (!isAr42(column)) { // Value has already been cast for AR42
+                value = column.getMetaClass().callMethod(context, "cidr_to_string", rubyValue);
+            }
         }
         else if ( value == null ) {
             statement.setNull(index, Types.OTHER); return;
@@ -494,6 +498,10 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         if ( rawDateTime != null && rawDateTime.booleanValue() ) return strValue;
 
         final IRubyObject adapter = callMethod(context, "adapter"); // self.adapter
+        if ( usesType(runtime) ) {
+            return typeCastFromDatabase(context, adapter, runtime.newSymbol("timestamp"), strValue);
+        }
+
         if ( adapter.isNil() ) return strValue; // NOTE: we warn on init_connection
         return adapter.callMethod(context, "_string_to_timestamp", strValue);
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.18
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,7 +75,9 @@ files:
 - lib/arel/visitors/firebird.rb
 - lib/arel/visitors/h2.rb
 - lib/arel/visitors/hsqldb.rb
+- lib/arel/visitors/postgresql_jdbc.rb
 - lib/arel/visitors/sql_server.rb
+- lib/arel/visitors/sql_server/ng42.rb
 - lib/arjdbc.rb
 - lib/arjdbc/db2.rb
 - lib/arjdbc/db2/adapter.rb
@@ -131,6 +133,7 @@ files:
 - lib/arjdbc/mssql/explain_support.rb
 - lib/arjdbc/mssql/limit_helpers.rb
 - lib/arjdbc/mssql/lock_methods.rb
+- lib/arjdbc/mssql/types.rb
 - lib/arjdbc/mssql/utils.rb
 - lib/arjdbc/mysql.rb
 - lib/arjdbc/mysql/adapter.rb
@@ -144,6 +147,7 @@ files:
 - lib/arjdbc/oracle/column.rb
 - lib/arjdbc/oracle/connection_methods.rb
 - lib/arjdbc/postgresql.rb
+- lib/arjdbc/postgresql/_bc_time_cast_patch.rb
 - lib/arjdbc/postgresql/adapter.rb
 - lib/arjdbc/postgresql/base/array_parser.rb
 - lib/arjdbc/postgresql/base/oid.rb
@@ -152,6 +156,7 @@ files:
 - lib/arjdbc/postgresql/column.rb
 - lib/arjdbc/postgresql/connection_methods.rb
 - lib/arjdbc/postgresql/explain_support.rb
+- lib/arjdbc/postgresql/oid/bytea.rb
 - lib/arjdbc/postgresql/oid_types.rb
 - lib/arjdbc/postgresql/schema_creation.rb
 - lib/arjdbc/railtie.rb
@@ -198,6 +203,7 @@ files:
 - src/java/arjdbc/db2/DB2RubyJdbcConnection.java
 - src/java/arjdbc/derby/DerbyModule.java
 - src/java/arjdbc/derby/DerbyRubyJdbcConnection.java
+- src/java/arjdbc/firebird/FirebirdRubyJdbcConnection.java
 - src/java/arjdbc/h2/H2Module.java
 - src/java/arjdbc/h2/H2RubyJdbcConnection.java
 - src/java/arjdbc/hsqldb/HSQLDBModule.java
@@ -246,9 +252,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 test_files: []
-has_rdoc: