fix for #743

mevdschee · mevdschee · commit c003f404fbae · 2021-01-20T23:42:27.000+01:00
diff --git a/api.include.php b/api.include.php
@@ -6387,7 +6387,7 @@ public function lastInsertId(/* ?string */$name = null): string
             return $this->pdo()->lastInsertId($name);
         }
 
-        public function query(string $statement): \PDOStatement
+        public function query(string $query, int $fetchMode = null, mixed ...$fetchModeArgs): \PDOStatement
         {
             return call_user_func_array(array($this->pdo(), 'query'), func_get_args());
         }
@@ -7579,6 +7579,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     $columnNames = array_map('trim', explode(',', $returnedColumns));
                     $columnNames[] = $passwordColumnName;
                     $columnNames[] = $pkName;
+                    $columnNames = array_values(array_unique($columnNames));
                 }
                 $columnOrdering = $this->ordering->getDefaultColumnOrdering($table);
                 if ($path == 'register') {
diff --git a/api.php b/api.php
@@ -6387,7 +6387,7 @@ public function lastInsertId(/* ?string */$name = null): string
             return $this->pdo()->lastInsertId($name);
         }
 
-        public function query(string $statement): \PDOStatement
+        public function query(string $query, int $fetchMode = null, mixed ...$fetchModeArgs): \PDOStatement
         {
             return call_user_func_array(array($this->pdo(), 'query'), func_get_args());
         }
@@ -7579,6 +7579,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     $columnNames = array_map('trim', explode(',', $returnedColumns));
                     $columnNames[] = $passwordColumnName;
                     $columnNames[] = $pkName;
+                    $columnNames = array_values(array_unique($columnNames));
                 }
                 $columnOrdering = $this->ordering->getDefaultColumnOrdering($table);
                 if ($path == 'register') {
diff --git a/src/Tqdev/PhpCrudApi/Database/LazyPdo.php b/src/Tqdev/PhpCrudApi/Database/LazyPdo.php
@@ -117,7 +117,7 @@ public function lastInsertId(/* ?string */$name = null): string
         return $this->pdo()->lastInsertId($name);
     }
 
-    public function query(string $statement): \PDOStatement
+    public function query(string $query, int $fetchMode = null, mixed ...$fetchModeArgs): \PDOStatement
     {
         return call_user_func_array(array($this->pdo(), 'query'), func_get_args());
     }

Original file line number	Diff line number	Diff line change
`@@ -6387,7 +6387,7 @@ public function lastInsertId(/* ?string */$name = null): string`
`6387`	`6387`	`return $this->pdo()->lastInsertId($name);`
`6388`	`6388`	`}`
`6389`	`6389`
`6390`		`- public function query(string $statement): \PDOStatement`
	`6390`	`+ public function query(string $query, int $fetchMode = null, mixed ...$fetchModeArgs): \PDOStatement`
`6391`	`6391`	`{`
`6392`	`6392`	`return call_user_func_array(array($this->pdo(), 'query'), func_get_args());`
`6393`	`6393`	`}`
`@@ -7579,6 +7579,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`7579`	`7579`	`$columnNames = array_map('trim', explode(',', $returnedColumns));`
`7580`	`7580`	`$columnNames[] = $passwordColumnName;`
`7581`	`7581`	`$columnNames[] = $pkName;`
	`7582`	`+ $columnNames = array_values(array_unique($columnNames));`
`7582`	`7583`	`}`
`7583`	`7584`	`$columnOrdering = $this->ordering->getDefaultColumnOrdering($table);`
`7584`	`7585`	`if ($path == 'register') {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function lastInsertId(/* ?string */$name = null): string`
`117`	`117`	`return $this->pdo()->lastInsertId($name);`
`118`	`118`	`}`
`119`	`119`
`120`		`- public function query(string $statement): \PDOStatement`
	`120`	`+ public function query(string $query, int $fetchMode = null, mixed ...$fetchModeArgs): \PDOStatement`
`121`	`121`	`{`
`122`	`122`	`return call_user_func_array(array($this->pdo(), 'query'), func_get_args());`
`123`	`123`	`}`