diff options
| author | Elad Meidar <elad@eizesus.com> | 2009-08-08 17:06:45 -0400 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-08 23:42:18 +0100 |
| commit | c0f828ca4f3aa45a4c8ea8761183ad3854f0a13f (patch) | |
| tree | de73fffceced85cc95bbca63fa7d842bec2c5281 /railties/lib | |
| parent | 4d1552810f631898c3d7f758454c92ca35a8cb26 (diff) | |
| download | rails-c0f828ca4f3aa45a4c8ea8761183ad3854f0a13f.tar.gz rails-c0f828ca4f3aa45a4c8ea8761183ad3854f0a13f.tar.bz2 rails-c0f828ca4f3aa45a4c8ea8761183ad3854f0a13f.zip | |
Fixed reference to AR::SessionStore::Session.table_name in session migrations
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/generators/active_record/session_migration/session_migration_generator.rb | 6 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/generators/active_record/session_migration/session_migration_generator.rb b/railties/lib/generators/active_record/session_migration/session_migration_generator.rb index d60da5c0a5..d78b9d42b0 100644 --- a/railties/lib/generators/active_record/session_migration/session_migration_generator.rb +++ b/railties/lib/generators/active_record/session_migration/session_migration_generator.rb @@ -12,7 +12,11 @@ module ActiveRecord protected def session_table_name - ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session' + current_table_name = ActiveRecord::SessionStore::Session.table_name + if current_table_name == "sessions" || current_table_name == "session" + current_table_name = (ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session') + end + current_table_name end end diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 23a3a73a7f..0fefc0433a 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -448,7 +448,7 @@ def drop_database(config) end def session_table_name - ActiveRecord::Base.pluralize_table_names ? :sessions : :session + ActiveRecord::SessionStore::Session.table_name end def set_firebird_env(config) |