Skip to content

Remove special cases for 8.0 support #1226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 3 commits into from
Sep 29, 2026
Merged

Remove special cases for 8.0 support #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
053f532
These methods no lonegr exist in 8.1
headius Sep 29, 2026
2402d6b
cast_type is always passed in 8.1
headius Sep 29, 2026
2e2452a
Just use the Rails 8.1 fetch_cast_type here
headius Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions lib/arjdbc/abstract/database_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,15 @@ module DatabaseStatements

NO_BINDS = [].freeze

unless ::ActiveRecord::ConnectionAdapters::AbstractAdapter.method_defined?(:mark_transaction_written_if_write)
def mark_transaction_written_if_write(sql)
if write_query?(sql)
ensure_writes_are_allowed(sql)
mark_transaction_written
end
def mark_transaction_written_if_write(sql)
if write_query?(sql)
ensure_writes_are_allowed(sql)
mark_transaction_written
end
end

unless ::ActiveRecord::ConnectionAdapters::AbstractAdapter.method_defined?(:check_if_write_query)
def check_if_write_query(sql)
ensure_writes_are_allowed(sql) if write_query?(sql)
end
def check_if_write_query(sql)
ensure_writes_are_allowed(sql) if write_query?(sql)
end

def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil, returning: nil)
Expand Down
7 changes: 2 additions & 5 deletions lib/arjdbc/sqlite3/adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ module SQLite3
"cache_size" => 2000
}

COLUMN_TAKES_CAST_TYPE = ConnectionAdapters::Column.instance_method(:initialize).
parameters.any? { |_kind, name| name == :cast_type }

class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
private
def dealloc(stmt)
Expand Down Expand Up @@ -475,7 +472,7 @@ def new_column_from_field(table_name, field, definitions)
rowid = is_column_the_rowid?(field, definitions)

column_args = [field["name"]]
column_args << lookup_cast_type(field["type"]) if COLUMN_TAKES_CAST_TYPE
column_args << lookup_cast_type(field["type"])
column_args.push(
default_value,
type_metadata,
Expand Down Expand Up @@ -617,7 +614,7 @@ def copy_table(from, to, options = {})
column_options[:stored] = column.virtual_stored?
column_options[:type] = column.type
elsif column.has_default?
type = column.respond_to?(:fetch_cast_type) ? column.fetch_cast_type(self) : lookup_cast_type_from_column(column)
type = column.fetch_cast_type(self)
default = type.deserialize(column.default)
default = -> { column.default_function } if default.nil?

Expand Down
Loading