aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-07-07 00:57:01 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-07-07 00:57:01 -0700
commitc55df9301c34ae9778c6a7ffadaeeb3247017cde (patch)
tree08193c274233fd031e3417b543c88ef4a2305a2d /activerecord/lib
parentb3da67d9a5dfbc2b39b77e5b2f0874137f8716ef (diff)
parent8fe9b43b3016f2c0e7afad8fc081bbf37f267226 (diff)
downloadrails-c55df9301c34ae9778c6a7ffadaeeb3247017cde.tar.gz
rails-c55df9301c34ae9778c6a7ffadaeeb3247017cde.tar.bz2
rails-c55df9301c34ae9778c6a7ffadaeeb3247017cde.zip
Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fix
Engine table name prefix generator fix
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/rails/generators/active_record/model/templates/module.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/module.rb b/activerecord/lib/rails/generators/active_record/model/templates/module.rb
index fca2908080..a3bf1c37b6 100644
--- a/activerecord/lib/rails/generators/active_record/model/templates/module.rb
+++ b/activerecord/lib/rails/generators/active_record/model/templates/module.rb
@@ -1,7 +1,7 @@
<% module_namespacing do -%>
module <%= class_path.map(&:camelize).join('::') %>
def self.table_name_prefix
- '<%= class_path.join('_') %>_'
+ '<%= namespaced? ? namespaced_class_path.join('_') : class_path.join('_') %>_'
end
end
<% end -%>