activerecord 4.0.12 → 4.0.13.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f92d690d5f700414667a3ee964fa07c9450a28f5
-  data.tar.gz: 99d48225fd95241ad663b52d5166ff6a4bfac11a
+  metadata.gz: 2ba363d6a3bc9185c6e4676cd69a0c8af08051cd
+  data.tar.gz: bddcbc3eeff462cda0c439f19d3439bbf5c4c0be
 SHA512:
-  metadata.gz: 0aeab78fd21761559a864f656cdb6379194ee4a9c4270bb9d24e4173db385ce5e3a1e7a2c5ca305964668c03c488e3a098720617d755bc1780cfd27620647502
-  data.tar.gz: 9576950f6c1e57124ff8002e335051d52b5cc71afe197120a95247e86c9bdbcfbec96a3c7193f17d7892d002b18a58c81e9cd154fd9bc72b3c521add990eec45
+  metadata.gz: 26c568021fccd2ab9d463e1752b9fb42753ec6ea938cdaf6e39aa654acaa98ab15db1d7852dda87af852601dc9d676eacb5059fd1ee337de4dc76273cf89e971
+  data.tar.gz: c6aeece39dcfb73d89740d7bd64210f927bad042db1832cdacf975ae101fb68d128875bf1a38a896cc430ee36ffe3c41973dbe97b65c281d45ffbf1e1fe1b4aa

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+*   Renaming a table in pg also renames the primary key index.
+
+    Fixes #12856
+
+    *Sean Griffin*
+
+*   Make it possible to access fixtures excluded by a `default_scope`.
+
+    *Yves Senn*
+
+*   `timestamps` and `add_timestamps` passes additional options along.
+    (like `null: false`)
+
+    Closes #17624.
+
+    *Yves Senn*
+
+
+## Rails 4.0.12 (November 16, 2014) ##
+
+*   Cache `CollectionAssociation#reader` proxies separately before and after
+    the owner has been saved so that the proxy is not cached without the
+    owner's id.
+
+    *Ben Woosley*
+
+
+## Rails 4.0.11.1 (November 19, 2014) ##
+
+*No changes*
+
+
+## Rails 4.0.11 (September 11, 2014) ##
+
+*No changes*
+
+
 ## Rails 4.0.10 (September 11, 2014) ##
 
 *   Fixed a regression where whitespaces were stripped from DISTINCT queries in

data/lib/active_record/associations/collection_association.rb

@@ -34,7 +34,13 @@ module ActiveRecord
           reload
         end
 
-        @proxy ||= CollectionProxy.new(klass, self)
+        if owner.new_record?
+          # Cache the proxy separately before the owner has an id
+          # or else a post-save proxy will still lack the id
+          @new_record_proxy ||= CollectionProxy.new(klass, self)
+        else
+          @proxy ||= CollectionProxy.new(klass, self)
+        end
       end
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items

data/lib/active_record/attribute_methods/time_zone_conversion.rb

@@ -34,7 +34,7 @@ module ActiveRecord
           if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
             method_body, line = <<-EOV, __LINE__ + 1
               def #{attr_name}=(time)
-                time_with_zone = time.respond_to?(:in_time_zone) ? time.in_time_zone : nil
+                time_with_zone = convert_value_to_time_zone(time)
                 previous_time = attribute_changed?("#{attr_name}") ? changed_attributes["#{attr_name}"] : read_attribute(:#{attr_name})
                 write_attribute(:#{attr_name}, time)
                 #{attr_name}_will_change! if previous_time != time_with_zone
@@ -54,6 +54,18 @@ module ActiveRecord
             (:datetime == column.type || :timestamp == column.type)
         end
       end
+
+      private
+
+      def convert_value_to_time_zone(value)
+        if value.is_a?(Array)
+          value.map { |v| convert_value_to_time_zone(v) }
+        elsif value.respond_to?(:in_time_zone)
+          value.in_time_zone
+        else
+          nil
+        end
+      end
     end
   end
 end

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

@@ -393,8 +393,8 @@ module ActiveRecord
       # Adds timestamps (+created_at+ and +updated_at+) columns to the table. See SchemaStatements#add_timestamps
       #
       #  t.timestamps
-      def timestamps
-        @base.add_timestamps(@table_name)
+      def timestamps(options = {})
+        @base.add_timestamps(@table_name, options)
       end
 
       # Changes the column's definition according to the new options.

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

@@ -727,9 +727,9 @@ module ActiveRecord
       #
       #   add_timestamps(:suppliers)
       #
-      def add_timestamps(table_name)
-        add_column table_name, :created_at, :datetime
-        add_column table_name, :updated_at, :datetime
+      def add_timestamps(table_name, options = {})
+        add_column table_name, :created_at, :datetime, options
+        add_column table_name, :updated_at, :datetime, options
       end
 
       # Removes the timestamp columns (+created_at+ and +updated_at+) from the table definition.

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -721,8 +721,8 @@ module ActiveRecord
         "DROP INDEX #{index_name}"
       end
 
-      def add_timestamps_sql(table_name)
-        [add_column_sql(table_name, :created_at, :datetime), add_column_sql(table_name, :updated_at, :datetime)]
+      def add_timestamps_sql(table_name, options = {})
+        [add_column_sql(table_name, :created_at, :datetime, options), add_column_sql(table_name, :updated_at, :datetime, options)]
       end
 
       def remove_timestamps_sql(table_name)

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

@@ -382,7 +382,10 @@ module ActiveRecord
           pk, seq = pk_and_sequence_for(new_name)
           if seq == "#{table_name}_#{pk}_seq"
             new_seq = "#{new_name}_#{pk}_seq"
+            idx = "#{table_name}_pkey"
+            new_idx = "#{new_name}_pkey"
             execute "ALTER TABLE #{quote_table_name(seq)} RENAME TO #{quote_table_name(new_seq)}"
+            execute "ALTER INDEX #{quote_table_name(idx)} RENAME TO #{quote_table_name(new_idx)}"
           end
 
           rename_table_indexes(table_name, new_name)

data/lib/active_record/fixtures.rb

@@ -696,7 +696,7 @@ module ActiveRecord
 
     def find
       if model_class
-        model_class.find(fixture[model_class.primary_key])
+        model_class.unscoped.find(fixture[model_class.primary_key])
       else
         raise FixtureClassNotFound, "No class attached to find."
       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.12"
+    Gem::Version.new "4.0.13.rc1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-01-02 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.12
+        version: 4.0.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.13.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.13.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -255,12 +255,12 @@ 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.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).