kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixes a problem with the SQL Adapter which was resulting in IDENTITY_INSERT not being set to ON when it should be #1104 [adelle]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-04-17 13:59:02 +00:00
parent 44073321a8
commit 7ff635c8eb
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN*
* Fixes a problem with the SQL Adapter which was resulting in IDENTITY_INSERT not being set to ON when it should be #1104 [adelle]
* Added the option to specify the acceptance string in validates_acceptance_of #1106 [caleb@aei-tech.com]
* Added acts_as_nested_set #1000 [wschenk]. Introduction:

3
activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
View file

@ -203,7 +203,6 @@ module ActiveRecord
end
end
end
log(sql, name, @connection) do |conn|
conn.execute(sql)
select_one("SELECT @@IDENTITY AS Ident")["Ident"]
@ -362,7 +361,7 @@ module ActiveRecord
end
def query_contains_identity_column(sql, col)
return sql =~ /[\(\.\,]\s*#{col}/
return sql =~ /[\[.,]\s*#{col}/
end
def get_order_by(sql)