activerecord 4.0.0.rc2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357a6e6e214ac8716f87d6dc1b7444ec9fac7fb8
-  data.tar.gz: 2a02076afbcfa4267ee735a3ae8fe3a9ee9df311
+  metadata.gz: 76ddb57b66b29722a983d38eba75ebc3e94610ea
+  data.tar.gz: 743a630e5e1722c2655ca8c167dbb5be2ab49afb
 SHA512:
-  metadata.gz: 2d7d4a1faf7d356f0b290884cb1120e18cca36a4cb92db695595a3b9d5e468348f9d4ec3d54810003cde8397c4772b88ec9fefa06e3dda29600d01169ebd76b3
-  data.tar.gz: 1e5d6ce02b031d8c61ad22d7da9482f96975a2662e61ec8e3fe1c4e09472f0822d60bee1e4ef721bab22c6ae07f21ffdc705d6665c0f4a7bee25443c44ace5a7
+  metadata.gz: a643a5988de90b3145ab259ecc0f20acba5e66db188ad8ebfbdd12e14352e26d696faf570cc04c2da30e70bc1a490d9107cb4086f59b90614088941c96f095e3
+  data.tar.gz: 513f56748c0e72bc073a068f29846737aeb95c11fd3fc23672295027a6d475c2764613f3b1653cdb8d32ac61b4dfcff32cade6279fad13ad4030bd1e01e536b0

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## Rails 4.0.0.rc2 (June 11, 2013) ##
+## Rails 4.0.0 (June 25, 2013) ##
 
 *   Fix `add_column` with `array` option when using PostgreSQL. Fixes #10432
 
@@ -50,9 +50,6 @@
 
     *Godfrey Chan*
 
-
-## Rails 4.0.0.rc1 (April 29, 2013) ##
-
 *   Trigger a save on `has_one association=(associate)` when the associate contents have changed.
 
     Fix #8856.
@@ -593,9 +590,6 @@
         # This will expand the order :name to "authors".name.
         Author.joins(:books).where('books.published = 1').order(:name)
 
-
-## Rails 4.0.0.beta1 (February 25, 2013) ##
-
 *   Fix overriding of attributes by `default_scope` on `ActiveRecord::Base#dup`.
 
     *Hiroshige UMINO*

data/lib/active_record/attribute_methods/serialization.rb

@@ -63,7 +63,11 @@ module ActiveRecord
         end
 
         def type_cast(value)
-          value.unserialized_value @column.type_cast value.value
+          if value.state == :serialized
+            value.unserialized_value @column.type_cast value.value
+          else
+            value.unserialized_value
+          end
         end
 
         def type

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

@@ -65,8 +65,7 @@ module ActiveRecord
       # Appends a primary key definition to the table definition.
       # Can be called multiple times, but this is probably not a good idea.
       def primary_key(name, type = :primary_key, options = {})
-        options[:primary_key] = true
-        column(name, type, options)
+        column(name, type, options.merge(:primary_key => true))
       end
 
       # Returns a ColumnDefinition for the column with name +name+.

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

@@ -214,8 +214,8 @@ module ActiveRecord
       # its block form to do so yourself:
       #
       #   create_join_table :products, :categories do |t|
-      #     t.index :products
-      #     t.index :categories
+      #     t.index :product_id
+      #     t.index :category_id
       #   end
       #
       # ====== Add a backend specific option to the generated SQL (MySQL)

data/lib/active_record/railtie.rb

@@ -37,16 +37,21 @@ module ActiveRecord
     rake_tasks do
       require "active_record/base"
 
-      ActiveRecord::Tasks::DatabaseTasks.env = Rails.env
-      ActiveRecord::Tasks::DatabaseTasks.db_dir = Rails.application.config.paths["db"].first
       ActiveRecord::Tasks::DatabaseTasks.seed_loader = Rails.application
-      ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration
-      ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths['db/migrate'].to_a
-      ActiveRecord::Tasks::DatabaseTasks.fixtures_path = File.join Rails.root, 'test', 'fixtures'
+      ActiveRecord::Tasks::DatabaseTasks.env = Rails.env
+
+      namespace :db do
+        task :load_config do
+          ActiveRecord::Tasks::DatabaseTasks.db_dir = Rails.application.config.paths["db"].first
+          ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration
+          ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths['db/migrate'].to_a
+          ActiveRecord::Tasks::DatabaseTasks.fixtures_path = File.join Rails.root, 'test', 'fixtures'
 
-      if defined?(APP_RAKEFILE) && engine = Rails::Engine.find(find_engine_path(APP_RAKEFILE))
-        if engine.paths['db/migrate'].existent
-          ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths['db/migrate'].to_a
+          if defined?(ENGINE_PATH) && engine = Rails::Engine.find(ENGINE_PATH)
+            if engine.paths['db/migrate'].existent
+              ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths['db/migrate'].to_a
+            end
+          end
         end
       end
 

data/lib/active_record/railties/databases.rake

@@ -326,7 +326,7 @@ db_namespace = namespace :db do
         ActiveRecord::Schema.verbose = false
         db_namespace["schema:load"].invoke
       ensure
-        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Rails.env])
+        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[ActiveRecord::Tasks::DatabaseTasks.env])
       end
     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.0.rc2"
+    Gem::Version.new "4.0.0"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-25 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.0.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -254,9 +254,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2