activerecord-jdbc-alt-adapter 52.4.0-java → 61.0.0-java

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); }
         });
     }
 
@@ -374,10 +370,9 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     }
 
     @Override
-    public IRubyObject begin(ThreadContext context, IRubyObject level) {
-        throw context.runtime.newRaiseException(getTransactionIsolationError(context.runtime),
-                "SQLite3 does not support isolation levels"
-        );
+    protected boolean resetSavepoints(final ThreadContext context, final Connection connection) throws SQLException {
+        connection.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+        return super.resetSavepoints(context, connection);
     }
 
     @Override
@@ -390,8 +385,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 +407,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 +431,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 +451,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 +512,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);
     }

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

@@ -37,6 +37,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyFloat;
 import org.jruby.RubyString;
 import org.jruby.RubyTime;
+import org.jruby.ext.date.RubyDateTime;
 import org.jruby.javasupport.Java;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
@@ -632,14 +633,21 @@ public abstract class DateTimeUtils {
      */
     public static String timestampTimeToString(final ThreadContext context,
                                                final IRubyObject value, DateTimeZone zone, boolean withZone) {
-        RubyTime timeValue = toTime(context, value);
-        DateTime dt = timeValue.getDateTime();
+        DateTime dt;
+        int usec = 0;
+        if (value instanceof RubyDateTime) {
+            dt = ((RubyDateTime) value).getDateTime();
+        } else {
+            RubyTime timeValue = toTime(context, value);
+            dt = timeValue.getDateTime();
+            usec = (int) timeValue.getUSec();
+        }
 
         StringBuilder sb = new StringBuilder(36);
 
         int year = dt.getYear();
         if (year <= 0) {
-            year--;
+            if (!(value instanceof RubyDateTime)) year--;
         } else if (zone != null) {
             dt = dateTimeInZone(dt, zone);
             year = dt.getYear();
@@ -659,7 +667,7 @@ public abstract class DateTimeUtils {
         if (year < 0) sb.append(" BC");
         sb.append(' ');
 
-        appendTime(sb, chrono, millis, (int) timeValue.getUSec(), withZone);
+        appendTime(sb, chrono, millis, usec, withZone);
 
         return sb.toString();
     }

metadata

@@ -1,24 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 52.4.0
+  version: 61.0.0
 platform: java
 authors:
-- Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
+- Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.1.0
   name: activerecord
   prerelease: false
   type: :runtime
@@ -26,27 +23,23 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.1.0
 description: 'Fork of the ActiveRecord JDBC adapter with support for SQL Server and
   Azure SQL, for more information and help look at the README file in the github repository.
   AR-JDBC is a database adapter for Rails'' ActiveRecord component designed to be
   used with JRuby built upon Java''s JDBC API for database access. Provides (ActiveRecord)
-  built-in adapters: MySQL, PostgreSQL and SQLite3 as well as adapters for popular
-  databases such as Oracle, SQLServer, DB2, FireBird and even Java (embed) databases:
-  Derby, HSQLDB and H2. It allows to connect to virtually any JDBC-compliant database
-  with your JRuby on Rails application.'
+  built-in adapters: MySQL,  PostgreSQL, SQLite3, and SQLServer.'
 email:
 - nick@nicksieger.com
 - ola.bini@gmail.com
 - self@kares.org
+- jesse.chavez.r@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".nvimlog"
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
@@ -257,7 +250,7 @@ post_install_message:
 rdoc_options:
 - "--main"
 - README.md
-- "-SHN"
+- "-HN"
 - "-f"
 - darkfish
 require_paths:
@@ -273,8 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server