修复查询构建器 join 方法传入 $where 参数的报错
#529
Merged
Conversation
This file contains 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
Yurunsoft
reviewed
May 31, 2023
src/Db/Query/Join.php
Outdated
| @@ -186,7 +186,7 @@ public function toString(IQuery $query): string | |||
| $result = $this->type . ' join ' . $this->table->toString($query) . ' on ' . $query->fieldQuote($this->left ?? '') . $this->operation . $query->fieldQuote($this->right ?? ''); | |||
| if ($this->where instanceof IBaseWhere) | |||
| { | |||
| $result .= ' ' . $this->where->toString($query); | |||
| $result .= ' and ' . $this->where->toStringWithoutLogic($query); | |||
There was a problem hiding this comment.
and 可以用 $this->where->getLogicalOperator() 代替
Yurunsoft
changed the title
join 方法传入 $where 参数的报错
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## 2.1 #529 +/- ##
============================================
- Coverage 64.33% 63.90% -0.43%
- Complexity 10986 10987 +1
============================================
Files 881 881
Lines 30048 30044 -4
============================================
- Hits 19332 19201 -131
- Misses 10716 10843 +127
☔ View full report in Codecov by Sentry. |
NHZEX
pushed a commit
to NHZEX/imi
that referenced
this pull request
Oct 18, 2023
--------- Co-authored-by: 落幕 <[email protected]>
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.
join操作时，如果有where对象，原本使用toString获取拼接语句是错的，因修改为toStringWithoutLogic，同时与sql语句拼接时，缺少and