Fix: use klass.table_name instead of guessing from associated models

[ocarta-l]

Hi,

In a middle of a refactoring task, we came across a issue with globalize + annotate. Annotate is adding a none-existant field to the model:

 # Table name: countries # + # country_id :integer # created_at :datetime not null .... 

The issue come when you overide table_name. For exemple, if we have a model Country located at models/country.rb and we decide to move the file in a folder without changing the table_name, we will have:
models/folder/country.rb

module Folder class Country < ApplicationRecord self.table_name = "countries" ... end end # == Schema Information # # Table name: countries # # country_id :integer <- field added # ....

With the orginal code, we have:

pry(main)> klass = Folder::Country pry(main)> foreign_column_name = [klass.translation_class.to_s.gsub('::Translation', '').gsub('::', '_').downcase,'_id'].join.to_sym => :folder_country_id

Using table_name is a safer way to do it, in my opinion

pry(main)> klass = Folder::Country pry(main)> foreign_column_name = [klass.table_name.singularize,'_id'].join.to_sym => :country_id

[ctran]

Could you add a test to show this does fix the problem you mentioned?

[ocarta-l]

Hi @ctran,
Sorry for the late answer, I messed up my notification config.

Test on this PR:

Same test with master version:

I just updated the current test for this part, adding a fake folder in the namespace Folder::Post::Translation

EDIT: It seems the ci has some issues, feel free to ping me :)

[ocarta-l]

@ctran when you have time, can you review again this PR :)

[drewlustro]

➕ this is more stable! Also might unblock shaky module support of annotate

[yao0204]

@ctran could you take a look if this PR is ok? this could solve my issue too :)

[ctran]

Thanks.