1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index d0d9304a36..2024b225e4 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -394,8 +394,8 @@ module ActiveRecord
       end
 
       def load_schema_if_pending!
-        if ActiveRecord::Migrator.needs_migration?
-          ActiveRecord::Tasks::DatabaseTasks.load_schema_current
+        if ActiveRecord::Migrator.needs_migration? || !ActiveRecord::Migrator.any_migrations?
+          ActiveRecord::Tasks::DatabaseTasks.load_schema_current_if_exists
           check_pending!
         end
       end
@@ -848,6 +848,10 @@ module ActiveRecord
         (migrations(migrations_paths).collect(&:version) - get_all_versions(connection)).size > 0
       end
 
+      def any_migrations?
+        migrations(migrations_paths).any?
+      end
+
       def last_version
         last_migration.version
       end