Skip to content

Commit ccd621f

Browse files
committed
Restore compatibility with Rails 6.0.2
1 parent bff2696 commit ccd621f

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

lib/arjdbc/postgresql/adapter.rb

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,11 @@ def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
384384
end
385385

386386
def execute_batch(statements, name = nil)
387-
execute(combine_multi_statements(statements), name)
387+
if statements.is_a? Array
388+
execute(combine_multi_statements(statements), name)
389+
else
390+
execute(statements, name)
391+
end
388392
end
389393

390394
def explain(arel, binds = [])
@@ -444,8 +448,13 @@ def build_insert_sql(insert) # :nodoc:
444448
sql
445449
end
446450

447-
def build_truncate_statements(table_names)
448-
["TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"]
451+
def build_truncate_statements(*table_names)
452+
["TRUNCATE TABLE #{table_names.flatten.map(&method(:quote_table_name)).join(", ")}"]
453+
end
454+
455+
def truncate(table_name, name = nil)
456+
ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
457+
execute("TRUNCATE TABLE #{quote_table_name(table_name)}", name)
449458
end
450459

451460
def all_schemas

lib/arjdbc/sqlite3/adapter.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,15 @@ def build_truncate_statement(table_name)
327327
"DELETE FROM #{quote_table_name(table_name)}"
328328
end
329329

330+
def build_truncate_statements(*table_names)
331+
table_names.flatten.map { |table_name| build_truncate_statement table_name }
332+
end
333+
334+
def truncate(table_name, name = nil)
335+
ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
336+
execute(build_truncate_statement(table_name), name)
337+
end
338+
330339
def check_version
331340
if database_version < "3.8.0"
332341
raise "Your version of SQLite (#{database_version}) is too old. Active Record supports SQLite >= 3.8."

0 commit comments

Comments
 (0)