Merge branch 'develop' into release

src/Alias/Database/Query/Select.php

@@ -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