Skip to content
This repository
Browse code

Use . instead of :: for class methods, add CHANGELOG entries

  • Loading branch information...
commit 03f2249153ae4d2078646e6796d8b9e5ef747fba 1 parent 4845c06
José Valim authored June 10, 2012
3  activerecord/CHANGELOG.md
Source Rendered
... ...
@@ -1,5 +1,8 @@
1 1
 ## Rails 4.0.0 (unreleased) ##
2 2
 
  3
+*   Added `ActiveRecord::Migration.check_pending!` that raises an error if
  4
+    migrations are pending. *Richard Schneeman*
  5
+
3 6
 *   Added `#destroy!` which acts like `#destroy` but will raise an
4 7
     `ActiveRecord::RecordNotDestroyed` exception instead of returning `false`.
5 8
 
4  activerecord/lib/active_record/migration.rb
@@ -342,7 +342,7 @@ def initialize(app)
342 342
 
343 343
       def call(env)
344 344
         ActiveRecord::Migration.check_pending!
345  
-        status, headers, body = @app.call(env)
  345
+        @app.call(env)
346 346
       end
347 347
     end
348 348
 
@@ -351,7 +351,7 @@ class << self
351 351
     end
352 352
 
353 353
     def self.check_pending!
354  
-      raise ActiveRecord::PendingMigrationError if ActiveRecord::Migrator::needs_migrations?
  354
+      raise ActiveRecord::PendingMigrationError if ActiveRecord::Migrator.needs_migration?
355 355
     end
356 356
 
357 357
     def self.method_missing(name, *args, &block) # :nodoc:
4  activerecord/test/cases/migration_test.rb
@@ -63,12 +63,12 @@ def test_migrator_versions
63 63
     ActiveRecord::Migrator.up(migrations_path)
64 64
     assert_equal 3, ActiveRecord::Migrator.current_version
65 65
     assert_equal 3, ActiveRecord::Migrator.last_version
66  
-    assert_equal false, ActiveRecord::Migrator.needs_migrations?
  66
+    assert_equal false, ActiveRecord::Migrator.needs_migration?
67 67
 
68 68
     ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid")
69 69
     assert_equal 0, ActiveRecord::Migrator.current_version
70 70
     assert_equal 3, ActiveRecord::Migrator.last_version
71  
-    assert_equal true, ActiveRecord::Migrator.needs_migrations?
  71
+    assert_equal true, ActiveRecord::Migrator.needs_migration?
72 72
   end
73 73
 
74 74
   def test_create_table_with_force_true_does_not_drop_nonexisting_table
2  railties/CHANGELOG.md
Source Rendered
... ...
@@ -1,5 +1,7 @@
1 1
 ## Rails 4.0.0 (unreleased) ##
2 2
 
  3
+*   Set `config.active_record.migration_error` to `:page_load` for development *Richard Schneeman*
  4
+
3 5
 *   Add runner to Rails::Railtie as a hook called just after runner starts. *José Valim & kennyj*
4 6
 
5 7
 *   Add `/rails/info/routes` path, displays same information as `rake routes` *Richard Schneeman & Andrew White*
2  railties/test/application/configuration_test.rb
@@ -49,7 +49,7 @@ def teardown
49 49
       RUBY
50 50
 
51 51
       require "#{app_path}/config/environment"
52  
-      ActiveRecord::Migrator.stubs(:needs_migrations?).returns(true)
  52
+      ActiveRecord::Migrator.stubs(:needs_migration?).returns(true)
53 53
 
54 54
       get "/foo"
55 55
       assert_equal 500, last_response.status

0 notes on commit 03f2249

Please sign in to comment.
Something went wrong with that request. Please try again.