Skip to content

Commit 3be1cb8

Browse files
committed
Adapt to changed method signature in Rails 6.0.
1 parent 1057a81 commit 3be1cb8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def newsequentialid_function
223223

224224
protected
225225

226-
def sql_for_insert(sql, pk, sequence_name, binds)
226+
def sql_for_insert(sql, pk, binds)
227227
if pk.nil?
228228
table_name = query_requires_identity_insert?(sql)
229229
pk = primary_key(table_name)

lib/active_record/connection_adapters/sqlserver_column.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class SQLServerColumn < Column
44

55
def initialize(name, default, sql_type_metadata = nil, null = true, table_name = nil, default_function = nil, collation = nil, comment = nil, sqlserver_options = {})
66
@sqlserver_options = sqlserver_options || {}
7-
super(name, default, sql_type_metadata, null, table_name, default_function, collation, comment: comment)
7+
super(name, default, sql_type_metadata, null, default_function, collation: collation, comment: comment)
88
end
99

1010
def is_identity?

0 commit comments

Comments
 (0)