Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicting annotations for multiple-database scenario #892

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix conflicting annotations for multiple-database scenario #892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/annotate/annotate_models.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ def annotate(klass, file, header, options = {})
klass.reset_column_information
info = get_schema_info(klass, header, options)
model_name = klass.name.underscore
table_name = klass.table_name
table_name = klass.table_name if klass.connection_specification_name == ActiveRecord::Base.name
model_file_name = File.join(file)
annotated = []

Expand Down Expand Up @@ -760,7 +760,7 @@ def remove_annotations(options = {})
klass = get_model_class(file)
if klass < ActiveRecord::Base && !klass.abstract_class?
model_name = klass.name.underscore
table_name = klass.table_name
table_name = klass.table_name if klass.connection_specification_name == ActiveRecord::Base.name
model_file_name = file
deannotated_klass = true if remove_annotation_of_file(model_file_name, options)

Expand Down
Loading