activerecord-jdbc-adapter 50.8-java → 51.1-java

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

@@ -28,32 +28,17 @@ package arjdbc.mssql;
 import arjdbc.jdbc.Callable;
 import arjdbc.jdbc.RubyJdbcConnection;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.Date;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Savepoint;
-import java.sql.Statement;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
-import arjdbc.util.DateTimeUtils;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyString;
-import org.jruby.RubyTime;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -67,53 +52,6 @@ import org.jruby.util.ByteList;
 public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
     private static final long serialVersionUID = -745716565005219263L;
 
-    private static final int DATETIMEOFFSET_TYPE;
-    private static final Method DateTimeOffsetGetMinutesOffsetMethod;
-    private static final Method DateTimeOffsetGetTimestampMethod;
-    private static final Method DateTimeOffsetValueOfMethod;
-    private static final Method PreparedStatementSetDateTimeOffsetMethod;
-
-    private static final Map<String, Integer> MSSQL_JDBC_TYPE_FOR = new HashMap<String, Integer>(32, 1);
-    static {
-
-        Class<?> DateTimeOffset;
-        Class<?> MssqlPreparedStatement;
-        Class<?> MssqlTypes;
-        try {
-            DateTimeOffset = Class.forName("microsoft.sql.DateTimeOffset");
-            MssqlPreparedStatement = Class.forName("com.microsoft.sqlserver.jdbc.SQLServerPreparedStatement");
-            MssqlTypes = Class.forName("microsoft.sql.Types");
-        } catch (ClassNotFoundException e) {
-            System.err.println("You must require the Microsoft JDBC driver to use this gem"); // The exception doesn't bubble when ruby is initializing
-            throw new RuntimeException("You must require the Microsoft JDBC driver to use this gem");
-        }
-
-        try {
-            DATETIMEOFFSET_TYPE = MssqlTypes.getField("DATETIMEOFFSET").getInt(null);
-            DateTimeOffsetGetMinutesOffsetMethod = DateTimeOffset.getDeclaredMethod("getMinutesOffset");
-            DateTimeOffsetGetTimestampMethod = DateTimeOffset.getDeclaredMethod("getTimestamp");
-
-            Class<?>[] valueOfArgTypes = { Timestamp.class, int.class };
-            DateTimeOffsetValueOfMethod = DateTimeOffset.getDeclaredMethod("valueOf", valueOfArgTypes);
-
-            Class<?>[] setOffsetArgTypes = { int.class, DateTimeOffset };
-            PreparedStatementSetDateTimeOffsetMethod = MssqlPreparedStatement.getDeclaredMethod("setDateTimeOffset", setOffsetArgTypes);
-        } catch (Exception e) {
-            System.err.println("You must require the Microsoft JDBC driver to use this gem"); // The exception doesn't bubble when ruby is initializing
-            throw new RuntimeException("Please make sure you are using the latest version of the Microsoft JDBC driver");
-        }
-
-        MSSQL_JDBC_TYPE_FOR.put("binary_basic", Types.BINARY);
-        MSSQL_JDBC_TYPE_FOR.put("datetimeoffset", DATETIMEOFFSET_TYPE);
-        MSSQL_JDBC_TYPE_FOR.put("money", Types.DECIMAL);
-        MSSQL_JDBC_TYPE_FOR.put("smalldatetime", Types.TIMESTAMP);
-        MSSQL_JDBC_TYPE_FOR.put("smallmoney", Types.DECIMAL);
-        MSSQL_JDBC_TYPE_FOR.put("ss_timestamp", Types.BINARY);
-        MSSQL_JDBC_TYPE_FOR.put("text_basic", Types.LONGVARCHAR);
-        MSSQL_JDBC_TYPE_FOR.put("uuid", Types.CHAR);
-        MSSQL_JDBC_TYPE_FOR.put("varchar_max", Types.VARCHAR);
-    }
-
     public MSSQLRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
@@ -145,187 +83,6 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         return context.runtime.newBoolean( startsWithIgnoreCase(sqlBytes, EXEC) );
     }
 
-    // Support multiple result sets for mssql
-    @Override
-    @JRubyMethod(name = "execute", required = 1)
-    public IRubyObject execute(final ThreadContext context, final IRubyObject sql) {
-        final String query = sqlString(sql);
-        return withConnection(context, new Callable<IRubyObject>() {
-            public IRubyObject call(final Connection connection) throws SQLException {
-                Statement statement = null;
-                try {
-                    statement = createStatement(context, connection);
-
-                    // For DBs that do support multiple statements, lets return the last result set
-                    // to be consistent with AR
-                    boolean hasResultSet = doExecute(statement, query);
-                    int updateCount = statement.getUpdateCount();
-
-                    final List<IRubyObject> results = new ArrayList<IRubyObject>();
-                    ResultSet resultSet;
-
-                    while (hasResultSet || updateCount != -1) {
-
-                        if (hasResultSet) {
-                            resultSet = statement.getResultSet();
-
-                            // Unfortunately the result set gets closed when getMoreResults()
-                            // is called, so we have to process the result sets as we get them
-                            // this shouldn't be an issue in most cases since we're only getting 1 result set anyways
-                            results.add(mapExecuteResult(context, connection, resultSet));
-                        } else {
-                            results.add(context.runtime.newFixnum(updateCount));
-                        }
-
-                        // Check to see if there is another result set
-                        hasResultSet = statement.getMoreResults();
-                        updateCount = statement.getUpdateCount();
-                    }
-
-                    if (results.size() == 0) {
-                        return context.nil; // If no results, return nil
-                    } else if (results.size() == 1) {
-                        return results.get(0);
-                    } else {
-                        return context.runtime.newArray(results);
-                    }
-
-                } catch (final SQLException e) {
-                    debugErrorSQL(context, query);
-                    throw e;
-                } finally {
-                    close(statement);
-                }
-            }
-        });
-    }
-
-    /**
-     * Executes an INSERT SQL statement
-     * @param context
-     * @param sql
-     * @param pk Rails PK
-     * @return ActiveRecord::Result
-     * @throws SQLException
-     */
-    @Override
-    @JRubyMethod(name = "execute_insert_pk", required = 2)
-    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject pk) {
-
-        // MSSQL does not like composite primary keys here so chop it if there is more than one column
-        IRubyObject modifiedPk = pk;
-
-        if (pk instanceof RubyArray) {
-            RubyArray ary = (RubyArray) pk;
-            if (ary.size() > 0) {
-                modifiedPk = ary.eltInternal(0);
-            }
-        }
-
-        return super.execute_insert_pk(context, sql, modifiedPk);
-    }
-
-    /**
-     * Executes an INSERT SQL statement using a prepared statement
-     * @param context
-     * @param sql
-     * @param binds RubyArray of values to be bound to the query
-     * @param pk Rails PK
-     * @return ActiveRecord::Result
-     * @throws SQLException
-     */
-    @Override
-    @JRubyMethod(name = "execute_insert_pk", required = 3)
-    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject binds,
-                                         final IRubyObject pk) {
-        // MSSQL does not like composite primary keys here so chop it if there is more than one column
-        IRubyObject modifiedPk = pk;
-
-        if (pk instanceof RubyArray) {
-            RubyArray ary = (RubyArray) pk;
-            if (ary.size() > 0) {
-                modifiedPk = ary.eltInternal(0);
-            }
-        }
-
-        return super.execute_insert_pk(context, sql, binds, modifiedPk);
-    }
-
-    @Override
-    protected Integer jdbcTypeFor(final String type) {
-
-        Integer typeValue = MSSQL_JDBC_TYPE_FOR.get(type);
-
-        if ( typeValue != null ) {
-            return typeValue;
-        }
-
-        return super.jdbcTypeFor(type);
-    }
-
-    // Datetimeoffset values also make it into here
-    @Override
-    protected void setStringParameter(final ThreadContext context, final Connection connection,
-            final PreparedStatement statement, final int index, final IRubyObject value,
-            final IRubyObject attribute, final int type) throws SQLException {
-
-        // datetimeoffset values also make it in here
-        if (type == DATETIMEOFFSET_TYPE) {
-
-            Object dto = convertToDateTimeOffset(context, value);
-
-            try {
-
-                Object[] setStatementArgs = { index, dto };
-                PreparedStatementSetDateTimeOffsetMethod.invoke(statement, setStatementArgs);
-
-            } catch (IllegalAccessException e) {
-                debugMessage(context.runtime, e.getMessage());
-                throw new RuntimeException("Please make sure you are using the latest version of the Microsoft JDBC driver");
-            } catch (InvocationTargetException e) {
-                debugMessage(context.runtime, e.getMessage());
-                throw new RuntimeException("Please make sure you are using the latest version of the Microsoft JDBC driver");
-            }
-
-            return;
-        }
-        super.setStringParameter(context, connection, statement, index, value, attribute, type);
-    }
-
-    // We need higher precision than the default for Time objects (which is milliseconds) so we use a DateTimeOffset object
-    @Override
-    protected void setTimeParameter(final ThreadContext context,
-        final Connection connection, final PreparedStatement statement,
-        final int index, IRubyObject value,
-        final IRubyObject attribute, final int type) throws SQLException {
-
-        statement.setObject(index, convertToDateTimeOffset(context, value), Types.TIME);
-
-    }
-
-    private Object convertToDateTimeOffset(final ThreadContext context, final IRubyObject value) {
-
-        RubyTime time = (RubyTime) value;
-        DateTime dt = time.getDateTime();
-        Timestamp timestamp = new Timestamp(dt.getMillis());
-        timestamp.setNanos(timestamp.getNanos() + (int) time.getNSec());
-        int offsetMinutes = dt.getZone().getOffset(dt.getMillis()) / 60000;
-
-        try {
-
-            Object[] dtoArgs = { timestamp, offsetMinutes };
-            return DateTimeOffsetValueOfMethod.invoke(null, dtoArgs);
-
-        } catch (IllegalAccessException e) {
-            debugMessage(context.runtime, e.getMessage());
-            throw new RuntimeException("Please make sure you are using the latest version of the Microsoft JDBC driver");
-        } catch (InvocationTargetException e) {
-            debugMessage(context.runtime, e.getMessage());
-            throw new RuntimeException("Please make sure you are using the latest version of the Microsoft JDBC driver");
-        }
-    }
-
-
     @Override
     protected RubyArray mapTables(final ThreadContext context, final Connection connection,
             final String catalog, final String schemaPattern, final String tablePattern,
@@ -367,79 +124,16 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
 
     /**
      * Treat LONGVARCHAR as CLOB on MSSQL for purposes of converting a JDBC value to Ruby.
-     * Also handle datetimeoffset values here
      */
     @Override
     protected IRubyObject jdbcToRuby(
         final ThreadContext context, final Ruby runtime,
         final int column, int type, final ResultSet resultSet)
         throws SQLException {
-
-        if (type == DATETIMEOFFSET_TYPE) {
-
-            Object dto = resultSet.getObject(column); // Returns a microsoft.sql.DateTimeOffset
-
-            if (dto == null) return context.nil;
-
-            try {
-
-                int minutes = (int) DateTimeOffsetGetMinutesOffsetMethod.invoke(dto);
-                DateTimeZone zone = DateTimeZone.forOffsetHoursMinutes(minutes / 60, minutes % 60);
-                Timestamp ts = (Timestamp) DateTimeOffsetGetTimestampMethod.invoke(dto);
-
-                int nanos = ts.getNanos(); // max 999-999-999
-                nanos = nanos % 1000000;
-
-                // We have to do this differently than the newTime helper because the Timestamp loses its zone information when passed around
-                DateTime dateTime = new DateTime(ts.getTime(), zone);
-                return RubyTime.newTime(context.runtime, dateTime, nanos);
-
-            } catch (IllegalAccessException e) {
-                debugMessage(runtime, e.getMessage());
-                return context.nil;
-            } catch (InvocationTargetException e) {
-                debugMessage(runtime, e.getMessage());
-                return context.nil;
-            }
-        }
-
-        if (type == Types.LONGVARCHAR || type == Types.LONGNVARCHAR) type = Types.CLOB;
+        if ( type == Types.LONGVARCHAR || type == Types.LONGNVARCHAR ) type = Types.CLOB;
         return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
 
-    /**
-     * Converts a JDBC date object to a Ruby date by referencing Date#civil
-     * @param context current thread context
-     * @param resultSet the jdbc result set to pull the value from
-     * @param index the index of the column to convert
-     * @return RubyNil if NULL or RubyDate if there is a value
-     * @throws SQLException if it fails to retrieve the value from the result set
-     */
-    @Override
-    protected IRubyObject dateToRuby(ThreadContext context, Ruby runtime, ResultSet resultSet, int index) throws SQLException {
-
-        final Date value = resultSet.getDate(index);
-
-        if (value == null) return context.nil;
-
-        return DateTimeUtils.newDate(context, value);
-    }
-
-    /**
-     * Converts a JDBC time to a Ruby time. We use timestamp because java.sql.Time doesn't support sub-millisecond values
-     * @param context current thread context
-     * @param resultSet the jdbc result set to pull the value from
-     * @param index the index of the column to convert
-     * @return RubyNil if NULL or RubyTime if there is a value
-     * @throws SQLException if it fails to retrieve the value from the result set
-     */
-    @Override
-    protected IRubyObject timeToRuby(final ThreadContext context,final Ruby runtime,
-            final ResultSet resultSet, final int column) throws SQLException {
-
-        return timestampToRuby(context, runtime, resultSet, column);
-    }
-
     @Override
     protected ColumnData[] extractColumns(final ThreadContext context,
         final Connection connection, final ResultSet resultSet,
@@ -469,9 +163,19 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         return columns;
     }
 
-    @Override
-    protected void releaseSavepoint(final Connection connection, final Savepoint savepoint) throws SQLException {
-        // MSSQL doesn't support releasing savepoints
+    // internal helper not meant as a "public" API - used in one place thus every
+    @JRubyMethod(name = "jtds_driver?")
+    public RubyBoolean jtds_driver_p(final ThreadContext context) throws SQLException {
+        // "jTDS Type 4 JDBC Driver for MS SQL Server and Sybase"
+        // SQLJDBC: "Microsoft JDBC Driver 4.0 for SQL Server"
+        return withConnection(context, new Callable<RubyBoolean>() {
+            // NOTE: only used in one place for now (on release_savepoint) ...
+            // might get optimized to only happen once since driver won't change
+            public RubyBoolean call(final Connection connection) throws SQLException {
+                final String driver = connection.getMetaData().getDriverName();
+                return context.getRuntime().newBoolean( driver.indexOf("jTDS") >= 0 );
+            }
+        });
     }
 
 }

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -107,8 +107,8 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             final int minor = jdbcDriver.getMinorVersion();
             if ( major < 5 ) {
                 final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
-                throw context.runtime.newRaiseException(errorClass,
-                    "MySQL adapter requires driver >= 5.0 got: " + major + "." + minor + "");
+                throw new RaiseException(context.runtime, errorClass,
+                    "MySQL adapter requires driver >= 5.0 got: " + major + "." + minor + "", false);
             }
             if ( major == 5 && minor < 1 ) { // need 5.1 for JDBC 4.0
                 // lightweight validation query: "/* ping */ SELECT 1"

data/src/java/arjdbc/postgresql/ByteaUtils.java

@@ -88,6 +88,7 @@ abstract class ByteaUtils {
                     }
                     else {
                         correctSize -= 3;
+                        i += 2;
                     }
                 }
             }

data/src/java/arjdbc/postgresql/PgResultSetMetaDataWrapper.java

@@ -0,0 +1,23 @@
+/*
+ * A class to loosen restrictions on the PgResultSetMetaData class,
+ * we need to be able to get the field and the method is currently set to "package".
+ */
+package org.postgresql.jdbc;
+
+import java.sql.SQLException;
+import org.postgresql.core.BaseConnection;
+import org.postgresql.core.Field;
+import org.postgresql.jdbc.PgResultSetMetaData;
+
+public class PgResultSetMetaDataWrapper {
+
+    private final PgResultSetMetaData metaData;
+
+    public PgResultSetMetaDataWrapper(PgResultSetMetaData metaData) {
+        this.metaData = metaData;
+    }
+
+    public Field getField(int i) throws SQLException {
+        return this.metaData.getField(i);
+    }
+}

data/src/java/arjdbc/postgresql/PostgreSQLResult.java

@@ -4,7 +4,6 @@ import arjdbc.jdbc.JdbcResult;
 import arjdbc.jdbc.RubyJdbcConnection;
 
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 
@@ -12,6 +11,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
+import org.jruby.RubyMethod;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
@@ -21,13 +21,17 @@ import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import org.postgresql.core.Field;
+import org.postgresql.jdbc.PgResultSetMetaData;
+import org.postgresql.jdbc.PgResultSetMetaDataWrapper; // This is a hack unfortunately to get around method scoping
+
 /*
  * This class mimics the PG:Result class enough to get by
  */
 public class PostgreSQLResult extends JdbcResult {
 
     // These are needed when generating an AR::Result
-    private final ResultSetMetaData resultSetMetaData;
+    private final PgResultSetMetaData resultSetMetaData;
 
     /********* JRuby compat methods ***********/
 
@@ -57,7 +61,7 @@ public class PostgreSQLResult extends JdbcResult {
                              ResultSet resultSet) throws SQLException {
         super(context, clazz, connection, resultSet);
 
-        resultSetMetaData = resultSet.getMetaData();
+        resultSetMetaData = (PgResultSetMetaData) resultSet.getMetaData();
     }
 
     /**
@@ -70,28 +74,16 @@ public class PostgreSQLResult extends JdbcResult {
     protected IRubyObject columnTypeMap(final ThreadContext context) throws SQLException {
         Ruby runtime = context.runtime;
         RubyHash types = RubyHash.newHash(runtime);
+        PgResultSetMetaDataWrapper mdWrapper = new PgResultSetMetaDataWrapper(resultSetMetaData);
         int columnCount = columnNames.length;
 
         IRubyObject adapter = connection.adapter(context);
         for (int i = 0; i < columnCount; i++) {
-            int col = i + 1;
-            String typeName = resultSetMetaData.getColumnTypeName(col);
-
-            int mod = 0;
-            if  ("numeric".equals(typeName)) {
-                // this field is only relevant for "numeric" type in AR
-                // AR checks (fmod - 4 & 0xffff).zero?
-                // pgjdbc:
-                //  - for typmod == -1, getScale() and getPrecision() return 0
-                //  - for typmod != -1, getScale() returns "(typmod - 4) & 0xFFFF;"
-                mod = resultSetMetaData.getScale(col);
-                mod = mod == 0 && resultSetMetaData.getPrecision(col) == 0 ? -1 : mod + 4;
-            }
-
+            final Field field = mdWrapper.getField(i + 1);
             final RubyString name = columnNames[i];
             final IRubyObject type = Helpers.invoke(context, adapter, "get_oid_type",
-                    runtime.newString(typeName),
-                    runtime.newFixnum(mod),
+                    runtime.newFixnum(field.getOID()),
+                    runtime.newFixnum(field.getMod()),
                     name);
 
             if (!type.isNil()) types.fastASet(name, type);
@@ -152,7 +144,7 @@ public class PostgreSQLResult extends JdbcResult {
      * @return ActiveRecord::Result object with the data from this result set
      * @throws SQLException can be caused by postgres generating its type map
      */
-    @Override @SuppressWarnings("unchecked")
+    @Override
     public IRubyObject toARResult(final ThreadContext context) throws SQLException {
         RubyClass BinaryDataClass = null;
         int rowCount = 0;
@@ -171,7 +163,7 @@ public class PostgreSQLResult extends JdbcResult {
                     RubyArray row = (RubyArray) values.eltInternal(rowIndex);
                     IRubyObject value = row.eltInternal(columnIndex);
                     if (value != context.nil) {
-                        row.eltInternalSet(columnIndex, BinaryDataClass.newInstance(context, value, Block.NULL_BLOCK));
+                        row.eltInternalSet(columnIndex, (IRubyObject) BinaryDataClass.newInstance(context, value, Block.NULL_BLOCK));
                     }
                 }
             }