From fb1efcaf91511285a0a656621a823a97a75975b3 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 14 Nov 2005 22:24:55 +0000
Subject: SQLServer: insert uses given primary key value if not nil rather than
SELECT @@IDENTITY. References #2866.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3035 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'activerecord/lib/active_record/connection_adapters')
diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
index fecc6a7e1c..ec85c88c61 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -236,7 +236,7 @@ module ActiveRecord
end
log(sql, name) do
@connection.execute(sql)
- select_one("SELECT @@IDENTITY AS Ident")["Ident"]
+ id_value || select_one("SELECT @@IDENTITY AS Ident")["Ident"]
end
ensure
if ii_enabled
--
cgit v1.2.3