Skip to content

Fix incorrect page count on some Query Log shortcuts#2074

Merged
DL6ER merged 1 commit into
developmentfrom
fix/query_log_blocked_cached
Sep 26, 2024
Merged

Fix incorrect page count on some Query Log shortcuts#2074
DL6ER merged 1 commit into
developmentfrom
fix/query_log_blocked_cached

Conversation

@DL6ER

@DL6ER DL6ER commented Sep 26, 2024

Copy link
Copy Markdown
Member

What does this implement/fix?

Do not take the not-filtered shortcut if one of the magic upstream={blocklist,cache} is selected via GET parameter. This is currently broken as detection of ongoing filtering is through variable binding to the SQL string. However, these two special upstreams work by using the IN operator which does not support binding to a prepared statement.


Related issue or feature (if applicable): https://discourse.pi-hole.net/t/incorrect-number-of-pages-in-query-log-if-only-blocked-domains-are-displayed/72622

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…locklist,cache} is selected. This is currently broken as detection of ongoing filtering is through variable bindung to the SQL string. However, these two special upstreams work by using the IN operator which does not support binding to a prepared statement.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team September 26, 2024 17:29
@pralor-bot

Copy link
Copy Markdown

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/incorrect-number-of-pages-in-query-log-if-only-blocked-domains-are-displayed/72622/6

@DL6ER DL6ER merged commit a52eb0c into development Sep 26, 2024
@DL6ER DL6ER deleted the fix/query_log_blocked_cached branch September 26, 2024 18:12
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants