Merge branch 'develop' into release

src/Alias/Database/Query/Insert.php

@@ -65,7 +65,7 @@ abstract class Insert extends Query implements InsertInterface
     }
     public function addValue(int|string $value): InsertInterface
     {
-        if (!is_numeric($value)) {
+        if (!is_numeric($value) and $value !== '?') {
             $value = "'{$value}'";
         }
         $this->values []= $value;

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

src/Database/QueryBuilder.php

@@ -20,18 +20,18 @@ class QueryBuilder implements QBInterface
 
     public function select(array $columns = ['*']): Select
     {
-        return $this->getContainer()->get(Select::class)->select($columns);
+        return $this->getContainer()->make(Select::class)->select($columns);
     }
     public function insert(string $table): Insert
     {
-        return $this->getContainer()->get(Insert::class)->into($table);
+        return $this->getContainer()->make(Insert::class)->into($table);
     }
     public function update(string $table): Update
     {
-        return $this->getContainer()->get(Update::class)->table($table);
+        return $this->getContainer()->make(Update::class)->table($table);
     }
     public function delete(string $table): Delete
     {
-        return $this->getContainer()->get(Delete::class)->from($table);
+        return $this->getContainer()->make(Delete::class)->from($table);
     }
 }