@@ -445,8 +445,8 @@ module ActiveRecord end def find_table_primary_key_columns(table_name) - @@find_table_primary_key_columns_cache ||= {} - if @@find_table_primary_key_columns_cache[table_name].nil? + @find_table_primary_key_columns_cache ||= {} + if @find_table_primary_key_columns_cache[table_name].nil? table_name = table_name.split('.').last.delete("[]") sql = "SELECT KU.COLUMN_NAME @@ -458,11 +458,11 @@ module ActiveRecord ORDER BY KU.TABLE_NAME, KU.ORDINAL_POSITION" primary_columns = select_rows(sql) - @@find_table_primary_key_columns_cache[table_name] = + @find_table_primary_key_columns_cache[table_name] = primary_columns.collect {|row| "[#{table_name}].[#{row[0]}]"}.join ', ' end - @@find_table_primary_key_columns_cache[table_name] + @find_table_primary_key_columns_cache[table_name] end def add_limit_offset!(sql, options) lib/active_record/connection_adapters/sqlserver_adapter.rb 8d820ce02efdb4e6ddae94a9359063ef141073da Richard Penwell almightylinuxgod@me.com http://github.com/penwellr/2000-2005-adapter/commit/31b7a5cb39c5eb7a73695ac3079f63039b8efb1d 31b7a5cb39c5eb7a73695ac3079f63039b8efb1d 2009-10-15T12:15:20-07:00 2009-10-15T12:15:20-07:00 Made revision to primary key cache to ensure that it is per instance rather then global 54e5cb41bd33e142a91c8752d3ef7827046e5e5a Richard Penwell almightylinuxgod@me.com