[#hql] - Fix operator types, Token handling, bracket identifiers and join conditions#6
Merged
niden merged 1 commit intophalcon:1.0.xfrom Apr 11, 2026
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 1.0.x #6 +/- ##
=========================================
Coverage 32.90% 32.90%
Complexity 5600 5600
=========================================
Files 7 7
Lines 8683 8686 +3
=========================================
+ Hits 2857 2858 +1
- Misses 5826 5828 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Opcode.php— 11 single-character operator constants (+,-,*,/,%,>,!,&,|,~,^) were defined as PHP strings instead of their ASCII integer values, causingtypefields in the parser AST to be characters instead of integersparser.php—phql_ret_raw_qualified_name()— function acceptedstring $tokenAbut the parser passesTokenobjects for CAST/CONVERT type names; changed to acceptTokenand call->getValue()Scanner.php— case 138 (bracket identifiers) —[col\[0\]]-style escaped-bracket identifiers used$q+1as the value start instead of$yymarker, which the C re2c scanner updates (viaPPMARKER = ++PPCURSOR) when processing\]sequencesScanner.php— case 41 (IDENTIFIER terminal) — identifiers that share a keyword prefix (e.g.Notesstarting withNOT) returned the full identifier instead of the post-keyword suffix; fixed by initializing$yymarker = $yycursorat the start of each token scan and using$yymarkerin case 41, matching the re2cPPMARKERoverwrite behavior in the C scannerparser.php— case 38 (emptyjoin_conditions) — emptyjoin_conditionsrule returned[]instead ofnull, causing CROSS JOIN (and other conditionless joins) to include a spurious'conditions' => []in the ASTTest plan
tests/unit/Mvc/Model/Query/Phql/pass