diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-12-05 12:13:49 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-12-05 12:13:49 -0800 |
commit | 0c692f4d121792117b6a71e5ed590a31c3b9d12e (patch) | |
tree | 869bf3fb884e55847bf7aa34b4c6b463d1590720 /activerecord/test/cases/migration/logger_test.rb | |
parent | 2e299fca715b083a60222a85e48f9d3b8dd8ce93 (diff) | |
parent | 94ef7b515b9bd026a0ed67ef7dabbf0b4ab554e3 (diff) | |
download | rails-0c692f4d121792117b6a71e5ed590a31c3b9d12e.tar.gz rails-0c692f4d121792117b6a71e5ed590a31c3b9d12e.tar.bz2 rails-0c692f4d121792117b6a71e5ed590a31c3b9d12e.zip |
Merge branch 'joshsusser-master' into merge
* joshsusser-master:
style cleanup
Add migration history to schema.rb dump
Add metadata to schema_migrations
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/schema.rb
Diffstat (limited to 'activerecord/test/cases/migration/logger_test.rb')
-rw-r--r-- | activerecord/test/cases/migration/logger_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/test/cases/migration/logger_test.rb b/activerecord/test/cases/migration/logger_test.rb index ee0c20747e..6e62c1fcbe 100644 --- a/activerecord/test/cases/migration/logger_test.rb +++ b/activerecord/test/cases/migration/logger_test.rb @@ -6,10 +6,12 @@ module ActiveRecord # mysql can't roll back ddl changes self.use_transactional_fixtures = false - Migration = Struct.new(:name, :version) do + Migration = Struct.new(:name, :version, :filename, :fingerprint) do def migrate direction # do nothing end + def filename; "anon.rb"; end + def fingerprint; "123456789012345678901234567890ab"; end end def setup |