Merge branch 'master' of gitproxy:rails/rails

4 files changed, 18 insertions, 20 deletions

diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 4fd1a0213c..f7ed77ca4b 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -1,25 +1,23 @@
 Gem::Specification.new do |s|
-  s.platform = Gem::Platform::RUBY
-  s.name = 'activerecord'
-  s.version = '3.0.pre'
-  s.summary = "Implements the ActiveRecord pattern for ORM."
-  s.description = %q{Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.}
+  s.platform    = Gem::Platform::RUBY
+  s.name        = 'activerecord'
+  s.version     = '3.0.0.beta'
+  s.summary     = 'Object-relational mapper framework (part of Rails).'
+  s.description = 'Object-relational mapper framework (part of Rails).'
 
-  s.files = Dir['CHANGELOG', 'README', 'examples/**/*', 'lib/**/*']
-
-  s.add_dependency('activesupport', '= 3.0.pre')
-  s.add_dependency('activemodel',   '= 3.0.pre')
-  s.add_dependency('arel',          '~> 0.2.0')
+  s.author            = 'David Heinemeier Hansson'
+  s.email             = 'david@loudthinking.com'
+  s.homepage          = 'http://www.rubyonrails.org'
+  s.rubyforge_project = 'activerecord'
 
+  s.files        = Dir['CHANGELOG', 'README', 'examples/**/*', 'lib/**/*']
   s.require_path = 'lib'
-  s.autorequire = 'active_record'
 
-  s.has_rdoc = true
+  s.has_rdoc         = true
   s.extra_rdoc_files = %w( README )
   s.rdoc_options.concat ['--main',  'README']
 
-  s.author = "David Heinemeier Hansson"
-  s.email = "david@loudthinking.com"
-  s.homepage = "http://www.rubyonrails.org"
-  s.rubyforge_project = "activerecord"
+  s.add_dependency('activesupport', '= 3.0.0.beta')
+  s.add_dependency('activemodel',   '= 3.0.0.beta')
+  s.add_dependency('arel',          '~> 0.2.0')
 end
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 12feef4849..c4e07e8786 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -79,7 +79,7 @@ module ActiveRecord #:nodoc:
 
     def initialize(message, original_exception)
       super(message)
-      @original_exception, = original_exception
+      @original_exception = original_exception
     end
   end
 
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 4343bef3d4..ed7d2a045e 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -28,8 +28,8 @@ namespace :db do
 
   desc 'Create the database defined in config/database.yml for the current Rails.env - also makes test database if in development mode'
   task :create => :load_config do
-    # Make the test database at the same time as the development one
-    if Rails.env == 'development'
+    # Make the test database at the same time as the development one, if it exists
+    if Rails.env.development? && ActiveRecord::Base.configurations['test']
       create_database(ActiveRecord::Base.configurations['test'])
     end
     create_database(ActiveRecord::Base.configurations[Rails.env])
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 10ef9d7594..d55b14f082 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = "pre"
+    TINY  = "0.beta"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end