activerecord-jdbc-adapter 70.2-java → 72.0-java

data/lib/arjdbc/sqlite3/adapter.rb

@@ -16,6 +16,11 @@ require "active_record/connection_adapters/sqlite3/schema_definitions"
 require "active_record/connection_adapters/sqlite3/schema_dumper"
 require "active_record/connection_adapters/sqlite3/schema_statements"
 require "active_support/core_ext/class/attribute"
+require "arjdbc/sqlite3/column"
+require "arjdbc/sqlite3/adapter_hash_config"
+require "arjdbc/sqlite3/pragmas"
+
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
 
 module SQLite3
   module Constants
@@ -55,18 +60,12 @@ module ArJdbc
     # DIFFERENCE: Some common constant names to reduce differences in rest of this module from AR5 version
     ConnectionAdapters = ::ActiveRecord::ConnectionAdapters
     IndexDefinition = ::ActiveRecord::ConnectionAdapters::IndexDefinition
+    ForeignKeyDefinition = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
     Quoting = ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
     RecordNotUnique = ::ActiveRecord::RecordNotUnique
     SchemaCreation = ConnectionAdapters::SQLite3::SchemaCreation
     SQLite3Adapter = ConnectionAdapters::AbstractAdapter
 
-    ADAPTER_NAME = 'SQLite'
-
-    # 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",
         string:       { name: "varchar" },
@@ -81,7 +80,16 @@ module ArJdbc
         boolean:      { name: "boolean" },
         json:         { name: "json" },
     }
-    
+
+    DEFAULT_PRAGMAS = {
+      "foreign_keys"        => true,
+      "journal_mode"        => :wal,
+      "synchronous"         => :normal,
+      "mmap_size"           => 134217728, # 128 megabytes
+      "journal_size_limit"  => 67108864, # 64 megabytes
+      "cache_size"          => 2000
+    }
+
     class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
       private
       def dealloc(stmt)
@@ -89,20 +97,8 @@ module ArJdbc
       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
+      @config[:database] == ":memory:" || File.exist?(@config[:database].to_s)
     end
 
     def supports_ddl_transactions?
@@ -153,6 +149,10 @@ module ArJdbc
       database_version >= "3.8.3"
     end
 
+    def supports_insert_returning?
+      database_version >= "3.35.0"
+    end
+
     def supports_insert_on_conflict?
       database_version >= "3.24.0"
     end
@@ -165,20 +165,39 @@ module ArJdbc
       !@memory_database
     end
 
+    def supports_virtual_columns?
+      database_version >= "3.31.0"
+    end
+
+    def connected?
+      !(@raw_connection.nil? || @raw_connection.closed?)
+    end
+
     def active?
-      !@raw_connection.closed?
+      if connected?
+        @lock.synchronize do
+          if @raw_connection&.active?
+            verified!
+            true
+          end
+        end
+      end || false
     end
 
-    def reconnect!
-      super
-      connect if @connection.closed?
+    def return_value_after_insert?(column) # :nodoc:
+      column.auto_populated?
     end
 
+    # MISSING:       alias :reset! :reconnect!
+
     # Disconnects from the database if already connected. Otherwise, this
     # method does nothing.
     def disconnect!
-      super
-      @connection.close rescue nil
+      @lock.synchronize do
+        super
+        @raw_connection&.close rescue nil
+        @raw_connection = nil
+      end
     end
 
     def supports_index_sort_order?
@@ -191,7 +210,7 @@ module ArJdbc
 
     # Returns the current database encoding format as a string, eg: 'UTF-8'
     def encoding
-      @connection.encoding.to_s
+      any_raw_connection.encoding.to_s
     end
 
     def supports_explain?
@@ -218,8 +237,14 @@ module ArJdbc
       end
     end
 
-    def all_foreign_keys_valid? # :nodoc:
-      execute("PRAGMA foreign_key_check").blank?
+    def check_all_foreign_keys_valid! # :nodoc:
+      sql = "PRAGMA foreign_key_check"
+      result = execute(sql)
+
+      unless result.blank?
+        tables = result.map { |row| row["table"] }
+        raise ActiveRecord::StatementInvalid.new("Foreign key violations found: #{tables.join(", ")}", sql: sql)
+      end
     end
 
     # SCHEMA STATEMENTS ========================================
@@ -234,18 +259,18 @@ module ArJdbc
 
       index_name = index_name_for_remove(table_name, column_name, options)
 
-      exec_query "DROP INDEX #{quote_column_name(index_name)}"
+      internal_exec_query "DROP INDEX #{quote_column_name(index_name)}"
     end
 
-    
     # Renames a table.
     #
     # Example:
     #   rename_table('octopuses', 'octopi')
-    def rename_table(table_name, new_name)
+    def rename_table(table_name, new_name, **options)
+      validate_table_length!(new_name) unless options[:_uses_legacy_table_name]      
       schema_cache.clear_data_source_cache!(table_name.to_s)
       schema_cache.clear_data_source_cache!(new_name.to_s)
-      exec_query "ALTER TABLE #{quote_table_name(table_name)} RENAME TO #{quote_table_name(new_name)}"
+      internal_exec_query "ALTER TABLE #{quote_table_name(table_name)} RENAME TO #{quote_table_name(new_name)}"
       rename_table_indexes(table_name, new_name)
     end
 
@@ -285,8 +310,10 @@ module ArJdbc
     end
 
     def change_column_null(table_name, column_name, null, default = nil) #:nodoc:
+      validate_change_column_null_argument!(null)
+
       unless null || default.nil?
-        exec_query("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+        internal_exec_query("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
       end
       alter_table(table_name) do |definition|
         definition[column_name].null = null
@@ -295,10 +322,7 @@ 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 = aliased_types(type.to_s, type)
-          self.options.merge!(options)
-        end
+        definition.change_column(column_name, type, **options)
       end
     end
 
@@ -308,22 +332,59 @@ module ArJdbc
       rename_column_indexes(table_name, column.name, new_column_name)
     end
 
+    def add_timestamps(table_name, **options)
+      options[:null] = false if options[:null].nil?
+
+      if !options.key?(:precision)
+        options[:precision] = 6
+      end
+
+      alter_table(table_name) do |definition|
+        definition.column :created_at, :datetime, **options
+        definition.column :updated_at, :datetime, **options
+      end
+    end
+
     def add_reference(table_name, ref_name, **options) # :nodoc:
       super(table_name, ref_name, type: :integer, **options)
     end
     alias :add_belongs_to :add_reference
 
+    FK_REGEX = /.*FOREIGN KEY\s+\("([^"]+)"\)\s+REFERENCES\s+"(\w+)"\s+\("(\w+)"\)/
+    DEFERRABLE_REGEX = /DEFERRABLE INITIALLY (\w+)/
     def foreign_keys(table_name)
-      fk_info = exec_query("PRAGMA foreign_key_list(#{quote(table_name)})", "SCHEMA")
-      fk_info.map do |row|
+      # SQLite returns 1 row for each column of composite foreign keys.
+      fk_info = internal_exec_query("PRAGMA foreign_key_list(#{quote(table_name)})", "SCHEMA")
+      # Deferred or immediate foreign keys can only be seen in the CREATE TABLE sql
+      fk_defs = table_structure_sql(table_name)
+                  .select do |column_string|
+                    column_string.start_with?("CONSTRAINT") &&
+                    column_string.include?("FOREIGN KEY")
+                  end
+                  .to_h do |fk_string|
+                    _, from, table, to = fk_string.match(FK_REGEX).to_a
+                    _, mode = fk_string.match(DEFERRABLE_REGEX).to_a
+                    deferred = mode&.downcase&.to_sym || false
+                    [[table, from, to], deferred]
+                  end
+
+      grouped_fk = fk_info.group_by { |row| row["id"] }.values.each { |group| group.sort_by! { |row| row["seq"] } }
+      grouped_fk.map do |group|
+        row = group.first
         options = {
-          column: row["from"],
-          primary_key: row["to"],
           on_delete: extract_foreign_key_action(row["on_delete"]),
-          on_update: extract_foreign_key_action(row["on_update"])
+          on_update: extract_foreign_key_action(row["on_update"]),
+          deferrable: fk_defs[[row["table"], row["from"], row["to"]]]
         }
-        # DIFFERENCE: FQN
-        ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(table_name, row["table"], options)
+
+        if group.one?
+          options[:column] = row["from"]
+          options[:primary_key] = row["to"]
+        else
+          options[:column] = group.map { |row| row["from"] }
+          options[:primary_key] = group.map { |row| row["to"] }
+        end
+        ForeignKeyDefinition.new(table_name, row["table"], options)
       end
     end
 
@@ -342,6 +403,7 @@ module ArJdbc
         end
       end
 
+      sql << " RETURNING #{insert.returning}" if insert.returning
       sql
     end
 
@@ -349,6 +411,10 @@ module ArJdbc
       @config.fetch(:flags, 0).anybits?(::SQLite3::Constants::Open::SHAREDCACHE)
     end
 
+    def use_insert_returning?
+      @use_insert_returning
+    end
+
     def get_database_version # :nodoc:
       SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)", "SCHEMA"))
     end
@@ -359,6 +425,35 @@ module ArJdbc
       end
     end
 
+    # DIFFERENCE: here to 
+    def new_column_from_field(table_name, field, definitions)
+      default = field["dflt_value"]
+
+      type_metadata = fetch_type_metadata(field["type"])
+      default_value = extract_value_from_default(default)
+      generated_type = extract_generated_type(field)
+
+      if generated_type.present?
+        default_function = default
+      else
+        default_function = extract_default_function(default_value, default)
+      end
+
+      rowid = is_column_the_rowid?(field, definitions)
+
+      ActiveRecord::ConnectionAdapters::SQLite3Column.new(
+        field["name"],
+        default_value,
+        type_metadata,
+        field["notnull"].to_i == 0,
+        default_function,
+        collation: field["collation"],
+        auto_increment: field["auto_increment"],
+        rowid: rowid,
+        generated_type: generated_type
+      )
+    end
+
     private
     # See https://www.sqlite.org/limits.html,
     # the default value is 999 when not configured.
@@ -367,7 +462,12 @@ module ArJdbc
     end
 
     def table_structure(table_name)
-      structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", "SCHEMA")
+      structure = if supports_virtual_columns?
+        internal_exec_query("PRAGMA table_xinfo(#{quote_table_name(table_name)})", "SCHEMA")
+      else
+        internal_exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", "SCHEMA")
+      end
+
       raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
       table_structure_with_collation(table_name, structure)
     end
@@ -377,15 +477,18 @@ module ArJdbc
       case default
       when /^null$/i
         nil
-        # Quoted types
-      when /^'(.*)'$/m
+      # Quoted types
+      when /^'([^|]*)'$/m
         $1.gsub("''", "'")
-        # Quoted types
-      when /^"(.*)"$/m
+      # Quoted types
+      when /^"([^|]*)"$/m
         $1.gsub('""', '"')
-        # Numeric types
+      # Numeric types
       when /\A-?\d+(\.\d*)?\z/
         $&
+      # Binary columns
+      when /x'(.*)'/
+        [ $1 ].pack("H*")
       else
         # Anything else is blank or some function
         # and we can't know the value of that, so return nil.
@@ -398,14 +501,15 @@ module ArJdbc
     end
 
     def has_default_function?(default_value, default)
-      !default_value && %r{\w+\(.*\)|CURRENT_TIME|CURRENT_DATE|CURRENT_TIMESTAMP}.match?(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)
-      type.to_sym == :primary_key || options[:primary_key] ||
-        options[:null] == false && options[:default].nil?
+      type == :primary_key || options[:primary_key] ||
+        options[:null] == false && options[:default].nil? ||
+        (type == :virtual && options[:stored])
     end
 
     def alter_table(
@@ -461,24 +565,40 @@ module ArJdbc
              options[:rename][column.name.to_sym] ||
              column.name) : column.name
 
-          if column.has_default?
+          column_options = {
+            limit: column.limit,
+            precision: column.precision,
+            scale: column.scale,
+            null: column.null,
+            collation: column.collation,
+            primary_key: column_name == from_primary_key
+          }
+
+          if column.virtual?
+            column_options[:as] = column.default_function
+            column_options[:stored] = column.virtual_stored?
+            column_options[:type] = column.type
+          elsif column.has_default?
             type = lookup_cast_type_from_column(column)
             default = type.deserialize(column.default)
+            default = -> { column.default_function } if default.nil?
+
+            unless column.auto_increment?
+              column_options[:default] = default
+            end
           end
 
-          @definition.column(column_name, column.type,
-            limit: column.limit, default: default,
-            precision: column.precision, scale: column.scale,
-            null: column.null, collation: column.collation,
-            primary_key: column_name == from_primary_key
-          )
+          column_type = column.virtual? ? :virtual : (column.bigint? ? :bigint : column.type)
+          @definition.column(column_name, column_type, **column_options)
         end
 
         yield @definition if block_given?
       end
       copy_table_indexes(from, to, options[:rename] || {})
+
+      columns_to_copy = @definition.columns.reject { |col| col.options.key?(:as) }.map(&:name)
       copy_table_contents(from, to,
-        @definition.columns.map(&:name),
+        columns_to_copy,
         options[:rename] || {})
     end
 
@@ -519,8 +639,8 @@ module ArJdbc
       quoted_columns = columns.map { |col| quote_column_name(col) } * ","
       quoted_from_columns = from_columns_to_copy.map { |col| quote_column_name(col) } * ","
 
-      exec_query("INSERT INTO #{quote_table_name(to)} (#{quoted_columns})
-                     SELECT #{quoted_from_columns} FROM #{quote_table_name(from)}")
+      internal_exec_query("INSERT INTO #{quote_table_name(to)} (#{quoted_columns})
+                            SELECT #{quoted_from_columns} FROM #{quote_table_name(from)}")
     end
 
     def translate_exception(exception, message:, sql:, binds:)
@@ -530,46 +650,44 @@ module ArJdbc
       #   column *column_name* is not unique
       if exception.message.match?(/(column(s)? .* (is|are) not unique|UNIQUE constraint failed: .*)/i)
         # DIFFERENCE: FQN
-        ::ActiveRecord::RecordNotUnique.new(message, sql: sql, binds: binds)
+        ::ActiveRecord::RecordNotUnique.new(message, sql: sql, binds: binds, connection_pool: @pool)
       elsif exception.message.match?(/(.* may not be NULL|NOT NULL constraint failed: .*)/i)
         # DIFFERENCE: FQN
-        ::ActiveRecord::NotNullViolation.new(message, sql: sql, binds: binds)
+        ::ActiveRecord::NotNullViolation.new(message, sql: sql, binds: binds, connection_pool: @pool)
       elsif exception.message.match?(/FOREIGN KEY constraint failed/i)
         # DIFFERENCE: FQN
-        ::ActiveRecord::InvalidForeignKey.new(message, sql: sql, binds: binds)
+        ::ActiveRecord::InvalidForeignKey.new(message, sql: sql, binds: binds, connection_pool: @pool)
       elsif exception.message.match?(/called on a closed database/i)
         # DIFFERENCE: FQN
-        ::ActiveRecord::ConnectionNotEstablished.new(exception)
+        ::ActiveRecord::ConnectionNotEstablished.new(exception, connection_pool: @pool)
+      elsif exception.message.match?(/sql error/i)
+        ::ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds, connection_pool: @pool)
+      elsif exception.message.match?(/write a readonly database/i)
+        message = message.sub('org.sqlite.SQLiteException', 'SQLite3::ReadOnlyException')
+        ::ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds, connection_pool: @pool)
       else
         super
       end
     end
 
     COLLATE_REGEX = /.*\"(\w+)\".*collate\s+\"(\w+)\".*/i.freeze
+    PRIMARY_KEY_AUTOINCREMENT_REGEX = /.*\"(\w+)\".+PRIMARY KEY AUTOINCREMENT/i
+    GENERATED_ALWAYS_AS_REGEX = /.*"(\w+)".+GENERATED ALWAYS AS \((.+)\) (?:STORED|VIRTUAL)/i
 
     def table_structure_with_collation(table_name, basic_structure)
       collation_hash = {}
-      sql = <<~SQL
-        SELECT sql FROM
-          (SELECT * FROM sqlite_master UNION ALL
-           SELECT * FROM sqlite_temp_master)
-        WHERE type = 'table' AND name = #{quote(table_name)}
-      SQL
+      auto_increments = {}
+      generated_columns = {}
 
-      # Result will have following sample string
-      # CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-      #                       "password_digest" varchar COLLATE "NOCASE");
-      result = query_value(sql, "SCHEMA")
+      column_strings = table_structure_sql(table_name, basic_structure.map { |column| column["name"] })
 
-      if result
-        # Splitting with left parentheses and discarding the first part will return all
-        # columns separated with comma(,).
-        columns_string = result.split("(", 2).last
-
-        columns_string.split(",").each do |column_string|
+      if column_strings.any?
+        column_strings.each do |column_string|
           # This regex will match the column name and collation type and will save
           # the value in $1 and $2 respectively.
           collation_hash[$1] = $2 if COLLATE_REGEX =~ column_string
+          auto_increments[$1] = true if PRIMARY_KEY_AUTOINCREMENT_REGEX =~ column_string
+          generated_columns[$1] = $2 if GENERATED_ALWAYS_AS_REGEX =~ column_string
         end
 
         basic_structure.map do |column|
@@ -579,6 +697,14 @@ module ArJdbc
             column["collation"] = collation_hash[column_name]
           end
 
+          if auto_increments.has_key?(column_name)
+            column["auto_increment"] = true
+          end
+
+          if generated_columns.has_key?(column_name)
+            column["dflt_value"] = generated_columns[column_name]
+          end
+
           column
         end
       else
@@ -586,107 +712,96 @@ module ArJdbc
       end
     end
 
-    def arel_visitor
-      Arel::Visitors::SQLite.new(self)
-    end
+    UNQUOTED_OPEN_PARENS_REGEX = /\((?![^'"]*['"][^'"]*$)/
+    FINAL_CLOSE_PARENS_REGEX = /\);*\z/
 
-    def build_statement_pool
-      StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
-    end
+    def table_structure_sql(table_name, column_names = nil)
+      unless column_names
+        column_info = table_info(table_name)
+        column_names = column_info.map { |column| column["name"] }
+      end
 
-    def connect
-      @connection = ::SQLite3::Database.new(
-        @config[:database].to_s,
-        @config.merge(results_as_hash: true)
-      )
-    end
+      sql = <<~SQL
+        SELECT sql FROM
+          (SELECT * FROM sqlite_master UNION ALL
+           SELECT * FROM sqlite_temp_master)
+        WHERE type = 'table' AND name = #{quote(table_name)}
+      SQL
 
-    def configure_connection
-      # FIXME: missing from adapter
-#      @connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout])) if @config[:timeout]
+      # Result will have following sample string
+      # CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+      #                       "password_digest" varchar COLLATE "NOCASE",
+      #                       "o_id" integer,
+      #                       CONSTRAINT "fk_rails_78146ddd2e" FOREIGN KEY ("o_id") REFERENCES "os" ("id"));
+      result = query_value(sql, "SCHEMA")
 
-      execute("PRAGMA foreign_keys = ON", "SCHEMA")
-    end
+      return [] unless result
 
-  end
-  # DIFFERENCE: A registration here is moved down to concrete class so we are not registering part of an adapter.
-end
+      # Splitting with left parentheses and discarding the first part will return all
+      # columns separated with comma(,).
+      result.partition(UNQUOTED_OPEN_PARENS_REGEX)
+            .last
+            .sub(FINAL_CLOSE_PARENS_REGEX, "")
+            # column definitions can have a comma in them, so split on commas followed
+            # by a space and a column name in quotes or followed by the keyword CONSTRAINT
+            .split(/,(?=\s(?:CONSTRAINT|"(?:#{Regexp.union(column_names).source})"))/i)
+            .map(&:strip)
+    end
 
-module ActiveRecord::ConnectionAdapters
-  class SQLite3Column < JdbcColumn
-    def initialize(name, *args)
-      if Hash === name
-        super
+    def table_info(table_name)
+      if supports_virtual_columns?
+        internal_exec_query("PRAGMA table_xinfo(#{quote_table_name(table_name)})", "SCHEMA")
       else
-        super(nil, name, *args)
+        internal_exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", "SCHEMA")
       end
     end
 
-    def self.string_to_binary(value)
-      value
+    def arel_visitor
+      Arel::Visitors::SQLite.new(self)
     end
 
-    def self.binary_to_string(value)
-      if value.respond_to?(:encoding) && value.encoding != Encoding::ASCII_8BIT
-        value = value.force_encoding(Encoding::ASCII_8BIT)
-      end
-      value
+    def build_statement_pool
+      StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
     end
 
-    # @override {ActiveRecord::ConnectionAdapters::JdbcColumn#init_column}
-    def init_column(name, default, *args)
-      if default =~ /NULL/
-        @default = nil
+    def reconnect
+      if active?
+        @raw_connection.rollback rescue nil
       else
-        super
+        connect
       end
     end
 
-    # @override {ActiveRecord::ConnectionAdapters::JdbcColumn#default_value}
-    def default_value(value)
-      # JDBC returns column default strings with actual single quotes :
-      return $1 if value =~ /^'(.*)'$/
-
-      value
-    end
-
-    # @override {ActiveRecord::ConnectionAdapters::Column#type_cast}
-    def type_cast(value)
-      return nil if value.nil?
-      case type
-        when :string then value
-        when :primary_key
-          value.respond_to?(:to_i) ? value.to_i : ( value ? 1 : 0 )
-        when :float    then value.to_f
-        when :decimal  then self.class.value_to_decimal(value)
-        when :boolean  then self.class.value_to_boolean(value)
-        else super
+    def configure_connection
+      if @config[:timeout] && @config[:retries]
+        raise ArgumentError, "Cannot specify both timeout and retries arguments"
+      elsif @config[:timeout]
+        # FIXME: missing from adapter
+        # @raw_connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout]))
+      elsif @config[:retries]
+        retries = self.class.type_cast_config_to_integer(@config[:retries])
+        raw_connection.busy_handler do |count|
+          count <= retries
+        end
       end
-    end
-
-    private
 
-    # @override {ActiveRecord::ConnectionAdapters::Column#extract_limit}
-    def extract_limit(sql_type)
-      return nil if sql_type =~ /^(real)\(\d+/i
       super
-    end
 
-    def extract_precision(sql_type)
-      case sql_type
-        when /^(real)\((\d+)(,\d+)?\)/i then $2.to_i
-        else super
-      end
-    end
-
-    def extract_scale(sql_type)
-      case sql_type
-        when /^(real)\((\d+)\)/i then 0
-        when /^(real)\((\d+)(,(\d+))\)/i then $4.to_i
-        else super
+      pragmas = @config.fetch(:pragmas, {}).stringify_keys
+      DEFAULT_PRAGMAS.merge(pragmas).each do |pragma, value|
+        if ::SQLite3::Pragmas.respond_to?(pragma)
+          stmt = ::SQLite3::Pragmas.public_send(pragma, value)
+          raw_execute(stmt, "SCHEMA")
+        else
+          warn "Unknown SQLite pragma: #{pragma}"
+        end
       end
     end
   end
+  # DIFFERENCE: A registration here is moved down to concrete class so we are not registering part of an adapter.
+end
+
+module ActiveRecord::ConnectionAdapters
 
   remove_const(:SQLite3Adapter) if const_defined?(:SQLite3Adapter)
 
@@ -695,13 +810,77 @@ module ActiveRecord::ConnectionAdapters
   # ActiveRecord::ConnectionAdapters::SQLite3Adapter.  Once we can do that we can remove the
   # module SQLite3 above and remove a majority of this file.
   class SQLite3Adapter < AbstractAdapter
+    ADAPTER_NAME = "SQLite"
+
+    class << self
+      def new_client(conn_params, adapter_instance)
+        jdbc_connection_class.new(conn_params, adapter_instance)
+      end
+
+      def dbconsole(config, options = {})
+        args = []
+
+        args << "-#{options[:mode]}" if options[:mode]
+        args << "-header" if options[:header]
+        args << File.expand_path(config.database, const_defined?(:Rails) && Rails.respond_to?(:root) ? Rails.root : nil)
+
+        find_cmd_and_exec("sqlite3", *args)
+      end
+
+      def jdbc_connection_class
+        ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
+      end
+    end
+
+    # NOTE: include these modules before all then override some methods with the
+    # ones defined in ArJdbc::SQLite3 java part and ArJdbc::Abstract
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
+
     include ArJdbc::Abstract::Core
     include ArJdbc::SQLite3
+    include ArJdbc::SQLite3Config
+
     include ArJdbc::Abstract::ConnectionManagement
     include ArJdbc::Abstract::DatabaseStatements
     include ArJdbc::Abstract::StatementCache
     include ArJdbc::Abstract::TransactionSupport
 
+
+    ##
+    # :singleton-method:
+    # Configure the SQLite3Adapter to be used in a strict strings mode.
+    # This will disable double-quoted string literals, because otherwise typos can silently go unnoticed.
+    # For example, it is possible to create an index for a non existing column.
+    # If you wish to enable this mode you can add the following line to your application.rb file:
+    #
+    #   config.active_record.sqlite3_adapter_strict_strings_by_default = true
+    class_attribute :strict_strings_by_default, default: false # Does not actually do anything right now
+
+    def initialize(...)
+      super
+
+      @memory_database = false
+      case @config[:database].to_s
+      when ""
+        raise ArgumentError, "No database file specified. Missing argument: database"
+      when ":memory:"
+        @memory_database = true
+      end
+
+      # assign arjdbc extra connection params
+      conn_params = build_connection_config(@config.compact)
+
+      # NOTE: strict strings is not supported by the jdbc driver yet,
+      # hope it will supported soon, I open a issue in their repository.
+      #   https://github.com/xerial/sqlite-jdbc/issues/1153
+      #
+      # @config[:strict] = ConnectionAdapters::SQLite3Adapter.strict_strings_by_default unless @config.key?(:strict)
+
+      @connection_parameters = conn_params
+    end
+
     def self.represent_boolean_as_integer=(value) # :nodoc:
       if value == false
         raise "`.represent_boolean_as_integer=` is now always true, so make sure your application can work with it and remove this settings."
@@ -736,23 +915,15 @@ module ActiveRecord::ConnectionAdapters
     # SQLite driver doesn't support all types of insert statements with executeUpdate so
     # make it act like a regular query and the ids will be returned from #last_inserted_id
     # example: INSERT INTO "aircraft" DEFAULT VALUES
-    def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
-      exec_query(sql, name, binds)
+    def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil, returning: nil)
+      sql, binds = sql_for_insert(sql, pk, binds, returning)
+      internal_exec_query(sql, name, binds)
     end
 
     def jdbc_column_class
       ::ActiveRecord::ConnectionAdapters::SQLite3Column
     end
 
-    def jdbc_connection_class(spec)
-      self.class.jdbc_connection_class
-    end
-
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
-    def self.jdbc_connection_class
-      ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
-    end
-
     # Note: This is not an override of ours but a moved line from AR Sqlite3Adapter to register ours vs our copied module (which would be their class).
 #    ActiveSupport.run_load_hooks(:active_record_sqlite3adapter, SQLite3Adapter)