activerecord 3.1.0.rc2 → 3.1.0.rc3

data/lib/active_record/associations/association.rb

@@ -141,7 +141,7 @@ module ActiveRecord
             @target ||= find_target
           end
         end
-        loaded!
+        loaded! unless loaded?
         target
       rescue ActiveRecord::RecordNotFound
         reset
@@ -177,9 +177,7 @@ module ActiveRecord
 
         # Sets the owner attributes on the given record
         def set_owner_attributes(record)
-          if owner.persisted?
-            creation_attributes.each { |key, value| record[key] = value }
-          end
+          creation_attributes.each { |key, value| record[key] = value }
         end
 
         # Should be true if there is a foreign key present on the owner which

data/lib/active_record/associations/association_scope.rb

@@ -60,7 +60,7 @@ module ActiveRecord
 
             scope = scope.joins(join(
               join_table,
-              table[reflection.active_record_primary_key].
+              table[reflection.association_primary_key].
                 eq(join_table[reflection.association_foreign_key])
             ))
 

data/lib/active_record/associations/has_one_association.rb

@@ -14,8 +14,8 @@ module ActiveRecord
           end
 
           if record
-            set_inverse_instance(record)
             set_owner_attributes(record)
+            set_inverse_instance(record)
 
             if owner.persisted? && save && !record.save
               nullify_owner_attributes(record)

data/lib/active_record/railties/databases.rake

@@ -338,6 +338,7 @@ db_namespace = namespace :db do
     task :dump => :load_config do
       require 'active_record/schema_dumper'
       File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", "w") do |file|
+        ActiveRecord::Base.establish_connection(Rails.env)
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
       end
       db_namespace['schema:dump'].reenable

data/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc2"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 15424097
+  hash: 15424099
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 2
-  version: 3.1.0.rc2
+  - 3
+  version: 3.1.0.rc3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -27,14 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424097
+        hash: 15424099
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 2
-        version: 3.1.0.rc2
+        - 3
+        version: 3.1.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,14 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424097
+        hash: 15424099
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 2
-        version: 3.1.0.rc2
+        - 3
+        version: 3.1.0.rc3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency