@@ -1,6 +1,9 @@ MASTER +* Allow query_requires_identity_insert? method to return quoted table name in situations where the + INSERT parts are not quoted themselves. [Gary/iawgens, Richard Penwell, Ken Collins] + * Fixed namespace in calling test_sqlserver_odbc within test_unicode_types. [Gary/iawgens] * Columns with multi-line defaults work correctly. [bfabry] CHANGELOG @@ -946,7 +946,7 @@ module ActiveRecord if insert_sql?(sql) table_name = get_table_name(sql) id_column = identity_column(table_name) - id_column && sql =~ /INSERT[^(]+\([^)]*\[#{id_column.name}\][^)]*\)/i ? table_name : false + id_column && sql =~ /INSERT[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false else false end lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -328,10 +328,14 @@ class AdapterTestSqlserver < ActiveRecord::TestCase setup do @identity_insert_sql = "INSERT INTO [funny_jokes] ([id],[name]) VALUES(420,'Knock knock')" + @identity_insert_sql_unquoted = "INSERT INTO funny_jokes (id, name) VALUES(420, 'Knock knock')" + @identity_insert_sql_unordered = "INSERT INTO [funny_jokes] ([name],[id]) VALUES('Knock knock',420)" end - should 'return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id_column' do + should 'return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id column' do assert_equal '[funny_jokes]', @connection.send(:query_requires_identity_insert?,@identity_insert_sql) + assert_equal '[funny_jokes]', @connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted) + assert_equal '[funny_jokes]', @connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered) end should 'return false to #query_requires_identity_insert? for normal SQL' do test/cases/adapter_test_sqlserver.rb 92c2d77b8240f78066843484b62fe0b8ff34447f Ken Collins ken@metaskills.net http://github.com/rails-sqlserver/2000-2005-adapter/commit/4d208acc503bfb31f67857dfc1acae48e857d954 4d208acc503bfb31f67857dfc1acae48e857d954 2009-11-02T12:41:21-08:00 2009-11-02T12:41:21-08:00 Allow query_requires_identity_insert? method to return quoted table name in situations where the INSERT parts are not quoted themselves. 864663771811b59bff8f4ff9d859c1a705dc226f Ken Collins ken@metaskills.net