aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/active_record/session_migration/session_migration_generator.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/generators/active_record/session_migration/session_migration_generator.rb')
-rw-r--r--railties/lib/generators/active_record/session_migration/session_migration_generator.rb6
1 files changed, 5 insertions, 1 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