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

Compare commits

base: ProVM:946a0b0b5e999eced642b30bac5952ff5d6a7465
Branches Tags
ProVM:master ProVM:develop ProVM:release
ProVM:1.1.0 ProVM:1.0.6 ProVM:1.0.5 ProVM:1.0.4 ProVM:1.0.3 ProVM:1.0.2 ProVM:1.0.1 ProVM:1.0.0
...
compare: ProVM:acce5b2b1718d406c2c0967712f570425fdccc6f
Branches Tags
ProVM:master ProVM:develop ProVM:release
ProVM:1.1.0 ProVM:1.0.6 ProVM:1.0.5 ProVM:1.0.4 ProVM:1.0.3 ProVM:1.0.2 ProVM:1.0.1 ProVM:1.0.0

2 Commits
946a0b0b5e ... acce5b2b17

Author SHA1 Message Date
Aldarien
acce5b2b17 Fixed condition expressions 2022-09-28 19:26:31 -03:00
Aldarien
fc372b56c1 FIX: str_contains, JOIN 2022-09-28 19:23:23 -03:00
1 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

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

@ -111,8 +111,8 @@ abstract class Select extends Query implements SelectInterface
$str []= $join;
continue;
}
if (!str_contains('and ', strtolower($join)) and !str_contains('or ', strtolower($join))) {
$str []= "AND {$join}";
if (!str_contains(strtolower($join), 'join')) {
$str []= "JOIN {$join}";
continue;
}
$str []= $join;
@ -144,7 +144,7 @@ abstract class Select extends Query implements SelectInterface
$str []= $condition;
continue;
}
if (!str_contains('and ', strtolower($condition)) and !str_contains('or ', strtolower($condition))) {
if (!str_contains(strtolower($condition), 'and') and !str_contains(strtolower($condition), 'or')) {
$str []= "AND {$condition}";
continue;
}