Skip to content

Quote the readable.id in Unread::Reader::Scopes #108

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

Merged
ledermann merged 2 commits into from
Aug 25, 2019
Merged

Quote the readable.id in Unread::Reader::Scopes #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9c700a
Quote the readable.id in Unread::Reader::Scopes
fotos Aug 3, 2019
8fde098
Add parantheses around quote_bound_value argument in Unread::Reader::…
fotos Aug 3, 2019
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
6 changes: 3 additions & 3 deletions lib/unread/reader_scopes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def join_read_marks(readable)

joins "LEFT JOIN #{ReadMark.quoted_table_name}
ON #{ReadMark.quoted_table_name}.readable_type = '#{readable.class.readable_parent.name}'
AND (#{ReadMark.quoted_table_name}.readable_id = #{readable.id} OR #{ReadMark.quoted_table_name}.readable_id IS NULL)
AND (#{ReadMark.quoted_table_name}.readable_id = #{quote_bound_value(readable.id)} OR #{ReadMark.quoted_table_name}.readable_id IS NULL)
AND #{ReadMark.quoted_table_name}.reader_id = #{quoted_table_name}.#{quoted_primary_key}
AND #{ReadMark.quoted_table_name}.reader_type = '#{connection.quote_string base_class.name}'
AND #{ReadMark.quoted_table_name}.timestamp >= '#{connection.quoted_date readable.send(readable.class.readable_options[:on])}'"
Expand All @@ -31,8 +31,8 @@ def with_read_marks_for(readable)

join_read_marks(readable).select("#{quoted_table_name}.*,
#{ReadMark.quoted_table_name}.id AS read_mark_id,
#{quote_bound_value readable.class.name}#{postgresql_string_cast} AS read_mark_readable_type,
#{readable.id} AS read_mark_readable_id")
#{quote_bound_value(readable.class.name)}#{postgresql_string_cast} AS read_mark_readable_type,
#{quote_bound_value(readable.id)} AS read_mark_readable_id")
end
end
end
Expand Down