activerecord 3.1.2 → 3.1.3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 3.1.3 (unreleased) ##
+
+*   Perf fix: If we're deleting all records in an association, don't add a IN(..) clause
+    to the query. *GH 3672*
+
+    *Jon Leighton*
+
+*   Fix bug with referencing other mysql databases in set_table_name. *GH 3690*
+
+*   Fix performance bug with mysql databases on a server with lots of other databses. *GH 3678*
+
+    *Christos Zisopoulos and Kenny J*
+
 ## Rails 3.1.2 (unreleased) ##
 
 *   Fix problem with prepared statements and PostgreSQL when multiple schemas are used.

data/lib/active_record/associations/has_many_association.rb

@@ -89,8 +89,12 @@ module ActiveRecord
             records.each { |r| r.destroy }
             update_counter(-records.length) unless inverse_updates_counter_cache?
           else
-            keys  = records.map { |r| r[reflection.association_primary_key] }
-            scope = scoped.where(reflection.association_primary_key => keys)
+            scope = scoped
+
+            unless records == load_target
+              keys  = records.map { |r| r[reflection.association_primary_key] }
+              scope = scoped.where(reflection.association_primary_key => keys)
+            end
 
             if method == :delete_all
               update_counter(-scope.delete_all)

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -573,18 +573,9 @@ module ActiveRecord
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table)
         keys = []
-        sql = <<-SQL
-          SELECT t.constraint_type, k.column_name
-          FROM information_schema.table_constraints t
-          JOIN information_schema.key_column_usage k
-          USING (constraint_name, table_schema, table_name)
-          WHERE t.table_schema = DATABASE()
-            AND t.table_name   = '#{table}'
-        SQL
-
-        result = execute(sql, 'SCHEMA')
+        result = execute("SHOW INDEX FROM #{quote_table_name(table)} WHERE Key_name = 'PRIMARY'", 'SCHEMA')
         result.each(:symbolize_keys => true, :as => :hash) do |row|
-          keys << row[:column_name] if row[:constraint_type] == "PRIMARY KEY"
+          keys << row[:Column_name]
         end
         keys.length == 1 ? [keys.first, nil] : nil
       end

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -756,18 +756,9 @@ module ActiveRecord
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table) #:nodoc:
         keys = []
-        sql = <<-SQL
-          SELECT t.constraint_type, k.column_name
-          FROM information_schema.table_constraints t
-          JOIN information_schema.key_column_usage k
-          USING (constraint_name, table_schema, table_name)
-          WHERE t.table_schema = DATABASE()
-            AND t.table_name   = '#{table}'
-        SQL
-
-        result = execute(sql, 'SCHEMA')
+        result = execute("SHOW INDEX FROM #{quote_table_name(table)} WHERE Key_name = 'PRIMARY'", 'SCHEMA')
         result.each_hash do |h|
-          keys << h["column_name"] if h["constraint_type"] == "PRIMARY KEY"
+          keys << h["Column_name"]
         end
         result.free
         keys.length == 1 ? [keys.first, nil] : nil

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2011-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 1
-        - 2
-        version: 3.1.2
+        - 3
+        version: 3.1.3
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
         - 1
-        - 2
-        version: 3.1.2
+        - 3
+        version: 3.1.3
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: arel