fix column_initialization, translate_exception,...

Author: Felix Gebhard

Gemfile

@@ -34,7 +34,7 @@ else
     end
   end
 
-  gem 'rails', git: "git://github.com/rails/rails.git", tag: "v6.0.2.1"
+  gem 'rails', git: "https://github.com/rails/rails.git", tag: "v6.0.2.1"
   # gem 'rails', git: "git://github.com/rails/rails.git", tag: "v#{version}"
 end
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -321,15 +321,15 @@ def initialize_type_map(m = type_map)
         m.register_type              'timestamp',         SQLServer::Type::Timestamp.new
       end
 
-      def translate_exception(e, message)
+      def translate_exception(e, message:, sql:, binds:)
         case message
         when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
           RecordNotUnique.new(message)
         when /conflicted with the foreign key constraint/i
           InvalidForeignKey.new(message)
         when /has been chosen as the deadlock victim/i
           DeadlockVictim.new(message)
-        when /database .* does not exist/i
+        when /'doesnotexist'((?!').)*does not exist/
           NoDatabaseError.new(message)
         when /data would be truncated/
           ValueTooLong.new(message)

lib/active_record/connection_adapters/sqlserver_column.rb

@@ -2,15 +2,14 @@ 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 = {}
-        @name = name.freeze
-        @sql_type_metadata = sql_type_metadata
-        @null = null
-        @default = default
-        @default_function = default_function
-        @collation = 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)
+        @sqlserver_options = sqlserver_options || {}
+        @table_name = table_name
+        super(name, default, sql_type_metadata, null, default_function, collation: collation, comment: comment, **sqlserver_options)
+      end
+
+      def table_name
+        @table_name
       end
 
       def is_identity?

test/cases/migration_test_sqlserver.rb

@@ -20,7 +20,7 @@ class MigrationTestSQLServer < ActiveRecord::TestCase
     it 'not create a tables if error in migrations' do
       begin
         migrations_dir = File.join ARTest::SQLServer.migrations_root, 'transaction_table'
-        quietly { ActiveRecord::MigrationContext.new(migrations_dir).up }
+        quietly { ActiveRecord::MigrationContext.new(migrations_dir, ActiveRecord::SchemaMigration).up } # TODO: ActiveRecord::SchemaMigration???
       rescue Exception => e
         assert_match %r|this and all later migrations canceled|, e.message
       end

test/cases/rake_test_sqlserver.rb

@@ -77,8 +77,10 @@ class SQLServerRakeDropTest < SQLServerRakeTest
   end
 
   it 'prints error message when database does not exist' do
-    message = capture(:stderr) { db_tasks.drop configuration.merge('database' => 'doesnotexist') }
-    _(message).must_match %r{'doesnotexist' does not exist}
+    message = capture(:stderr) { 
+      db_tasks.drop configuration.merge('database' => 'doesnotexist') 
+    }
+    _(message).must_match %r{'doesnotexist'((?!').)*does not exist}
   end
 
 end