activerecord-jdbc-alt-adapter 50.7.0-java → 51.3.0-java

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

@@ -487,7 +487,7 @@ public class RubyJdbcConnection extends RubyObject {
                 savepoint = ((IRubyObject) savepoint).toJava(Savepoint.class);
             }
 
-            releaseSavepoint(connection, (Savepoint) savepoint);
+            connection.releaseSavepoint((Savepoint) savepoint);
             return context.nil;
         }
         catch (SQLException e) {
@@ -495,11 +495,6 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    // MSSQL doesn't support releasing savepoints so we make it possible to override the actual release action
-    protected void releaseSavepoint(final Connection connection, final Savepoint savepoint) throws SQLException {
-        connection.releaseSavepoint(savepoint);
-    }
-
     protected static RuntimeException newSavepointNotSetError(final ThreadContext context, final IRubyObject name, final String op) {
         RubyClass StatementInvalid = ActiveRecord(context).getClass("StatementInvalid");
         return context.runtime.newRaiseException(StatementInvalid, "could not " + op + " savepoint: '" + name + "' (not set)");
@@ -727,10 +722,7 @@ public class RubyJdbcConnection extends RubyObject {
 
     private void connectImpl(final boolean forceConnection) throws SQLException {
         setConnection( forceConnection ? newConnection() : null );
-        if (forceConnection) {
-            if (getConnectionImpl() == null) throw new SQLException("Didn't get a connection. Wrong URL?");
-            configureConnection();
-        }
+        if ( forceConnection ) configureConnection();
     }
 
     @JRubyMethod(name = "read_only?")
@@ -888,31 +880,15 @@ public class RubyJdbcConnection extends RubyObject {
         return mapQueryResult(context, connection, resultSet);
     }
 
-    private static String[] createStatementPk(IRubyObject pk) {
-        String[] statementPk;
-        if (pk instanceof RubyArray) {
-            RubyArray ary = (RubyArray) pk;
-            int size = ary.size();
-            statementPk = new String[size];
-            for (int i = 0; i < size; i++) {
-                statementPk[i] = sqlString(ary.eltInternal(i));
-            }
-        } else {
-            statementPk = new String[] { sqlString(pk) };
-        }
-        return statementPk;
-    }
-
     /**
      * Executes an INSERT SQL statement
      * @param context
      * @param sql
-     * @param pk Rails PK
      * @return ActiveRecord::Result
      * @throws SQLException
      */
-    @JRubyMethod(name = "execute_insert_pk", required = 2)
-    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject pk) {
+    @JRubyMethod(name = "execute_insert", required = 1)
+    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 Statement statement = null;
@@ -920,13 +896,7 @@ public class RubyJdbcConnection extends RubyObject {
                 try {
 
                     statement = createStatement(context, connection);
-
-                    if (pk == context.nil || pk == context.fals || !supportsGeneratedKeys(connection)) {
-                        statement.executeUpdate(query, Statement.RETURN_GENERATED_KEYS);
-                    } else {
-                        statement.executeUpdate(query, createStatementPk(pk));
-                    }
-
+                    statement.executeUpdate(query, Statement.RETURN_GENERATED_KEYS);
                     return mapGeneratedKeys(context, connection, statement);
 
                 } catch (final SQLException e) {
@@ -939,35 +909,23 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    @Deprecated
-    @JRubyMethod(name = "execute_insert", required = 1)
-    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql) {
-        return execute_insert_pk(context, sql, context.nil);
-    }
-
     /**
      * 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
      */
-    @JRubyMethod(name = "execute_insert_pk", required = 3)
-    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject binds,
-                                         final IRubyObject pk) {
+    @JRubyMethod(name = "execute_insert", required = 2)
+    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql, final IRubyObject binds) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 PreparedStatement statement = null;
                 final String query = sqlString(sql);
                 try {
-                    if (pk == context.nil || pk == context.fals || !supportsGeneratedKeys(connection)) {
-                        statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
-                    } else {
-                        statement = connection.prepareStatement(query, createStatementPk(pk));
-                    }
 
+                    statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
                     setStatementParameters(context, connection, statement, (RubyArray) binds);
                     statement.executeUpdate();
                     return mapGeneratedKeys(context, connection, statement);
@@ -982,12 +940,6 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    @Deprecated
-    @JRubyMethod(name = "execute_insert", required = 2)
-    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject binds, final IRubyObject sql) {
-        return execute_insert_pk(context, sql, binds, context.nil);
-    }
-
     /**
      * Executes an UPDATE (DELETE) SQL statement
      * @param context
@@ -2742,18 +2694,22 @@ public class RubyJdbcConnection extends RubyObject {
 
         final IRubyObject value = value_site.call(context, attribute, attribute);
 
-        if ( value instanceof RubyInteger ) {
+        if (value instanceof RubyInteger) {
             return "integer";
         }
 
-        if ( value instanceof RubyNumeric ) {
+        if (value instanceof RubyNumeric) {
             return "float";
         }
 
-        if ( value instanceof RubyTime ) {
+        if (value instanceof RubyTime) {
             return "timestamp";
         }
 
+        if (value instanceof RubyBoolean) {
+            return "boolean";
+        }
+
         return "string";
     }
 
@@ -2943,9 +2899,8 @@ public class RubyJdbcConnection extends RubyObject {
             value = value.callMethod(context, "to_date");
         }
 
-        // NOTE: Here we rely in ActiveRecord (ActiveSupport) to get
-        // the date as a string in the database format.
-        statement.setDate(index, Date.valueOf(value.callMethod(context, "to_s", context.runtime.newSymbol("db")).toString()));
+        // NOTE: assuming Date#to_s does right ...
+        statement.setDate(index, Date.valueOf(value.toString()));
     }
 
     protected void setBooleanParameter(final ThreadContext context,
@@ -3972,12 +3927,6 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    public static void debugMessage(final ThreadContext context, final IRubyObject obj) {
-        if ( isDebug(context.runtime) ) {
-            debugMessage(context.runtime, obj.callMethod(context, "inspect"));
-        }
-    }
-
     public static void debugMessage(final Ruby runtime, final String msg, final Object e) {
         if ( isDebug(runtime) ) {
             final PrintStream out = runtime != null ? runtime.getOut() : System.out;

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

@@ -29,33 +29,22 @@ import arjdbc.jdbc.Callable;
 import arjdbc.jdbc.RubyJdbcConnection;
 import arjdbc.util.DateTimeUtils;
 
-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.sql.Timestamp;
 import java.util.Locale;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
-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.RubySymbol;
-import org.jruby.RubyTime;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -69,54 +58,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("image", 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);
     }
@@ -148,176 +89,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);
-    }
-
-    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,
@@ -534,6 +305,29 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         statement.setObject(index, timeStr, Types.NVARCHAR);
     }
 
+    // Overrides the method in parent, we only remove the savepoint
+    // from the getSavepoints Map
+    @JRubyMethod(name = "release_savepoint", required = 1)
+    public IRubyObject release_savepoint(final ThreadContext context, final IRubyObject name) {
+      if (name == context.nil) throw context.runtime.newArgumentError("nil savepoint name given");
+
+      final Connection connection = getConnection(true);
+
+      Object savepoint = getSavepoints(context).remove(name);
+
+      if (savepoint == null) throw newSavepointNotSetError(context, name, "release");
+
+      // NOTE: RubyHash.remove does not convert to Java as get does :
+      if (!(savepoint instanceof Savepoint)) {
+        savepoint = ((IRubyObject) savepoint).toJava(Savepoint.class);
+      }
+
+      // The 'releaseSavepoint' method is not currently supported
+      // by the Microsoft SQL Server JDBC Driver
+      // connection.releaseSavepoint((Savepoint) savepoint);
+      return context.nil;
+    }
+
     //----------------------------------------------------------------
     // read_uncommitted: "READ UNCOMMITTED",
     // read_committed:   "READ COMMITTED",
@@ -659,64 +453,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);
-    }
-
     @Override
     protected ColumnData[] extractColumns(final ThreadContext context,
         final Connection connection, final ResultSet resultSet,
@@ -746,9 +492,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/postgresql/ByteaUtils.java

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

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

@@ -27,6 +27,7 @@ package arjdbc.postgresql;
 
 import arjdbc.jdbc.Callable;
 import arjdbc.jdbc.DriverWrapper;
+import arjdbc.postgresql.PostgreSQLResult;
 import arjdbc.util.DateTimeUtils;
 import arjdbc.util.StringHelper;
 
@@ -366,9 +367,8 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             value = value.callMethod(context, "to_date");
         }
 
-        // NOTE: Here we rely in ActiveRecord (ActiveSupport) to get
-        // the date as a string in the database format.
-        statement.setDate(index, Date.valueOf(value.callMethod(context, "to_s", context.runtime.newSymbol("db")).toString()));
+        // NOTE: assuming Date#to_s does right ...
+        statement.setDate(index, Date.valueOf(value.toString()));
     }
 
     @Override

data/src/java/arjdbc/util/DateTimeUtils.java

@@ -31,7 +31,6 @@ import java.util.TimeZone;
 import org.joda.time.Chronology;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.joda.time.chrono.GJChronology;
 import org.joda.time.chrono.ISOChronology;
 import org.jruby.Ruby;
 import org.jruby.RubyFloat;
@@ -51,9 +50,6 @@ import static arjdbc.util.StringHelper.decByte;
  * @author kares
  */
 public abstract class DateTimeUtils {
-
-    private static final GJChronology CHRONO_ITALY_UTC = GJChronology.getInstance(DateTimeZone.UTC);
-
     public static RubyTime toTime(final ThreadContext context, final IRubyObject value) {
         if (!(value instanceof RubyTime)) { // unlikely
             return (RubyTime) TypeConverter.convertToTypeWithCheck(value, context.runtime.getTime(), "to_time");
@@ -221,11 +217,9 @@ public abstract class DateTimeUtils {
         final int hours = time.getHours();
         final int minutes = time.getMinutes();
         final int seconds = time.getSeconds();
-        int nanos = time.getNanos(); // max 999-999-999
-        final int millis = nanos / 1000000;
-        nanos = nanos % 1000000;
+        final int nanos = time.getNanos(); // max 999-999-999
 
-        DateTime dateTime = new DateTime(2000, 1, 1, hours, minutes, seconds, millis, defaultZone);
+        DateTime dateTime = new DateTime(2000, 1, 1, hours, minutes, seconds, defaultZone);
         return RubyTime.newTime(context.runtime, dateTime, nanos);
     }
 
@@ -238,11 +232,9 @@ public abstract class DateTimeUtils {
         final int hours = timestamp.getHours();
         final int minutes = timestamp.getMinutes();
         final int seconds = timestamp.getSeconds();
-        int nanos = timestamp.getNanos(); // max 999-999-999
-        final int millis = nanos / 1000000;
-        nanos = nanos % 1000000;
+        final int nanos = timestamp.getNanos(); // max 999-999-999
 
-        DateTime dateTime = new DateTime(year, month, day, hours, minutes, seconds, millis, defaultZone);
+        DateTime dateTime = new DateTime(year, month, day, hours, minutes, seconds, 0, defaultZone);
         return RubyTime.newTime(context.runtime, dateTime, nanos);
     }
 
@@ -267,15 +259,6 @@ public abstract class DateTimeUtils {
         return newDate(context, year, month, day, ISOChronology.getInstance(zone));
     }
 
-    @SuppressWarnings("deprecation")
-    public static IRubyObject newDate(final ThreadContext context, final Date date) {
-        final int year = date.getYear() + 1900;
-        final int month = date.getMonth() + 1;
-        final int day = date.getDate();
-
-        return newDate(context, year, month, day, CHRONO_ITALY_UTC);
-    }
-
     // @Deprecated
     public static Timestamp convertToTimestamp(final RubyFloat value) {
         final Timestamp timestamp = new Timestamp(value.getLongValue() * 1000); // millis
@@ -570,7 +553,7 @@ public abstract class DateTimeUtils {
     }
 
     private static IRubyObject newDate(final ThreadContext context, final int year, final int month, final int day,
-                                       final Chronology chronology) {
+                                       final ISOChronology chronology) {
         // NOTE: JRuby really needs a native date.rb until than its a bit costly going from ...
         // java.sql.Date -> allocating a DateTime proxy, help a bit by shooting at the internals
         //