Merge pull request #1048 from dr-itz/rails6-dev

Rails 6.0 fixes

Author: enebo

lib/arjdbc/postgresql/adapter.rb

@@ -303,6 +303,10 @@ def supports_optimizer_hints?
       @has_pg_hint_plan
     end
 
+    def supports_common_table_expressions?
+      true
+    end
+
     def supports_lazy_transactions?
       true
     end
@@ -379,13 +383,23 @@ def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
       end
     end
 
+    def execute_batch(statements, name = nil)
+      if statements.is_a? Array
+        execute(combine_multi_statements(statements), name)
+      else
+        execute(statements, name)
+      end
+    end
+
     def explain(arel, binds = [])
       sql, binds = to_sql_and_binds(arel, binds)
       ActiveRecord::ConnectionAdapters::PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query("EXPLAIN #{sql}", 'EXPLAIN', binds))
     end
 
     # from ActiveRecord::ConnectionAdapters::PostgreSQL::DatabaseStatements
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback) # :nodoc:
+    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+      :begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback, :with
+    ) # :nodoc:
     private_constant :READ_QUERY
 
     def write_query?(sql) # :nodoc:
@@ -435,7 +449,12 @@ def build_insert_sql(insert) # :nodoc:
     end
 
     def build_truncate_statements(*table_names)
-      "TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"
+      ["TRUNCATE TABLE #{table_names.flatten.map(&method(:quote_table_name)).join(", ")}"]
+    end
+
+    def truncate(table_name, name = nil)
+      ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
+      execute("TRUNCATE TABLE #{quote_table_name(table_name)}", name)
     end
 
     def all_schemas

lib/arjdbc/sqlite3/adapter.rb

@@ -97,6 +97,10 @@ def supports_json?
       true
     end
 
+    def supports_common_table_expressions?
+      database_version >= "3.8.3"
+    end
+
     def supports_insert_on_conflict?
       database_version >= "3.24.0"
     end
@@ -154,7 +158,9 @@ def disable_referential_integrity # :nodoc:
     # DATABASE STATEMENTS ======================================
     #++
 
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :explain, :select, :pragma, :release, :savepoint, :rollback) # :nodoc:
+    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+      :begin, :commit, :explain, :select, :pragma, :release, :savepoint, :rollback, :with
+    ) # :nodoc:
     private_constant :READ_QUERY
 
     def write_query?(sql) # :nodoc:
@@ -317,11 +323,17 @@ 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)}"
+    end
+
     def build_truncate_statements(*table_names)
-      truncate_tables = table_names.map do |table_name|
-        "DELETE FROM #{quote_table_name(table_name)}"
-      end
-      combine_multi_statements(truncate_tables)
+      table_names.flatten.map { |table_name| build_truncate_statement table_name }
+    end
+
+    def truncate(table_name, name = nil)
+      ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
+      execute(build_truncate_statement(table_name), name)
     end
 
     def check_version
@@ -352,7 +364,8 @@ def table_structure(table_name)
     # 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]
+      type.to_sym == :primary_key || options[:primary_key] ||
+        options[:null] == false && options[:default].nil?
     end
 
     def alter_table(table_name, foreign_keys = foreign_keys(table_name), **options)