From b4f558e6927a05d46fe92e00e7ae2bd9d250f2b9 Mon Sep 17 00:00:00 2001 From: Serkan Iyigun Date: Sun, 13 Oct 2019 23:37:32 +0300 Subject: [PATCH 1/3] testing --- .../connection_adapters/sqlserver_column.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/active_record/connection_adapters/sqlserver_column.rb b/lib/active_record/connection_adapters/sqlserver_column.rb index 6644a0ca1..56955794e 100644 --- a/lib/active_record/connection_adapters/sqlserver_column.rb +++ b/lib/active_record/connection_adapters/sqlserver_column.rb @@ -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? From a78b6ebed5dc2197d35e9dcc094764ff2e16aa72 Mon Sep 17 00:00:00 2001 From: Serkan Iyigun Date: Sun, 13 Oct 2019 23:41:43 +0300 Subject: [PATCH 2/3] sql_for_insert fix --- .../connection_adapters/sqlserver/database_statements.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb index b01f8bf69..6ad269b4c 100644 --- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb @@ -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) From b09d7bfe59e96b8773c81a14e2bf3f1bc3c0c66d Mon Sep 17 00:00:00 2001 From: Dale Glaser Date: Thu, 14 Nov 2019 22:54:24 -0600 Subject: [PATCH 3/3] rails 6.0 has been released --- activerecord-sqlserver-adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index c71c1167d..783e7742e 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -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