ProVM/query_builder
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into release

Browse Source
This commit is contained in:
Juan Pablo Vial
2022-09-12 21:00:03 -03:00
parent e7ab3fb8b7 3b1902ed1a
commit 946a0b0b5e
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Alias/Database/Query/Select.php
View File

@ -105,7 +105,19 @@ abstract class Select extends Query implements SelectInterface
}
public function getJoinString(): string
{
return implode(' ', $this->getJoins());
$str = [];
foreach ($this->getJoins() as $i => $join) {
if ($i === 0) {
$str []= $join;
continue;
}
if (!str_contains('and ', strtolower($join)) and !str_contains('or ', strtolower($join))) {
$str []= "AND {$join}";
continue;
}
$str []= $join;
}
return implode(' ', $str);
}
protected array $conditions;
public function setConditions(array $conditions): SelectInterface
@ -126,7 +138,19 @@ abstract class Select extends Query implements SelectInterface
}
public function getConditionString(): string
{
return implode(' ', $this->getConditions());
$str = [];
foreach ($this->getConditions() as $i => $condition) {
if ($i === 0) {
$str []= $condition;
continue;
}
if (!str_contains('and ', strtolower($condition)) and !str_contains('or ', strtolower($condition))) {
$str []= "AND {$condition}";
continue;
}
$str []= $condition;
}
return implode(' ', $str);
}
protected array $groups;
public function setGroups(array $groups): SelectInterface