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.

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 #491 - Allow the COLLATE keyword in WHERE clauses #494

Merged
merged 1 commit into from
Aug 12, 2023

Conversation

BackEndTea
Copy link
Contributor

@BackEndTea BackEndTea commented Aug 12, 2023

Fixes: #491

I've altered the query to not use ?, since that seems to have errors.

@codecov
Copy link

codecov bot commented Aug 12, 2023

Codecov Report

Patch coverage: 94.41% and no project coverage change.

Comparison is base (4751563) 96.61% compared to head (7f0f054) 96.61%.
Report is 1 commits behind head on 5.8.x.

❗ Current head 7f0f054 differs from pull request most recent head 371377d. Consider uploading reports for the commit 371377d to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##              5.8.x     #494   +/-   ##
=========================================
  Coverage     96.61%   96.61%           
  Complexity     2173     2173           
=========================================
  Files            66       66           
  Lines          5054     5054           
=========================================
  Hits           4883     4883           
  Misses          171      171           
Files Changed Coverage Δ
src/Tools/CustomJsonSerializer.php 0.00% <0.00%> (ø)
src/Tools/TestGenerator.php 0.00% <0.00%> (ø)
src/Components/UnionKeyword.php 55.55% <20.00%> (ø)
src/Components/WithKeyword.php 76.47% <20.00%> (ø)
src/Components/FunctionCall.php 93.33% <33.33%> (ø)
src/Components/Array2d.php 95.23% <50.00%> (ø)
src/Tools/ContextGenerator.php 70.17% <70.00%> (ø)
src/Components/AlterOperation.php 98.67% <71.42%> (ø)
src/Core.php 87.50% <75.00%> (ø)
src/Components/JoinKeyword.php 96.96% <77.77%> (ø)
... and 54 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@williamdes williamdes changed the base branch from master to 5.8.x August 12, 2023 21:25
@williamdes williamdes added this to the 5.9.0 milestone Aug 12, 2023
@williamdes williamdes self-assigned this Aug 12, 2023
Copy link
Member

@williamdes williamdes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you !
I rebased it onto our QA branch and did some minor edit to your PR description

@williamdes williamdes changed the title Allow the COLLATE keyword in WHERE clauses Fix #491 - Allow the COLLATE keyword in WHERE clauses Aug 12, 2023
williamdes added a commit that referenced this pull request Aug 12, 2023
Pull-request: #494

Signed-off-by: William Desportes <[email protected]>
@williamdes williamdes merged commit dd614a6 into phpmyadmin:5.8.x Aug 12, 2023
6 of 10 checks passed
@BackEndTea
Copy link
Contributor Author

Thanks @williamdes !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing support for COLLATE inside WHERE
2 participants