Skip to content

Commit

Permalink
Merge pull request mbleigh#167 from niquola/master
Browse files Browse the repository at this point in the history
fix for alias name in sql for postgres with non-standard schema name.
  • Loading branch information
Artem Kramarenko committed Jul 30, 2011
2 parents a30ebb8 + e5e83e7 commit c828ce3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/acts_as_taggable_on/acts_as_taggable_on/core.rb
Expand Up @@ -75,6 +75,7 @@ def tagged_with(tags, options = {})
conditions = []

context = options.delete(:on)
alias_base_name = undecorated_table_name.gsub('.','_')

if options.delete(:exclude)
tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name #{like_operator} ?", t]) }.join(" OR ")
Expand Down Expand Up @@ -102,7 +103,7 @@ def tagged_with(tags, options = {})
safe_tag = tag.name.gsub(/[^a-zA-Z0-9]/, '')
prefix = "#{safe_tag}_#{rand(1024)}"

taggings_alias = "#{undecorated_table_name}_taggings_#{prefix}"
taggings_alias = "#{alias_base_name}_taggings_#{prefix}"

tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
" ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
Expand All @@ -114,7 +115,7 @@ def tagged_with(tags, options = {})
end
end

taggings_alias, tags_alias = "#{undecorated_table_name}_taggings_group", "#{undecorated_table_name}_tags_group"
taggings_alias, tags_alias = "#{alias_base_name}_taggings_group", "#{alias_base_name}_tags_group"

if options.delete(:match_all)
joins << "LEFT OUTER JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
Expand Down

0 comments on commit c828ce3

Please sign in to comment.