Merge pull request #1 from wpolicarpo/fix-schema-dumper

Fix SchemaDumper usage

Author: matthewdunbar

lib/active_record/connection_adapters/sqlserver/schema_dumper.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
-      module SchemaDumper
+      class SchemaDumper < ConnectionAdapters::SchemaDumper
 
         SQLSEVER_NO_LIMIT_TYPES = [
           'text',
@@ -24,7 +24,7 @@ def schema_limit(column)
 
         def schema_collation(column)
           return unless column.collation
-          column.collation if column.collation != collation
+          column.collation if column.collation != @connection.collation
         end
 
         def default_primary_key?(column)

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -265,6 +265,10 @@ def change_column_null(table_name, column_name, allow_null, default = nil)
           do_execute sql
         end
 
+        def create_schema_dumper(options)
+          SQLServer::SchemaDumper.create(self, options)
+        end
+
         private
 
         def data_source_sql(name = nil, type: nil)

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -35,7 +35,6 @@ class SQLServerAdapter < AbstractAdapter
               SQLServer::Quoting,
               SQLServer::DatabaseStatements,
               SQLServer::Showplan,
-              SQLServer::SchemaDumper,
               SQLServer::SchemaStatements,
               SQLServer::DatabaseLimits,
               SQLServer::DatabaseTasks

lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -51,7 +51,7 @@ def purge
       def structure_dump(filename, extra_flags)
         command = [
           "defncopy-ttds",
-          "-S #{Shellwords.escape(configuration['host'])}",
+          "-S #{Shellwords.escape(configuration['host'])}:#{Shellwords.escape(configuration['port'])}",
           "-D #{Shellwords.escape(configuration['database'])}",
           "-U #{Shellwords.escape(configuration['username'])}",
           "-P #{Shellwords.escape(configuration['password'])}",