From fc372b56c1aefbef032a5fdb9e6e09f38092c5fd Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 28 Sep 2022 19:23:23 -0300 Subject: [PATCH] FIX: str_contains, JOIN --- src/Alias/Database/Query/Select.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Alias/Database/Query/Select.php b/src/Alias/Database/Query/Select.php index 7dd00cc..2fff624 100644 --- a/src/Alias/Database/Query/Select.php +++ b/src/Alias/Database/Query/Select.php @@ -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; }