Pass PrimaryKeyIntegerNilDefaultTest tests.

* Allow create tables with PKs like `[id] integer DEFAULT NUL NOT NULL PRIMARY KEY`
* Note how IDENTITY(1,1) incrementing is not present. Not allowed with columns that have defaults.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/schema_creation.rb

@@ -28,6 +28,14 @@ def action_sql(action, dependency)
           end
         end
 
+        def options_include_default?(options)
+          super || options_primary_key_with_nil_default?(options)
+        end
+
+        def options_primary_key_with_nil_default?(options)
+          options[:primary_key] && options.include?(:default) && options[:default].nil?
+        end
+
       end
     end
   end

lib/active_record/connection_adapters/sqlserver/schema_dumper.rb

@@ -5,11 +5,19 @@ module SchemaDumper
 
         private
 
+        def explicit_primary_key_default?(column)
+          column.is_primary? && !column.is_identity?
+        end
+
         def schema_collation(column)
           return unless column.collation
           column.collation if column.collation != collation
         end
 
+        def default_primary_key?(column)
+          super && column.is_primary? && column.is_identity?
+        end
+
       end
     end
   end

lib/active_record/connection_adapters/sqlserver/table_definition.rb

@@ -5,10 +5,11 @@ module SQLServer
       module ColumnMethods
 
         def primary_key(name, type = :primary_key, **options)
-          return super unless type == :uuid
-          options[:default] = options.fetch(:default, 'NEWID()')
-          options[:primary_key] = true
-          column name, type, options
+          if type == :uuid
+            options[:default] = options.fetch(:default, 'NEWID()')
+            options[:primary_key] = true
+          end
+          super
         end
 
         def primary_key_nonclustered(*args, **options)
@@ -98,9 +99,12 @@ def json(*args, **options)
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
         include ColumnMethods
 
-        def new_column_definition(name, type, options)
-          type = :datetime2 if type == :datetime && options[:precision]
-          super name, type, options
+        def new_column_definition(name, type, **options)
+          case type
+          when :datetime
+            type = :datetime2 if options[:precision]
+          end
+          super
         end
       end