diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a89cc4..d4b0d93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Asset compilation for Redmine images +- Added missing query parentheses ## [1.2.0] - 2023-02-21 diff --git a/app/models/concerns/hourglass/query_base.rb b/app/models/concerns/hourglass/query_base.rb index 87349be..901c2af 100644 --- a/app/models/concerns/hourglass/query_base.rb +++ b/app/models/concerns/hourglass/query_base.rb @@ -102,7 +102,7 @@ def date_value(entry) end def sql_for_date_field(field, operator, value) - sql_for_field(field, operator, value, queried_class.table_name, 'start') + '(' + sql_for_field(field, operator, value, queried_class.table_name, 'start') + ')' end def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false) diff --git a/app/models/hourglass/time_booking_query.rb b/app/models/hourglass/time_booking_query.rb index 46c3c13..fdbf4ad 100644 --- a/app/models/hourglass/time_booking_query.rb +++ b/app/models/hourglass/time_booking_query.rb @@ -58,27 +58,27 @@ def base_scope end def sql_for_user_id_field(field, operator, value) - sql_for_field(field, operator, value, User.table_name, 'id') + '(' + sql_for_field(field, operator, value, User.table_name, 'id') + ')' end def sql_for_project_id_field(field, operator, value) - sql_for_field(field, operator, value, Project.table_name, 'id') + '(' + sql_for_field(field, operator, value, Project.table_name, 'id') + ')' end def sql_for_issue_id_field(field, operator, value) - sql_for_field(field, operator, value, Issue.table_name, 'id') + '(' + sql_for_field(field, operator, value, Issue.table_name, 'id') + ')' end def sql_for_issue_subject_field(field, operator, value) - sql_for_field(field, operator, value, Issue.table_name, 'subject') + '(' + sql_for_field(field, operator, value, Issue.table_name, 'subject') + ')' end def sql_for_fixed_version_id_field(field, operator, value) - sql_for_field(field, operator, value, Issue.table_name, 'fixed_version_id') + '(' + sql_for_field(field, operator, value, Issue.table_name, 'fixed_version_id') + ')' end def sql_for_comments_field(field, operator, value) - sql_for_field(field, operator, value, TimeEntry.table_name, 'comments', true) + '(' + sql_for_field(field, operator, value, TimeEntry.table_name, 'comments', true) + ')' end def sql_for_activity_id_field(field, operator, value) diff --git a/app/models/hourglass/time_log_query.rb b/app/models/hourglass/time_log_query.rb index c2827d7..e693ffd 100644 --- a/app/models/hourglass/time_log_query.rb +++ b/app/models/hourglass/time_log_query.rb @@ -45,11 +45,11 @@ def base_scope def sql_for_booked_field(field, operator, _value) operator_to_use = operator == '=' ? '*' : '!*' - sql_for_field(field, operator_to_use, nil, TimeBooking.table_name, 'id') + '(' + sql_for_field(field, operator_to_use, nil, TimeBooking.table_name, 'id') + ')' end def sql_for_comments_field(field, operator, value) - sql_for_field(field, operator, value, TimeLog.table_name, 'comments', true) + '(' + sql_for_field(field, operator, value, TimeLog.table_name, 'comments', true) + ')' end def total_for_hours(scope) diff --git a/app/models/hourglass/time_tracker_query.rb b/app/models/hourglass/time_tracker_query.rb index bf0c0aa..7399b05 100644 --- a/app/models/hourglass/time_tracker_query.rb +++ b/app/models/hourglass/time_tracker_query.rb @@ -55,7 +55,7 @@ def base_scope end def sql_for_fixed_version_id_field(field, operator, value) - sql_for_field(field, operator, value, Issue.table_name, 'fixed_version_id') + '(' + sql_for_field(field, operator, value, Issue.table_name, 'fixed_version_id') + ')' end def sql_for_custom_field(*args) @@ -67,7 +67,7 @@ def sql_for_custom_field(*args) end def sql_for_comments_field(field, operator, value) - sql_for_field(field, operator, value, TimeTracker.table_name, 'comments', true) + '(' + sql_for_field(field, operator, value, TimeTracker.table_name, 'comments', true) + ')' end def has_through_associations