Merge branch 'master' of git@github.com:rails/rails

3 files changed, 12 insertions, 4 deletions

diff --git a/activerecord/.gitignore b/activerecord/.gitignore
deleted file mode 100644
index 2bf1ef8c0e..0000000000
--- a/activerecord/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-debug.log
\ No newline at end of file
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 573c6a4f02..1d63bb2f84 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -364,8 +364,10 @@ module ActiveRecord
       end
 
       def current_version
-        Base.connection.select_values(
-          "SELECT version FROM #{schema_migrations_table_name}").map(&:to_i).max || 0
+        version = Base.connection.select_values(
+          "SELECT version FROM #{schema_migrations_table_name}"
+        ).map(&:to_i).max rescue nil
+        version || 0
       end
 
       def proper_table_name(name)
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 885d89b6da..c270230d67 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -813,6 +813,13 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_migrator_db_has_no_schema_migrations_table
+      ActiveRecord::Base.connection.execute("DROP TABLE schema_migrations;")
+      assert_nothing_raised do
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
+      end
+    end
+
     def test_migrator_verbosity
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
       assert PeopleHaveLastNames.message_count > 0
@@ -1010,7 +1017,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
 
   end
-
+  
   uses_mocha 'Sexy migration tests' do
     class SexyMigrationsTest < ActiveRecord::TestCase
       def test_references_column_type_adds_id