Skip to content
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.

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

Upgrade to rails 6 #39

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Upgrade to rails 6
  • Loading branch information
Shehbaz committed Sep 29, 2020
commit abdfd4593514d395c35b98c01bd5330e008f82d9
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/odbc_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def disconnect!
# Build a new column object from the given options. Effectively the same
# as super except that it also passes in the native type.
# rubocop:disable Metrics/ParameterLists
def new_column(name, default, sql_type_metadata, null, table_name, default_function = nil, collation = nil, native_type = nil)
def new_column(name, default, sql_type_metadata, null, default_function = nil)
::ODBCAdapter::Column.new(name, default, sql_type_metadata, null, table_name, default_function, collation, native_type)
end

Expand Down
4 changes: 2 additions & 2 deletions lib/odbc_adapter/column.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ class Column < ActiveRecord::ConnectionAdapters::Column
# Add the native_type accessor to allow the native DBMS to report back what
# it uses to represent the column internally.
# rubocop:disable Metrics/ParameterLists
def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, native_type = nil, default_function = nil, collation = nil)
super(name, default, sql_type_metadata, null, table_name, default_function, collation)
def initialize(name, default, sql_type_metadata = nil, null = true, native_type = nil, default_function = nil)
super(name, default, sql_type_metadata, null, default_function)
@native_type = native_type
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/odbc_adapter/schema_statements.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def columns(table_name, _name = nil)
end
sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(**args)

cols << new_column(format_case(col_name), col_default, sql_type_metadata, col_nullable, table_name, col_native_type)
cols << new_column(format_case(col_name), col_default, sql_type_metadata, col_nullable, col_native_type)
end
end

Expand Down
2 changes: 1 addition & 1 deletion odbc_adapter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']

spec.add_dependency 'activerecord', '>= 5.2.1'
spec.add_dependency 'activerecord', '>= 6.0.1'
spec.add_dependency 'ruby-odbc', '~> 0.9'

spec.add_development_dependency 'bundler', '~> 1.14'
Expand Down