First bug fixes.

muhammetsafak · muhammetsafak · commit 7d1737f3d5a5 · 2022-08-08T19:27:19.000+03:00
diff --git a/src/DataMapper/DataMapper.php b/src/DataMapper/DataMapper.php
@@ -92,6 +92,9 @@ public function setParameters(array $parameters): self
      */
     public function addParameter(string $key, $value): string
     {
+        if($value === null){
+            return 'NULL';
+        }
         $originKey = ':' . \ltrim(\str_replace('.', '', $key), ':');
         $i = 0;
 
diff --git a/src/QueryBuilder/Expressions/From.php b/src/QueryBuilder/Expressions/From.php
@@ -52,7 +52,9 @@ protected function endTableSchema(): ?string
     protected function fromQuery(): string
     {
         if(($schema = $this->db->getSchema()) !== null){
-            \array_unshift($this->tables, $schema);
+            if(!\in_array($schema, $this->tables, true)){
+                \array_unshift($this->tables, $schema);
+            }
         }
         return ' FROM ' . \implode(', ', $this->tables);
     }

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ public function setParameters(array $parameters): self`
`92`	`92`	`*/`
`93`	`93`	`public function addParameter(string $key, $value): string`
`94`	`94`	`{`
	`95`	`+ if($value === null){`
	`96`	`+ return 'NULL';`
	`97`	`+ }`
`95`	`98`	`$originKey = ':' . \ltrim(\str_replace('.', '', $key), ':');`
`96`	`99`	`$i = 0;`
`97`	`100`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ protected function endTableSchema(): ?string`
`52`	`52`	`protected function fromQuery(): string`
`53`	`53`	`{`
`54`	`54`	`if(($schema = $this->db->getSchema()) !== null){`
`55`		`- \array_unshift($this->tables, $schema);`
	`55`	`+ if(!\in_array($schema, $this->tables, true)){`
	`56`	`+ \array_unshift($this->tables, $schema);`
	`57`	`+ }`
`56`	`58`	`}`
`57`	`59`	`return ' FROM ' . \implode(', ', $this->tables);`
`58`	`60`	`}`