0
@@ -364,8 +364,10 @@ module ActiveRecord
0
       end
0
 
0
       def current_version
0
-        Base.connection.select_values(
0
-          "SELECT version FROM #{schema_migrations_table_name}").map(&:to_i).max || 0
0
+        version = Base.connection.select_values(
0
+          "SELECT version FROM #{schema_migrations_table_name}"
0
+        ).map(&:to_i).max rescue nil
0
+        version || 0
0
       end
0
 
0
       def proper_table_name(name)

0
@@ -813,6 +813,13 @@ if ActiveRecord::Base.connection.supports_migrations?
0
       end
0
     end
0
 
0
+    def test_migrator_db_has_no_schema_migrations_table
0
+      ActiveRecord::Base.connection.execute("DROP TABLE schema_migrations;")
0
+      assert_nothing_raised do
0
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 1)
0
+      end
0
+    end
0
+
0
     def test_migrator_verbosity
0
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
0
       assert PeopleHaveLastNames.message_count > 0
0
@@ -1010,7 +1017,7 @@ if ActiveRecord::Base.connection.supports_migrations?
0
       end
0
 
0
   end
0
-
0
+  
0
   uses_mocha 'Sexy migration tests' do
0
     class SexyMigrationsTest < ActiveRecord::TestCase
0
       def test_references_column_type_adds_id