activerecord 4.2.0.rc1 → 4.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36df2e99fc4c9ad7289fa8fd6a11f85a5933267
-  data.tar.gz: 181f2f79748d0e92fb6a0e3c253dce3d08332577
+  metadata.gz: 28b61291529e1647dc68f482c67cb982f1412b58
+  data.tar.gz: 5d284927108612f0bba531978c77f77ecb2ab173
 SHA512:
-  metadata.gz: 2450da5cfc14bdaea3914cb83a0f53193b26eb6600b1de7353901ba92edf085ff1437f970f6546b1701e28ba5f369747315e75a9692be14dccd6169f273ade26
-  data.tar.gz: 082d7b0fc38bbea2ba4591d8d14c2ac196de1c057e5710e6fac6e286c6e5ab494b760de8563f0570ee3daae96ef8274cd0e1c7fd7430c7c3cf3d630e6482c447
+  metadata.gz: 53fae71b52ab612485bba69f354387d78b0a79cd5358488c3322f6e6efe38812b3467f903ba2b71c87774d7922a40935b8cd7a457423ec827cf288669a752fa7
+  data.tar.gz: bb77f7468870ad4497ddc1f42cf0a85ef38036a60297a80af4c506899fb28aa124cb87cc679b70d1bfd73d23e87791f1c03729a7bbc0b2e011707d4ba22db6cb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   `add_timestamps` and `remove_timestamps` now properly reversible with
+    options.
+
+    *Noam Gagliardi-Rabinovich*
+
 *   Bring back `db:test:prepare` to synchronize the test database schema.
 
     Manual synchronization using `bin/rake db:test:prepare` is required

data/README.rdoc

@@ -192,7 +192,7 @@ The latest version of Active Record can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/activerecord
+* https://github.com/rails/rails/tree/4-2-stable/activerecord
 
 
 == License

data/lib/active_record/attribute_methods/dirty.rb

@@ -69,6 +69,11 @@ module ActiveRecord
         end
       end
 
+      def attribute_changed_in_place?(attr_name)
+        old_value = original_raw_attribute(attr_name)
+        @attributes[attr_name].changed_in_place_from?(old_value)
+      end
+
       private
 
       def calculate_changes_from_defaults
@@ -141,15 +146,10 @@ module ActiveRecord
 
       def changed_in_place
         self.class.attribute_names.select do |attr_name|
-          changed_in_place?(attr_name)
+          attribute_changed_in_place?(attr_name)
         end
       end
 
-      def changed_in_place?(attr_name)
-        old_value = original_raw_attribute(attr_name)
-        @attributes[attr_name].changed_in_place_from?(old_value)
-      end
-
       def original_raw_attribute(attr_name)
         original_raw_attributes.fetch(attr_name) do
           read_attribute_before_type_cast(attr_name)

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

@@ -509,8 +509,8 @@ module ActiveRecord
       # Removes the timestamp columns (+created_at+ and +updated_at+) from the table.
       #
       #  t.remove_timestamps
-      def remove_timestamps
-        @base.remove_timestamps(name)
+      def remove_timestamps(options = {})
+        @base.remove_timestamps(name, options)
       end
 
       # Renames a column.

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

@@ -854,7 +854,7 @@ module ActiveRecord
       #
       #  remove_timestamps(:suppliers)
       #
-      def remove_timestamps(table_name)
+      def remove_timestamps(table_name, options = {})
         remove_column table_name, :updated_at
         remove_column table_name, :created_at
       end

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -779,7 +779,7 @@ module ActiveRecord
         [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)
+      def remove_timestamps_sql(table_name, options = {})
         [remove_column_sql(table_name, :updated_at), remove_column_sql(table_name, :created_at)]
       end
 

data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb

@@ -39,14 +39,14 @@ module ActiveRecord
           end
 
           def register_array_type(row)
-            if subtype = @store.lookup(row['typelem'].to_i)
-              register row['oid'], OID::Array.new(subtype, row['typdelim'])
+            register_with_subtype(row['oid'], row['typelem'].to_i) do |subtype|
+              OID::Array.new(subtype, row['typdelim'])
             end
           end
 
           def register_range_type(row)
-            if subtype = @store.lookup(row['rngsubtype'].to_i)
-              register row['oid'], OID::Range.new(subtype, row['typname'].to_sym)
+            register_with_subtype(row['oid'], row['rngsubtype'].to_i) do |subtype|
+              OID::Range.new(subtype, row['typname'].to_sym)
             end
           end
 
@@ -64,9 +64,13 @@ module ActiveRecord
             end
           end
 
-          def register(oid, oid_type)
-            oid = assert_valid_registration(oid, oid_type)
-            @store.register_type(oid, oid_type)
+          def register(oid, oid_type = nil, &block)
+            oid = assert_valid_registration(oid, oid_type || block)
+            if block_given?
+              @store.register_type(oid, &block)
+            else
+              @store.register_type(oid, oid_type)
+            end
           end
 
           def alias_type(oid, target)
@@ -74,6 +78,14 @@ module ActiveRecord
             @store.alias_type(oid, target)
           end
 
+          def register_with_subtype(oid, target_oid)
+            if @store.key?(target_oid)
+              register(oid) do |_, *args|
+                yield @store.lookup(target_oid, *args)
+              end
+            end
+          end
+
           def assert_valid_registration(oid, oid_type)
             raise ArgumentError, "can't register nil type for OID #{oid}" if oid_type.nil?
             oid.to_i

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -516,9 +516,12 @@ module ActiveRecord
 
         def extract_limit(sql_type) # :nodoc:
           case sql_type
-          when /^bigint/i;    8
-          when /^smallint/i;  2
-          else super
+          when /^bigint/i, /^int8/i
+            8
+          when /^smallint/i
+            2
+          else
+            super
           end
         end
 
@@ -532,7 +535,7 @@ module ActiveRecord
             when 'true', 'false'
               default
             # Numeric types
-            when /\A\(?(-?\d+(\.\d*)?\)?(::bigint)?)\z/
+            when /\A\(?(-?\d+(\.\d*)?)\)?(::bigint)?\z/
               $1
             # Object identifier types
             when /\A-?\d+\z/

data/lib/active_record/core.rb

@@ -85,7 +85,6 @@ module ActiveRecord
       mattr_accessor :dump_schema_after_migration, instance_writer: false
       self.dump_schema_after_migration = true
 
-      # :nodoc:
       mattr_accessor :maintain_test_schema, instance_accessor: false
 
       def self.disable_implicit_join_references=(value)

data/lib/active_record/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveRecord
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc1
+  version: 4.2.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '6.0'
 description: Databases on Rails. Build a persistent domain model by mapping database
@@ -285,23 +285,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).