activerecord-jdbc-alt-adapter 61.2.0-java → 70.0.0.rc1-java

data/lib/arjdbc/sqlite3/adapter.rb

@@ -10,6 +10,7 @@ require "active_record/connection_adapters/abstract_adapter"
 require "active_record/connection_adapters/statement_pool"
 require "active_record/connection_adapters/sqlite3/explain_pretty_printer"
 require "active_record/connection_adapters/sqlite3/quoting"
+require "active_record/connection_adapters/sqlite3/database_statements"
 require "active_record/connection_adapters/sqlite3/schema_creation"
 require "active_record/connection_adapters/sqlite3/schema_definitions"
 require "active_record/connection_adapters/sqlite3/schema_dumper"
@@ -64,6 +65,7 @@ module ArJdbc
     # DIFFERENCE: FQN
     include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
     include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
 
     NATIVE_DATABASE_TYPES = {
         primary_key:  "integer PRIMARY KEY AUTOINCREMENT NOT NULL",
@@ -79,15 +81,30 @@ module ArJdbc
         boolean:      { name: "boolean" },
         json:         { name: "json" },
     }
-
-    # DIFFERENCE: class_attribute in original adapter is moved down to our section which is a class
-    #  since we cannot define it here in the module (original source this is a class).
+    
+    class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
+      private
+      def dealloc(stmt)
+        stmt.close unless stmt.closed?
+      end
+    end
 
     def initialize(connection, logger, connection_options, config)
+      @memory_database = config[:database] == ":memory:"
       super(connection, logger, config)
       configure_connection
     end
 
+    def self.database_exists?(config)
+      config = config.symbolize_keys
+      if config[:database] == ":memory:"
+        true
+      else
+        database_file = defined?(Rails.root) ? File.expand_path(config[:database], Rails.root) : config[:database]
+        File.exist?(database_file)
+      end
+    end
+
     def supports_ddl_transactions?
       true
     end
@@ -101,7 +118,7 @@ module ArJdbc
     end
 
     def supports_partial_index?
-      database_version >= "3.9.0"
+      true
     end
 
     def supports_expression_index?
@@ -144,6 +161,25 @@ module ArJdbc
     alias supports_insert_conflict_target? supports_insert_on_conflict?
 
     # DIFFERENCE: active?, reconnect!, disconnect! handles by arjdbc core
+    def supports_concurrent_connections?
+      !@memory_database
+    end
+
+    def active?
+      !@raw_connection.closed?
+    end
+
+    def reconnect!
+      super
+      connect if @connection.closed?
+    end
+
+    # Disconnects from the database if already connected. Otherwise, this
+    # method does nothing.
+    def disconnect!
+      super
+      @connection.close rescue nil
+    end
 
     def supports_index_sort_order?
       true
@@ -182,48 +218,8 @@ module ArJdbc
       end
     end
 
-    #--
-    # DATABASE STATEMENTS ======================================
-    #++
-
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
-      :pragma
-    ) # :nodoc:
-    private_constant :READ_QUERY
-
-    def write_query?(sql) # :nodoc:
-      !READ_QUERY.match?(sql)
-    end
-
-    def explain(arel, binds = [])
-      sql = "EXPLAIN QUERY PLAN #{to_sql(arel, binds)}"
-      # DIFFERENCE: FQN
-      ::ActiveRecord::ConnectionAdapters::SQLite3::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", []))
-    end
-
-    # DIFFERENCE: implemented in ArJdbc::Abstract::DatabaseStatements
-    #def exec_query(sql, name = nil, binds = [], prepare: false)
-
-    # DIFFERENCE: implemented in ArJdbc::Abstract::DatabaseStatements
-    #def exec_delete(sql, name = "SQL", binds = [])
-
-    def last_inserted_id(result)
-      @connection.last_insert_row_id
-    end
-
-    # DIFFERENCE: implemented in ArJdbc::Abstract::DatabaseStatements
-    #def execute(sql, name = nil) #:nodoc:
-
-    def begin_db_transaction #:nodoc:
-      log("begin transaction", 'TRANSACTION') { @connection.transaction }
-    end
-
-    def commit_db_transaction #:nodoc:
-      log("commit transaction", 'TRANSACTION') { @connection.commit }
-    end
-
-    def exec_rollback_db_transaction #:nodoc:
-      log("rollback transaction", 'TRANSACTION') { @connection.rollback }
+    def all_foreign_keys_valid? # :nodoc:
+      execute("PRAGMA foreign_key_check").blank?
     end
 
     # SCHEMA STATEMENTS ========================================
@@ -233,14 +229,15 @@ module ArJdbc
       pks.sort_by { |f| f["pk"] }.map { |f| f["name"] }
     end
 
-      def remove_index(table_name, column_name = nil, **options) # :nodoc:
-        return if options[:if_exists] && !index_exists?(table_name, column_name, **options)
+    def remove_index(table_name, column_name = nil, **options) # :nodoc:
+      return if options[:if_exists] && !index_exists?(table_name, column_name, **options)
 
       index_name = index_name_for_remove(table_name, column_name, options)
 
       exec_query "DROP INDEX #{quote_column_name(index_name)}"
     end
 
+    
     # Renames a table.
     #
     # Example:
@@ -265,9 +262,17 @@ module ArJdbc
     def remove_column(table_name, column_name, type = nil, **options) #:nodoc:
       alter_table(table_name) do |definition|
         definition.remove_column column_name
-        definition.foreign_keys.delete_if do |_, fk_options|
-          fk_options[:column] == column_name.to_s
+        definition.foreign_keys.delete_if { |fk| fk.column == column_name.to_s }
+      end
+    end
+
+    def remove_columns(table_name, *column_names, type: nil, **options) # :nodoc:
+      alter_table(table_name) do |definition|
+        column_names.each do |column_name|
+          definition.remove_column column_name
         end
+        column_names = column_names.map(&:to_s)
+        definition.foreign_keys.delete_if { |fk| column_names.include?(fk.column) }
       end
     end
 
@@ -291,8 +296,8 @@ module ArJdbc
     def change_column(table_name, column_name, type, **options) #:nodoc:
       alter_table(table_name) do |definition|
         definition[column_name].instance_eval do
-          self.type    = type
-            self.options.merge!(options)
+          self.type = aliased_types(type.to_s, type)
+          self.options.merge!(options)
         end
       end
     end
@@ -322,18 +327,6 @@ module ArJdbc
       end
     end
 
-    def insert_fixtures_set(fixture_set, tables_to_delete = [])
-      disable_referential_integrity do
-        transaction(requires_new: true) do
-          tables_to_delete.each { |table| delete "DELETE FROM #{quote_table_name(table)}", "Fixture Delete" }
-
-          fixture_set.each do |table_name, rows|
-            rows.each { |row| insert_fixture(row, table_name) }
-          end
-        end
-      end
-    end
-
     def build_insert_sql(insert) # :nodoc:
       sql = +"INSERT #{insert.into} #{insert.values_list}"
 
@@ -341,23 +334,23 @@ module ArJdbc
         sql << " ON CONFLICT #{insert.conflict_target} DO NOTHING"
       elsif insert.update_duplicates?
         sql << " ON CONFLICT #{insert.conflict_target} DO UPDATE SET "
-        sql << insert.touch_model_timestamps_unless { |column| "#{column} IS excluded.#{column}" }
-        sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
+        if insert.raw_update_sql?
+          sql << insert.raw_update_sql
+        else
+          sql << insert.touch_model_timestamps_unless { |column| "#{column} IS excluded.#{column}" }
+          sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
+        end
       end
 
       sql
     end
 
-    def shared_cache?
-      config[:properties] && config[:properties][:shared_cache] == true
+    def shared_cache? # :nodoc:
+      @config.fetch(:flags, 0).anybits?(::SQLite3::Constants::Open::SHAREDCACHE)
     end
 
     def get_database_version # :nodoc:
-      SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)"))
-    end
-
-    def build_truncate_statement(table_name)
-      "DELETE FROM #{quote_table_name(table_name)}"
+      SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)", "SCHEMA"))
     end
 
     def check_version
@@ -380,6 +373,34 @@ module ArJdbc
     end
     alias column_definitions table_structure
 
+    def extract_value_from_default(default)
+      case default
+      when /^null$/i
+        nil
+        # Quoted types
+      when /^'(.*)'$/m
+        $1.gsub("''", "'")
+        # Quoted types
+      when /^"(.*)"$/m
+        $1.gsub('""', '"')
+        # Numeric types
+      when /\A-?\d+(\.\d*)?\z/
+        $&
+      else
+        # Anything else is blank or some function
+        # and we can't know the value of that, so return nil.
+        nil
+      end
+    end
+
+    def extract_default_function(default_value, default)
+      default if has_default_function?(default_value, default)
+    end
+
+    def has_default_function?(default_value, default)
+      !default_value && %r{\w+\(.*\)|CURRENT_TIME|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(default)
+    end
+
     # See: https://www.sqlite.org/lang_altertable.html
     # SQLite has an additional restriction on the ALTER TABLE statement
     def invalid_alter_table_type?(type, options)
@@ -440,8 +461,13 @@ module ArJdbc
              options[:rename][column.name.to_sym] ||
              column.name) : column.name
 
+          if column.has_default?
+            type = lookup_cast_type_from_column(column)
+            default = type.deserialize(column.default)
+          end
+
           @definition.column(column_name, column.type,
-            limit: column.limit, default: column.default,
+            limit: column.limit, default: default,
             precision: column.precision, scale: column.scale,
             null: column.null, collation: column.collation,
             primary_key: column_name == from_primary_key
@@ -459,9 +485,6 @@ module ArJdbc
     def copy_table_indexes(from, to, rename = {})
       indexes(from).each do |index|
         name = index.name
-        # indexes sqlite creates for internal use start with `sqlite_` and
-        # don't need to be copied
-        next if name.start_with?("sqlite_")
         if to == "a#{from}"
           name = "t#{name}"
         elsif from == "a#{to}"
@@ -481,6 +504,7 @@ module ArJdbc
           options = { name: name.gsub(/(^|_)(#{from})_/, "\\1#{to}_"), internal: true }
           options[:unique] = true if index.unique
           options[:where] = index.where if index.where
+          options[:order] = index.orders if index.orders
           add_index(to, columns, **options)
         end
       end
@@ -500,20 +524,22 @@ module ArJdbc
     end
 
     def translate_exception(exception, message:, sql:, binds:)
-      case exception.message
       # SQLite 3.8.2 returns a newly formatted error message:
       #   UNIQUE constraint failed: *table_name*.*column_name*
       # Older versions of SQLite return:
       #   column *column_name* is not unique
-      when /column(s)? .* (is|are) not unique/, /UNIQUE constraint failed: .*/
+      if exception.message.match?(/(column(s)? .* (is|are) not unique|UNIQUE constraint failed: .*)/i)
         # DIFFERENCE: FQN
         ::ActiveRecord::RecordNotUnique.new(message, sql: sql, binds: binds)
-      when /.* may not be NULL/, /NOT NULL constraint failed: .*/
+      elsif exception.message.match?(/(.* may not be NULL|NOT NULL constraint failed: .*)/i)
         # DIFFERENCE: FQN
         ::ActiveRecord::NotNullViolation.new(message, sql: sql, binds: binds)
-      when /FOREIGN KEY constraint failed/i
+      elsif exception.message.match?(/FOREIGN KEY constraint failed/i)
         # DIFFERENCE: FQN
         ::ActiveRecord::InvalidForeignKey.new(message, sql: sql, binds: binds)
+      elsif exception.message.match?(/called on a closed database/i)
+        # DIFFERENCE: FQN
+        ::ActiveRecord::ConnectionNotEstablished.new(exception)
       else
         super
       end
@@ -533,12 +559,12 @@ module ArJdbc
       # Result will have following sample string
       # CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
       #                       "password_digest" varchar COLLATE "NOCASE");
-      result = exec_query(sql, "SCHEMA").first
+      result = query_value(sql, "SCHEMA")
 
       if result
         # Splitting with left parentheses and discarding the first part will return all
         # columns separated with comma(,).
-        columns_string = result["sql"].split("(", 2).last
+        columns_string = result.split("(", 2).last
 
         columns_string.split(",").each do |column_string|
           # This regex will match the column name and collation type and will save
@@ -564,7 +590,21 @@ module ArJdbc
       Arel::Visitors::SQLite.new(self)
     end
 
+    def build_statement_pool
+      StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
+    end
+
+    def connect
+      @connection = ::SQLite3::Database.new(
+        @config[:database].to_s,
+        @config.merge(results_as_hash: true)
+      )
+    end
+
     def configure_connection
+      # FIXME: missing from adapter
+#      @connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout])) if @config[:timeout]
+
       execute("PRAGMA foreign_keys = ON", "SCHEMA")
     end
 
@@ -720,11 +760,15 @@ module ActiveRecord::ConnectionAdapters
 
     # because the JDBC driver doesn't like multiple SQL statements in one JDBC statement
     def combine_multi_statements(total_sql)
-      if total_sql.length == 1
-        total_sql.first
-      else
-        total_sql
-      end
+      total_sql
+    end
+
+    # combine
+    def write_query?(sql) # :nodoc:
+      return sql.any? { |stmt| super(stmt) } if sql.kind_of? Array
+      !READ_QUERY.match?(sql)
+    rescue ArgumentError # Invalid encoding
+      !READ_QUERY.match?(sql.b)
     end
 
     def initialize_type_map(m = type_map)

data/lib/arjdbc/tasks/database_tasks.rb

@@ -11,18 +11,6 @@ module ArJdbc
     require 'arjdbc/tasks/jdbc_database_tasks'
     require 'arjdbc/tasks/sqlite_database_tasks_patch'
     require 'arjdbc/tasks/mssql_database_tasks'
-    #require 'arjdbc/tasks/db2_database_tasks'
-    #require 'arjdbc/tasks/derby_database_tasks'
-    #require 'arjdbc/tasks/h2_database_tasks'
-    #require 'arjdbc/tasks/hsqldb_database_tasks'
-
-    # re-invent built-in (but deprecated on 4.0) tasks :
-    # tasks for custom (JDBC) adapters :
-    #register_tasks(/db2/, DB2DatabaseTasks)
-    #register_tasks(/derby/, DerbyDatabaseTasks)
-    #register_tasks(/h2/, H2DatabaseTasks)
-    #register_tasks(/hsqldb/, HSQLDBDatabaseTasks)
-    # (default) generic JDBC task :
     register_tasks(/^jdbc$/, JdbcDatabaseTasks)
     register_tasks(/sqlserver/, MSSQLDatabaseTasks)
 

data/lib/arjdbc/util/serialized_attributes.rb

@@ -31,33 +31,11 @@ module ArJdbc
         SerializedAttributes.dump_column_value(self, column)
       end
 
-      if defined? ActiveRecord::Type::Serialized # ArJdbc::AR42
-
       def self.dump_column_value(record, column)
         value = record[ column.name.to_s ]
         column.cast_type.type_cast_for_database(value)
       end
 
-      else
-
-      def self.dump_column_value(record, column)
-        value = record[ name = column.name.to_s ]
-        if record.class.respond_to?(:serialized_attributes)
-          if coder = record.class.serialized_attributes[name]
-            value = coder.respond_to?(:dump) ? coder.dump(value) : value.to_yaml
-          end
-        else
-          if record.respond_to?(:unserializable_attribute?)
-            value = value.to_yaml if record.unserializable_attribute?(name, column)
-          else
-            value = value.to_yaml if value.is_a?(Hash)
-          end
-        end
-        value
-      end
-
-      end
-
       def self.setup(lob_type = nil, after_save_alias = nil)
         ActiveRecord::Base.send :include, self # include SerializedAttributes
         ActiveRecord::Base.lob_type = lob_type unless lob_type.nil?

data/lib/arjdbc/util/table_copier.rb

@@ -4,7 +4,8 @@ module ArJdbc
   module Util
     module TableCopier
 
-      # taken from SQLite adapter, code loosely based on http://git.io/P7tFQA
+      # taken from SQLite adapter, code loosely based on
+      # https://github.com/rails/rails/blob/d3e5118/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
 
       # Performs changes for table by first copying (and preserving contents)
       # into another (temporary) table, than alters and copies all data back.

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArJdbc
-  VERSION = '61.2.0'
+  VERSION = '70.0.0.rc1'
 end

data/rakelib/02-test.rake

@@ -1,7 +1,7 @@
 
 test_tasks = [ 'test_mysql', 'test_sqlite3', 'test_postgresql_with_hint' ]
 if defined?(JRUBY_VERSION)
-  test_tasks.push :test_derby, :test_hsqldb, :test_h2
+  test_tasks.push :test_hsqldb, :test_h2
   test_tasks.push :test_jndi, :test_jdbc
 end
 
@@ -55,7 +55,6 @@ def test_task_for(adapter, options = {})
   test_task
 end
 
-test_task_for :Derby, :desc => 'Run tests against (embedded) DerbyDB'
 test_task_for :H2, :desc => 'Run tests against H2 database engine'
 test_task_for :HSQLDB, :desc => 'Run tests against HyperSQL (Java) database'
 test_task_for :MSSQL, :driver => :jtds, :database_name => 'MS-SQL (SQLServer)'
@@ -65,29 +64,22 @@ test_task_for :PostgreSQL, :driver => ENV['JDBC_POSTGRES_VERSION'] || 'postgres'
 task :test_postgres => :test_postgresql # alias
 test_task_for :SQLite3, :driver => ENV['JDBC_SQLITE_VERSION']
 task :test_sqlite => :test_sqlite3 # alias
-test_task_for :Firebird
 
 test_task_for :MariaDB, :files => FileList["test/db/mysql/*_test.rb"] do |test_task| #, :prereqs => 'db:mysql'
   test_task.ruby_opts << '-rdb/mariadb_config'
 end
 
 # ensure driver for these DBs is on your class-path
-[ :Oracle, :DB2, :Informix, :CacheDB ].each do |adapter|
+[ :Oracle ].each do |adapter|
   test_task_for adapter, :desc => "Run tests against #{adapter} (ensure driver is on class-path)"
 end
 
-test_task_for :AS400, :desc => "Run tests against AS400 (DB2) (ensure driver is on class-path)",
-              :files => FileList["test/db2*_test.rb"] + FileList["test/db/db2/*_test.rb"]
-
-#task :test_jdbc => [ :test_jdbc_mysql, :test_jdbc_derby ] if defined?(JRUBY_VERSION)
-
 test_task_for 'JDBC', :desc => 'Run tests against plain JDBC adapter (uses MySQL and Derby)',
   :prereqs => [ 'db:mysql' ], :files => FileList['test/*jdbc_*test.rb'] do |test_task|
-  test_task.libs << 'jdbc-mysql/lib' << 'jdbc-derby/lib'
+  test_task.libs << 'jdbc-mysql/lib'
 end
 
 # TODO since Derby AR 5.x support is not implemented we only run JNDI with MySQL :
-#task :test_jndi => [ :test_jndi_mysql, :test_jndi_derby ] if defined?(JRUBY_VERSION)
 task :test_jndi => [ :test_jndi_mysql ] if defined?(JRUBY_VERSION)
 
 jndi_classpath = [ 'test/jars/tomcat-juli.jar', 'test/jars/tomcat-catalina.jar' ]
@@ -101,13 +93,6 @@ get_jndi_classpath_opt = lambda do
   "-J-cp \"#{cp.join(File::PATH_SEPARATOR)}\""
 end
 
-test_task_for 'JNDI_Derby', :desc => 'Run tests against a Derby JNDI connection',
-  :prereqs => jndi_classpath, :files => FileList['test/*jndi_derby*test.rb'] do |test_task|
-  test_task.libs << 'jdbc-derby/lib'
-  test_task.ruby_opts << get_jndi_classpath_opt.call
-  #test_task.verbose = true
-end
-
 test_task_for 'JNDI_MySQL', :desc => 'Run tests against a MySQL JNDI connection',
   :prereqs => [ 'db:mysql' ] + jndi_classpath, :files => FileList['test/*jndi_mysql*test.rb'] do |test_task|
   test_task.libs << 'jdbc-mysql/lib'

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

@@ -720,6 +720,21 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
+    @JRubyMethod(name = "closed?")
+    public IRubyObject closed_p(ThreadContext context) {
+        try {
+            final Connection connection = getConnectionInternal(false);
+
+            if (connection == null) return context.fals;
+
+            // NOTE: isClosed method generally cannot be called to determine
+            // whether a connection to a database is valid or invalid ...
+            return context.runtime.newBoolean(connection.isClosed());
+        } catch (SQLException e) {
+            return handleException(context, e);
+        }
+    }
+
     @JRubyMethod(name = "close")
     public IRubyObject close(final ThreadContext context) {
         final Connection connection = getConnection(false);
@@ -2642,8 +2657,8 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     private String default_timezone(final ThreadContext context) {
-        final RubyClass base = getBase(context.runtime);
-        return default_timezone.call(context, base, base).asJavaString(); // :utc (or :local)
+        final RubyModule activeRecord = ActiveRecord(context);
+        return default_timezone.call(context, activeRecord, activeRecord).asJavaString(); // :utc (or :local)
     }
 
     // ActiveRecord::Base.default_timezone

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

@@ -402,6 +402,11 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         finally { close(statement); }
     }
 
+    @JRubyMethod
+    public IRubyObject filename(ThreadContext context) {
+        return getConfigValue(context, "database");
+    }
+
     @Override
     @JRubyMethod(name = "rollback_savepoint", required = 1)
     public IRubyObject rollback_savepoint(final ThreadContext context, final IRubyObject name) {
@@ -460,6 +465,34 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         return context.runtime.newBoolean(connection.isReadOnly());
     }
 
+    // note: sqlite3 cext uses this same method but we do not combine all our statements
+    // into a single ; delimited string but leave it as an array of statements.  This is
+    // because the JDBC way of handling batches is to use addBatch().
+    @JRubyMethod(name = "execute_batch2")
+    public IRubyObject execute_batch2(ThreadContext context, IRubyObject statementsArg) {
+        // Assume we will only call this with an array.
+        final RubyArray statements = (RubyArray) statementsArg;
+        return withConnection(context, connection -> {
+            Statement statement = null;
+            try {
+                statement = createStatement(context, connection);
+
+                int length = statements.getLength();
+                for (int i = 0; i < length; i++) {
+                    statement.addBatch(sqlString(statements.eltOk(i)));
+                }
+                statement.executeBatch();
+                return context.nil;
+            } catch (final SQLException e) {
+                // Generate list semicolon list of statements which should match AR error formatting more.
+                debugErrorSQL(context, sqlString(statements.join(context, context.runtime.newString(";\n"))));
+                throw e;
+            } finally {
+                close(statement);
+            }
+        });
+    }
+
     @Override
     protected void setDecimalParameter(final ThreadContext context,
         final Connection connection, final PreparedStatement statement,