activerecord-jdbc-adapter 52.7-java → 60.0-java

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

@@ -200,57 +200,6 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         });
     }
 
-    /**
-     * 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) {
 

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

@@ -40,8 +40,6 @@ import java.sql.Statement;
 import java.sql.Timestamp;
 import java.sql.Types;
 
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
@@ -89,11 +87,9 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
 
     @JRubyMethod(name = { "full_version" })
     public IRubyObject db_version(final ThreadContext context) {
-        return withConnection(context, new Callable<IRubyObject>() {
-            public IRubyObject call(final Connection connection) throws SQLException {
-                final DatabaseMetaData metaData = connection.getMetaData();
-                return context.runtime.newString(metaData.getDatabaseProductVersion());
-            }
+        return withConnection(context, (Callable<IRubyObject>) connection -> {
+            final DatabaseMetaData metaData = connection.getMetaData();
+            return context.runtime.newString(metaData.getDatabaseProductVersion());
         });
     }
 
@@ -108,7 +104,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             if ( major < 5 ) {
                 final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
                 throw context.runtime.newRaiseException(errorClass,
-                    "MySQL adapter requires driver >= 5.0 got: " + major + "." + minor + "");
+                        "MySQL adapter requires driver >= 5.0 got: " + major + "." + minor);
             }
             if ( major == 5 && minor < 1 ) { // need 5.1 for JDBC 4.0
                 // lightweight validation query: "/* ping */ SELECT 1"
@@ -203,7 +199,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             return resultSet.wasNull() ? context.nil : RubyString.newEmptyString(runtime);
         }
 
-        if ( rawDateTime != null && rawDateTime.booleanValue() ) {
+        if ( rawDateTime != null && rawDateTime) {
             return RubyString.newString(runtime, DateTimeUtils.dummyTimeToString(value));
         }
 
@@ -237,7 +233,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         if (lowerCase == null) {
             lowerCase = lowerCaseIdentifiers = connection.getMetaData().storesLowerCaseIdentifiers();
         }
-        return lowerCase.booleanValue() ? value.toLowerCase() : value;
+        return lowerCase ? value.toLowerCase() : value;
     }
 
     @Override
@@ -247,7 +243,9 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             connection = super.newConnection();
         }
         catch (SQLException ex) {
-            if (ex.getErrorCode() == 1049) throw newNoDatabaseError(ex);
+            int errorCode = ex.getErrorCode();
+            // access denied, no database
+            if (errorCode == 1044 || errorCode == 1049) throw newNoDatabaseError(ex);
             throw ex;
         }
         if ( doStopCleanupThread() ) shutdownCleanupThread();
@@ -261,7 +259,7 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
     }
 
     private static boolean doStopCleanupThread() throws SQLException {
-        return stopCleanupThread != null && stopCleanupThread.booleanValue();
+        return stopCleanupThread != null && stopCleanupThread;
     }
 
     private static boolean cleanupThreadShutdown;
@@ -276,19 +274,11 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         catch (ClassNotFoundException e) {
             debugMessage(null, "missing MySQL JDBC cleanup thread ", e);
         }
-        catch (NoSuchMethodException e) {
-            debugMessage(null, e);
-        }
-        catch (IllegalAccessException e) {
+        catch (NoSuchMethodException | SecurityException | IllegalAccessException e) {
             debugMessage(null, e);
-        }
-        catch (InvocationTargetException e) {
+        } catch (InvocationTargetException e) {
             debugMessage(null, e.getTargetException());
-        }
-        catch (SecurityException e) {
-            debugMessage(null, e);
-        }
-        finally { cleanupThreadShutdown = true; }
+        } finally { cleanupThreadShutdown = true; }
     }
 
 }

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

@@ -35,9 +35,9 @@ import arjdbc.util.StringHelper;
 import java.io.ByteArrayInputStream;
 import java.lang.StringBuilder;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -163,15 +163,12 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             try { // public static String getVersion()
                 final String version = (String) // "PostgreSQL 9.2 JDBC4 (build 1002)"
                     jdbcDriver.getClass().getMethod("getVersion").invoke(null);
-                if ( version != null && version.indexOf("JDBC3") >= 0 ) {
+                if ( version != null && version.contains("JDBC3")) {
                     // config[:connection_alive_sql] ||= 'SELECT 1'
                     setConfigValueIfNotSet(context, "connection_alive_sql", context.runtime.newString("SELECT 1"));
                 }
             }
-            catch (NoSuchMethodException e) { }
-            catch (SecurityException e) { }
-            catch (IllegalAccessException e) { }
-            catch (InvocationTargetException e) { }
+            catch (NoSuchMethodException | SecurityException | InvocationTargetException | IllegalAccessException ignored) { }
         }
 
         return driverWrapper;
@@ -218,11 +215,9 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
 
     @JRubyMethod(name = "database_product")
     public IRubyObject database_product(final ThreadContext context) {
-        return withConnection(context, new Callable<IRubyObject>() {
-            public IRubyObject call(final Connection connection) throws SQLException {
-                final DatabaseMetaData metaData = connection.getMetaData();
-                return RubyString.newString(context.runtime, metaData.getDatabaseProductName() + ' ' + metaData.getDatabaseProductVersion());
-            }
+        return withConnection(context, (Callable<IRubyObject>) connection -> {
+            final DatabaseMetaData metaData = connection.getMetaData();
+            return RubyString.newString(context.runtime, metaData.getDatabaseProductName() + ' ' + metaData.getDatabaseProductVersion());
         });
     }
 
@@ -308,6 +303,24 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         statement.setArray(index, connection.createArrayOf(typeName, values));
     }
 
+    protected void setDecimalParameter(final ThreadContext context,
+                                       final Connection connection, final PreparedStatement statement,
+                                       final int index, final IRubyObject value,
+                                       final IRubyObject attribute, final int type) throws SQLException {
+        if (value instanceof RubyBigDecimal) {
+            RubyBigDecimal bigDecimal = (RubyBigDecimal) value;
+
+            // too bad RubyBigDecimal.isNaN() isn't public
+            if (bigDecimal.nan_p(context) == context.tru) {
+                statement.setDouble(index, Double.NaN);
+            } else {
+                statement.setBigDecimal(index, bigDecimal.getValue());
+            }
+        } else {
+            super.setDecimalParameter(context, connection, statement, index, value, attribute, type);
+        }
+    }
+
     @Override
     protected void setBlobParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
@@ -373,18 +386,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             }
         }
 
-        if ( ! "Date".equals(value.getMetaClass().getName()) && value.respondsTo("to_date") ) {
-            value = value.callMethod(context, "to_date");
-        }
-
-        int year = RubyNumeric.num2int(value.callMethod(context, "year"));
-        int month = RubyNumeric.num2int(value.callMethod(context, "month"));
-        int day = RubyNumeric.num2int(value.callMethod(context, "day"));
-
-        @SuppressWarnings("deprecated")
-        Date date = new Date(year - 1900, month - 1, day);
-
-        statement.setDate(index, date);
+        super.setDateParameter(context, connection, statement, index, value, attribute, type);
     }
 
     @Override
@@ -514,7 +516,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
 
     private static Double[] parseDoubles(IRubyObject value) {
         Matcher matches = doubleValuePattern.matcher(value.toString());
-        ArrayList<Double> doubles = new ArrayList<Double>(4); // Paths and polygons may be larger but this covers points/circles/boxes/line segments
+        ArrayList<Double> doubles = new ArrayList<>(4); // Paths and polygons may be larger but this covers points/circles/boxes/line segments
 
         while ( matches.find() ) {
             doubles.add(Double.parseDouble(matches.group()));
@@ -729,6 +731,11 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         return DateTimeUtils.parseDate(context, value, getDefaultTimeZone(context));
     }
 
+    protected IRubyObject decimalToRuby(final ThreadContext context,
+                                        final Ruby runtime, final ResultSet resultSet, final int column) throws SQLException {
+        if ("NaN".equals(resultSet.getString(column)))  return new RubyBigDecimal(runtime, BigDecimal.ZERO, true);
+        return super.decimalToRuby(context, runtime, resultSet, column);
+    }
 
     /**
      * Detects PG specific types and converts them to their Ruby equivalents

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -100,55 +100,53 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     public IRubyObject encoding(final ThreadContext context) throws SQLException {
         if (encoding != null) return encoding;
 
-        return withConnection(context, new Callable<IRubyObject>() {
-            // FIXME: How many single result queries do we have in Java?
-            public IRubyObject call(final Connection connection) throws SQLException {
-                String query = "PRAGMA encoding";
-                Statement statement = null;
-                ResultSet resultSet = null;
-                try {
-                    statement = createStatement(context, connection);
-                    if (statement.execute(query)) {
-                        // Enebo: I do not think we need to worry about failure here?
-                        String encodingString = statement.getResultSet().getString(1);
-
-                        encoding = cachedString(context, encodingString);
-
-                        return encoding;
-                    }
-                } catch (final SQLException e) {
-                    debugErrorSQL(context, query);
-                    throw e;
-                } finally {
-                    close(resultSet);
-                    close(statement);
+        // FIXME: How many single result queries do we have in Java?
+        return withConnection(context, connection -> {
+            String query = "PRAGMA encoding";
+            Statement statement = null;
+            ResultSet resultSet = null;
+            try {
+                statement = createStatement(context, connection);
+                if (statement.execute(query)) {
+                    // Enebo: I do not think we need to worry about failure here?
+                    resultSet = statement.getResultSet();
+                    if (!resultSet.next()) return context.nil;
+                    String encodingString = resultSet.getString(1);
+
+                    encoding = cachedString(context, encodingString);
+
+                    return encoding;
                 }
-
-                return context.nil;
+            } catch (final SQLException e) {
+                debugErrorSQL(context, query);
+                throw e;
+            } finally {
+                close(resultSet);
+                close(statement);
             }
+
+            return context.nil;
         });
     }
 
     @JRubyMethod(name = {"last_insert_rowid", "last_insert_id"}, alias = "last_insert_row_id")
     public IRubyObject last_insert_rowid(final ThreadContext context)
         throws SQLException {
-        return withConnection(context, new Callable<IRubyObject>() {
-            public IRubyObject call(final Connection connection) throws SQLException {
-                Statement statement = null; ResultSet genKeys = null;
-                try {
-                    statement = connection.createStatement();
-                    // NOTE: strangely this will work and has been used for quite some time :
-                    //return mapGeneratedKeys(context.getRuntime(), connection, statement, true);
-                    // but we should assume SQLite JDBC will prefer sane API usage eventually :
-                    genKeys = statement.executeQuery("SELECT last_insert_rowid()");
-                    return doMapGeneratedKeys(context.runtime, genKeys, true);
-                }
-                catch (final SQLException e) {
-                    debugMessage(context.runtime, "failed to get generated keys: ", e);
-                    throw e;
-                }
-                finally { close(genKeys); close(statement); }
+        return withConnection(context, connection -> {
+            Statement statement = null; ResultSet genKeys = null;
+            try {
+                statement = connection.createStatement();
+                // NOTE: strangely this will work and has been used for quite some time :
+                //return mapGeneratedKeys(context.getRuntime(), connection, statement, true);
+                // but we should assume SQLite JDBC will prefer sane API usage eventually :
+                genKeys = statement.executeQuery("SELECT last_insert_rowid()");
+                return doMapGeneratedKeys(context.runtime, genKeys, true);
+            }
+            catch (final SQLException e) {
+                debugMessage(context.runtime, "failed to get generated keys: ", e);
+                throw e;
             }
+            finally { close(genKeys); close(statement); }
         });
     }
 
@@ -183,66 +181,64 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         final String tableName = table;
         final String schemaName = schema;
         // return super.indexes(context, tableName, name, schemaName);
-        return withConnection(context, new Callable<IRubyObject>() {
-            public RubyArray call(final Connection connection) throws SQLException {
-                final Ruby runtime = context.runtime;
-                final RubyClass IndexDefinition = getIndexDefinition(runtime);
+        return withConnection(context, (Callable<IRubyObject>) connection -> {
+            final Ruby runtime = context.runtime;
+            final RubyClass IndexDefinition = getIndexDefinition(runtime);
 
-                final TableName table = extractTableName(connection, null, schemaName, tableName);
+            final TableName table1 = extractTableName(connection, null, schemaName, tableName);
 
-                final List<RubyString> primaryKeys = primaryKeys(context, connection, table);
+            final List<RubyString> primaryKeys = primaryKeys(context, connection, table1);
 
-                final DatabaseMetaData metaData = connection.getMetaData();
-                ResultSet indexInfoSet;
-                try {
-                    indexInfoSet = metaData.getIndexInfo(table.catalog, table.schema, table.name, false, true);
-                }
-                catch (SQLException e) {
-                    final String msg = e.getMessage();
-                    if ( msg != null && msg.startsWith("[SQLITE_ERROR] SQL error or missing database") ) {
-                        return RubyArray.newEmptyArray(runtime); // on 3.8.7 getIndexInfo fails if table has no indexes
-                    }
-                    throw e;
+            final DatabaseMetaData metaData = connection.getMetaData();
+            ResultSet indexInfoSet;
+            try {
+                indexInfoSet = metaData.getIndexInfo(table1.catalog, table1.schema, table1.name, false, true);
+            }
+            catch (SQLException e) {
+                final String msg = e.getMessage();
+                if ( msg != null && msg.startsWith("[SQLITE_ERROR] SQL error or missing database") ) {
+                    return RubyArray.newEmptyArray(runtime); // on 3.8.7 getIndexInfo fails if table has no indexes
                 }
-                final RubyArray indexes = RubyArray.newArray(runtime, 8);
-                try {
-                    String currentIndex = null;
-
-                    while ( indexInfoSet.next() ) {
-                        String indexName = indexInfoSet.getString(INDEX_INFO_NAME);
-                        if ( indexName == null ) continue;
-                        RubyArray currentColumns = null;
+                throw e;
+            }
+            final RubyArray indexes = RubyArray.newArray(runtime, 8);
+            try {
+                String currentIndex = null;
 
-                        final String columnName = indexInfoSet.getString(INDEX_INFO_COLUMN_NAME);
-                        final RubyString rubyColumnName = cachedString(context, columnName);
-                        if ( primaryKeys.contains(rubyColumnName) ) continue;
+                while ( indexInfoSet.next() ) {
+                    String indexName = indexInfoSet.getString(INDEX_INFO_NAME);
+                    if ( indexName == null ) continue;
+                    RubyArray currentColumns = null;
 
-                        // We are working on a new index
-                        if ( ! indexName.equals(currentIndex) ) {
-                            currentIndex = indexName;
+                    final String columnName = indexInfoSet.getString(INDEX_INFO_COLUMN_NAME);
+                    final RubyString rubyColumnName = cachedString(context, columnName);
+                    if ( primaryKeys.contains(rubyColumnName) ) continue;
 
-                            String indexTableName = indexInfoSet.getString(INDEX_INFO_TABLE_NAME);
+                    // We are working on a new index
+                    if ( ! indexName.equals(currentIndex) ) {
+                        currentIndex = indexName;
 
-                            final boolean nonUnique = indexInfoSet.getBoolean(INDEX_INFO_NON_UNIQUE);
+                        String indexTableName = indexInfoSet.getString(INDEX_INFO_TABLE_NAME);
 
-                            IRubyObject[] args = new IRubyObject[] {
-                                cachedString(context, indexTableName), // table_name
-                                cachedString(context, indexName), // index_name
-                                nonUnique ? runtime.getFalse() : runtime.getTrue(), // unique
-                                currentColumns = RubyArray.newArray(runtime, 4) // [] column names
-                            };
+                        final boolean nonUnique = indexInfoSet.getBoolean(INDEX_INFO_NON_UNIQUE);
 
-                            indexes.append( IndexDefinition.newInstance(context, args, Block.NULL_BLOCK) ); // IndexDefinition.new
-                        }
+                        IRubyObject[] args = new IRubyObject[] {
+                            cachedString(context, indexTableName), // table_name
+                            cachedString(context, indexName), // index_name
+                            nonUnique ? context.fals : context.tru, // unique
+                            currentColumns = RubyArray.newArray(runtime, 4) // [] column names
+                        };
 
-                        // one or more columns can be associated with an index
-                        if ( currentColumns != null ) currentColumns.append(rubyColumnName);
+                        indexes.append( IndexDefinition.newInstance(context, args, Block.NULL_BLOCK) ); // IndexDefinition.new
                     }
 
-                    return indexes;
+                    // one or more columns can be associated with an index
+                    if ( currentColumns != null ) currentColumns.append(rubyColumnName);
+                }
 
-                } finally { close(indexInfoSet); }
-            }
+                return indexes;
+
+            } finally { close(indexInfoSet); }
         });
     }
 
@@ -390,8 +386,9 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
                     "create_savepoint (without name) not implemented!"
             );
         }
-        final Connection connection = getConnection(true); Statement statement = null;
+        Statement statement = null;
         try {
+            final Connection connection = getConnectionInternal(true);
             connection.setAutoCommit(false);
             // NOTE: JDBC driver does not support setSavepoint(String) :
             ( statement = connection.createStatement() ).execute("SAVEPOINT " + name.toString());
@@ -411,12 +408,13 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     public IRubyObject rollback_savepoint(final ThreadContext context, final IRubyObject name) {
         if ( useSavepointAPI(context) ) return super.rollback_savepoint(context, name);
 
-        final Connection connection = getConnection(true); Statement statement = null;
+        Statement statement = null;
         try {
             if ( getSavepoints(context).get(name) == null ) {
                 throw newSavepointNotSetError(context, name, "rollback");
             }
             // NOTE: JDBC driver does not implement rollback(Savepoint) :
+            final Connection connection = getConnectionInternal(true);
             ( statement = connection.createStatement() ).execute("ROLLBACK TO SAVEPOINT " + name.toString());
 
             return context.nil;
@@ -434,12 +432,13 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     public IRubyObject release_savepoint(final ThreadContext context, final IRubyObject name) {
         if ( useSavepointAPI(context) ) return super.release_savepoint(context, name);
 
-        final Connection connection = getConnection(true); Statement statement = null;
+        Statement statement = null;
         try {
             if ( getSavepoints(context).remove(name) == null ) {
                 throw newSavepointNotSetError(context, name, "release");
             }
             // NOTE: JDBC driver does not implement release(Savepoint) :
+            final Connection connection = getConnectionInternal(true);
             ( statement = connection.createStatement() ).execute("RELEASE SAVEPOINT " + name.toString());
             return context.nil;
         } catch (SQLException e) {
@@ -453,19 +452,15 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     // a consistent JDBC layer.
     @JRubyMethod(name = "supports_savepoints?")
     public IRubyObject supports_savepoints_p(final ThreadContext context) throws SQLException {
-        return context.runtime.getTrue();
+        return context.tru;
     }
 
-    @Override
-    protected void setBooleanParameter(final ThreadContext context,
-        final Connection connection, final PreparedStatement statement,
-        final int index, final IRubyObject value,
-        final IRubyObject attribute, final int type) throws SQLException {
-        // Apparently active record stores booleans in sqlite as 't' and 'f' instead of the built in 1/0
-        statement.setString(index, value.isTrue() ? "t" : "f");
+    @JRubyMethod(name = "readonly?")
+    public IRubyObject readonly_p(final ThreadContext context) throws SQLException {
+        final Connection connection = getConnection(true);
+        return context.runtime.newBoolean(connection.isReadOnly());
     }
 
-
     @Override
     protected void setDecimalParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,
@@ -518,7 +513,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         final int index, IRubyObject value,
         final IRubyObject attribute, final int type) throws SQLException {
 
-        if (value instanceof RubyTime) value = ((RubyTime) value).strftime(TIMESTAMP_FORMAT);
+        if (value instanceof RubyTime) value = ((RubyTime) value).strftime(context, TIMESTAMP_FORMAT);
 
         setStringParameter(context, connection, statement, index, value, attribute, type);
     }