Skip to content

rails 6.0 dependency #714

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

Closed
wants to merge 3 commits into from
Closed

rails 6.0 dependency #714

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
b4f558e
testing
serkaniyigun Oct 13, 2019
a78b6eb
sql_for_insert fix
serkaniyigun Oct 13, 2019
b09d7bf
rails 6.0 has been released
dglaser Nov 15, 2019
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
2 changes: 1 addition & 1 deletion activerecord-sqlserver-adapter.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']
spec.add_dependency 'activerecord', '~> 6.0.0.beta3'
spec.add_dependency 'activerecord', '~> 6.0.0'
spec.add_dependency 'tiny_tds'
end
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/sqlserver/database_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def newsequentialid_function

protected

def sql_for_insert(sql, pk, sequence_name, binds)
def sql_for_insert(sql, pk, binds)
if pk.nil?
table_name = query_requires_identity_insert?(sql)
pk = primary_key(table_name)
Expand Down
12 changes: 9 additions & 3 deletions lib/active_record/connection_adapters/sqlserver_column.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@ module ActiveRecord
module ConnectionAdapters
class SQLServerColumn < Column

def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment = nil, sqlserver_options = {})
@sqlserver_options = sqlserver_options || {}
super(name, default, sql_type_metadata, null, table_name, default_function, collation, comment: comment)
def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment = nil, **)
@sqlserver_options = {}
@name = name.freeze
@sql_type_metadata = sql_type_metadata
@null = null
@default = default
@default_function = default_function
@collation = collation
@comment = comment
end

def is_identity?
Expand Down