activerecord 4.0.9 → 4.0.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c03598a80e4948e20c4365cd9c27736d19ff1c9
-  data.tar.gz: 434049ee7aba353e571a54c3b8658a693ea323c0
+  metadata.gz: 9e2615e59df2a45d733db0443fc18cdcbbe8c23a
+  data.tar.gz: 4f80740add455d8f6216565e6173b926d3966098
 SHA512:
-  metadata.gz: a2009b19504ecb4c0e58fd4c4d527e934bfcf916dcc751250a19b6f216534fb4a2bcbcad81cb13f93e12e4bc3548faffb5325a5df0fab7c7263e5c147d13e5e6
-  data.tar.gz: c07330c8216c0d36a0c5bf0a081550469a36647ac26d4cc43a570ddb93c62bf3044fd4fd8631cf11430193f50fb9f04f7c44b1b09b9f7ab9afbd647a24327dca
+  metadata.gz: 75ebff890bf4e8fbd498066ca8ee231b07f7f6194f48eeb01a1ac6aec6f045bcdbd5bf307e57160a2542a1416167becf0ba949ae6e313d542f8e162efe03539b
+  data.tar.gz: a523ea0a98c5bd43b62b90c02053fcc0056213ac411769675cf43e4be641e2839f96c6f31477d8e0bdc175df71fa4336aced6a9b528ae04d91c6620fe1f4f40d

data/CHANGELOG.md

@@ -1,3 +1,82 @@
+## Rails 4.0.10 (August 19, 2014) ##
+
+*   Fix regression on after_commit that didnt fire when having nested transactions.
+
+    Fixes #16425
+
+    *arthurnn*
+
+*   Define `id_was` to get the previous value of the primary key.
+
+    Currently when we call id_was and we have a custom primary key name
+    Active Record will return the current value of the primary key. This
+    make impossible to correctly do an update operation if you change the
+    id.
+
+    Fixes #16413.
+
+    *Rafael Mendonça França*
+
+*   Fixed error in `reset_counters` when associations have `select` scope.
+    (Call to `count` generates invalid SQL.)
+
+    *Cade Truitt*
+
+*   After a successful `reload`, `new_record?` is always false.
+
+    Fixes #12101.
+
+    *Matthew Draper*
+
+*   `has_many :through` associations will no longer save the through record
+    twice when added in an `after_create` callback defined before the
+    associations.
+
+    *Sean Griffin*
+
+*   Correctly extract IPv6 addresses from `DATABASE_URI`: the square brackets
+    are part of the URI structure, not the actual host.
+
+    Fixes #15705.
+
+    *Andy Bakun*, *Aaron Stone*
+
+*   Don't error when quoting user defined types in PostgreSQL.
+
+    Fixes #15697.
+
+    *Sean Griffin*
+
+*   `ActiveRecord::FinderMethods.find` with block can handle proc parameter as
+    `Enumerable#find` does.
+
+    Fixes #15382.
+
+    *James Yang*
+
+*   `ActiveRecord::SchemaMigration` has no primary key regardless of the
+    `primary_key_prefix_type` configuration.
+
+    Fixes #15051.
+
+    *JoseLuis Torres*, *Yves Senn*
+
+*   `rake db:migrate:status` works with legacy migration numbers like `00018_xyz.rb`.
+
+    Fixes #15538.
+
+    *Yves Senn*
+
+*   Fixed `columns_for_distinct` of postgresql adapter to work correctly
+    with orders without sort direction modifiers.
+
+    *Nikolay Kondratyev*
+
+*   `rake railties:install:migrations` respects the order of railties.
+
+    *Arun Agrawal*
+
+
 ## Rails 4.0.9 (August 18, 2014) ##
 
 *   Check attributes passed to `create_with` and `where`.

data/lib/active_record/associations.rb

@@ -1396,7 +1396,7 @@ module ActiveRecord
       #   belongs_to :firm, foreign_key: "client_of"
       #   belongs_to :person, primary_key: "name", foreign_key: "person_name"
       #   belongs_to :author, class_name: "Person", foreign_key: "author_id"
-      #   belongs_to :valid_coupon, ->(o) { where "discounts > #{o.payments_count}" },
+      #   belongs_to :valid_coupon, ->(o) { where "discounts > ?", o.payments_count },
       #                             class_name: "Coupon", foreign_key: "coupon_id"
       #   belongs_to :attachable, polymorphic: true
       #   belongs_to :project, readonly: true

data/lib/active_record/associations/alias_tracker.rb

@@ -60,8 +60,10 @@ module ActiveRecord
               join.left.downcase.scan(
                 /join(?:\s+\w+)?\s+(\S+\s+)?#{quoted_name}\son/
               ).size
-            else
+            elsif join.respond_to? :left
               join.left.table_name == name ? 1 : 0
+            else
+              0
             end
           end
 

data/lib/active_record/attribute_methods/primary_key.rb

@@ -37,6 +37,12 @@ module ActiveRecord
         read_attribute_before_type_cast(self.class.primary_key)
       end
 
+      # Returns the primary key previous value.
+      def id_was
+        sync_with_transaction_state
+        attribute_was(self.class.primary_key)
+      end
+
       protected
 
       def attribute_method?(attr_name)
@@ -52,7 +58,7 @@ module ActiveRecord
           end
         end
 
-        ID_ATTRIBUTE_METHODS = %w(id id= id? id_before_type_cast).to_set
+        ID_ATTRIBUTE_METHODS = %w(id id= id? id_before_type_cast id_was).to_set
 
         def dangerous_attribute_method?(method_name)
           super && !ID_ATTRIBUTE_METHODS.include?(method_name)

data/lib/active_record/autosave_association.rb

@@ -359,6 +359,7 @@ module ActiveRecord
 
             raise ActiveRecord::Rollback unless saved
           end
+          @new_record_before_save = false unless reflection.macro == :has_and_belongs_to_many
         end
 
         # reconstruct the scope now that we know the owner's id

data/lib/active_record/connection_adapters/abstract/transaction.rb

@@ -201,6 +201,7 @@ module ActiveRecord
         @state.set_state(:committed)
         @state.parent = parent.state
         connection.release_savepoint
+        records.each { |r| parent.add_record(r) }
       end
     end
   end

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -757,8 +757,8 @@ module ActiveRecord
         # Make MySQL reject illegal values rather than truncating or blanking them, see
         # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
         # If the user has provided another value for sql_mode, don't replace it.
-        if strict_mode? && !variables.has_key?('sql_mode')
-          variables['sql_mode'] = 'STRICT_ALL_TABLES'
+        unless variables.has_key?('sql_mode')
+          variables['sql_mode'] = strict_mode? ? 'STRICT_ALL_TABLES' : ''
         end
 
         # NAMES does not have an equals sign, see

data/lib/active_record/connection_adapters/connection_specification.rb

@@ -74,7 +74,7 @@ module ActiveRecord
                    :password => config.password,
                    :port     => config.port,
                    :database => config.path.sub(%r{^/},""),
-                   :host     => config.host }
+                   :host     => config.hostname }
 
           spec.reject!{ |_,value| value.blank? }
 

data/lib/active_record/connection_adapters/postgresql/quoting.rb

@@ -16,7 +16,7 @@ module ActiveRecord
 
         # Quotes PostgreSQL-specific data types for SQL input.
         def quote(value, column = nil) #:nodoc:
-          return super unless column
+          return super unless column && column.type
 
           sql_type = type_to_sql(column.type, column.limit, column.precision, column.scale)
 

data/lib/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -493,7 +493,7 @@ module ActiveRecord
               # Convert Arel node to string
               s = s.to_sql unless s.is_a?(String)
               # Remove any ASC/DESC modifiers
-              s.gsub(/\s+(ASC|DESC)\s*(NULLS\s+(FIRST|LAST)\s*)?/i, '')
+              s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '')
             }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
 
           [super, *order_columns].join(', ')

data/lib/active_record/counter_cache.rb

@@ -34,7 +34,7 @@ module ActiveRecord
           counter_name = reflection.counter_cache_column
 
           stmt = unscoped.where(arel_table[primary_key].eq(object.id)).arel.compile_update({
-            arel_table[counter_name] => object.send(association).count
+            arel_table[counter_name] => object.send(association).count(:all)
           })
           connection.update stmt
         end

data/lib/active_record/migration.rb

@@ -679,7 +679,7 @@ module ActiveRecord
       if ActiveRecord::Base.timestamped_migrations
         [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max
       else
-        "%.3d" % number
+        SchemaMigration.normalize_migration_number(number)
       end
     end
 

data/lib/active_record/persistence.rb

@@ -397,6 +397,7 @@ module ActiveRecord
       @column_types           = self.class.column_types
       @column_types_override  = fresh_object.instance_variable_get('@column_types_override')
       @attributes_cache       = {}
+      @new_record             = false
       self
     end
 

data/lib/active_record/railties/databases.rake

@@ -95,14 +95,15 @@ db_namespace = namespace :db do
         next  # means "return" for rake task
       end
       db_list = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}")
-      db_list.map! { |version| "%.3d" % version }
+      db_list.map! { |version| ActiveRecord::SchemaMigration.normalize_migration_number(version) }
       file_list = []
       ActiveRecord::Migrator.migrations_paths.each do |path|
         Dir.foreach(path) do |file|
           # match "20091231235959_some_name.rb" and "001_some_name.rb" pattern
           if match_data = /^(\d{3,})_(.+)\.rb$/.match(file)
-            status = db_list.delete(match_data[1]) ? 'up' : 'down'
-            file_list << [status, match_data[1], match_data[2].humanize]
+            version = ActiveRecord::SchemaMigration.normalize_migration_number(match_data[1])
+            status = db_list.delete(version) ? 'up' : 'down'
+            file_list << [status, version, match_data[2].humanize]
           end
         end
       end
@@ -380,7 +381,7 @@ namespace :railties do
     task :migrations => :'db:load_config' do
       to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
       railties = {}
-      Rails.application.railties.each do |railtie|
+      Rails.application.migration_railties.each do |railtie|
         next unless to_load == :all || to_load.include?(railtie.railtie_name)
 
         if railtie.respond_to?(:paths) && (path = railtie.paths['db/migrate'].first)

data/lib/active_record/relation/finder_methods.rb

@@ -31,7 +31,7 @@ module ActiveRecord
     #   end
     def find(*args)
       if block_given?
-        to_a.find { |*block_args| yield(*block_args) }
+        to_a.find(*args) { |*block_args| yield(*block_args) }
       else
         find_with_ids(*args)
       end
@@ -212,7 +212,7 @@ module ActiveRecord
 
     def construct_join_dependency_for_association_find
       including = (eager_load_values + includes_values).uniq
-      ActiveRecord::Associations::JoinDependency.new(@klass, including, [])
+      ActiveRecord::Associations::JoinDependency.new(@klass, including, joins_values)
     end
 
     def construct_relation_for_association_calculations

data/lib/active_record/schema_migration.rb

@@ -4,6 +4,9 @@ require 'active_record/base'
 
 module ActiveRecord
   class SchemaMigration < ActiveRecord::Base
+    def self.primary_key
+      nil
+    end
 
     def self.table_name
       "#{Base.table_name_prefix}schema_migrations#{Base.table_name_suffix}"
@@ -32,6 +35,10 @@ module ActiveRecord
       end
     end
 
+    def self.normalize_migration_number(number)
+      "%.3d" % number.to_i
+    end
+
     def version
       super.to_i
     end

data/lib/active_record/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   # Returns the version of the currently loaded ActiveRecord as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.9"
+    Gem::Version.new "4.0.10.rc1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.0.10.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.0.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.0.10.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.0.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.0.10.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.3.0