diff options
| author | rick <rick@spacemonkey.local> | 2008-04-17 17:22:03 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-04-17 17:22:03 -0700 |
| commit | 69d29e80f76079262f2e98e350592be1cfdfcd1e (patch) | |
| tree | e5b65fae3a5d54c93f660f2b56980acb86d5ff68 /activerecord/lib | |
| parent | 750e3217e13f385c5305e5ed9906703412e5667c (diff) | |
| parent | 82b4faf81218bbd8916ab559590db236c7f80e46 (diff) | |
| download | rails-69d29e80f76079262f2e98e350592be1cfdfcd1e.tar.gz rails-69d29e80f76079262f2e98e350592be1cfdfcd1e.tar.bz2 rails-69d29e80f76079262f2e98e350592be1cfdfcd1e.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 6 |
1 files changed, 4 insertions, 2 deletions
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) |