Ticket #6580: sqlserver_trusted_connection_complete_patch.diff

activerecord/test/connections/native_sqlserver/connection.rb

@@ -16 +16 @@
-    :host     => 'localhost',
-    :username => 'sa',
-    :database => 'activerecord_unittest2'
+  },
+  'arunit_trusted' => {
+    :adapter  => 'sqlserver',
+    :host     => 'localhost',
+    :windows_auth => true,
+    :database => 'activerecord_unittest'
-  }
-}
-

activerecord/test/adapter_test_sqlserver.rb

@@ -19 +19 @@
-  def test_real_column_has_float_type
-    assert_equal :float, TableWithRealColumn.columns_hash["real_number"].type
-  end
+  
+  if ActiveRecord::Base.configurations['arunit_trusted']
+    def test_trusted_connection
+      # open trusted connection
+      ActiveRecord::Base.establish_connection 'arunit_trusted'
+      @connection = ActiveRecord::Base.connection    
+      assert_equal true, @connection.active?
+      # restore old connection
+    ensure
+      ActiveRecord::Base.establish_connection 'arunit'
+      @connection = ActiveRecord::Base.connection
+      assert_equal true, @connection.active?
+    end
+  end
-
-  # SQL Server 2000 has a bug where some unambiguous date formats are not 
-  # correctly identified if the session language is set to german

activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -32 +32 @@
-      mode        = config[:mode] ? config[:mode].to_s.upcase : 'ADO'
-      username    = config[:username] ? config[:username].to_s : 'sa'
-      password    = config[:password] ? config[:password].to_s : ''
+      auth        = config[:windows_auth] ? 'Integrated Security=SSPI' : "User ID=#{username};Password=#{password}"
-      autocommit  = config.key?(:autocommit) ? config[:autocommit] : true
-      if mode == "ODBC"
-        raise ArgumentError, "Missing DSN. Argument ':dsn' must be set in order for this adapter to work." unless config.has_key?(:dsn)
@@ -41 +42 @@
-        raise ArgumentError, "Missing Database. Argument ':database' must be set in order for this adapter to work." unless config.has_key?(:database)
-        database  = config[:database]
-        host      = config[:host] ? config[:host].to_s : 'localhost'
-User ID=#{username};Password=#{password
+#{auth
-      end
-      conn      = DBI.connect(driver_url, username, password)
-      conn["AutoCommit"] = autocommit