From e07798e3b6c7e3177f5073a384889f62f1b9d86e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 27 Sep 2023 18:16:48 +0000 Subject: [PATCH] fix update query --- DataStorage/Database/Query/Builder.php | 17 ++++------------- Utils/IO/Csv/CsvDatabaseMapper.php | 2 +- .../Spreadsheet/SpreadsheetDatabaseMapper.php | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php index b9b953093..28d492e09 100755 --- a/DataStorage/Database/Query/Builder.php +++ b/DataStorage/Database/Query/Builder.php @@ -1027,7 +1027,7 @@ class Builder extends BuilderAbstract /** * Update columns. * - * @param mixed ...$columns Column names to update + * @param string $table Column names to update * * @return Builder * @@ -1036,23 +1036,14 @@ class Builder extends BuilderAbstract * * @since 1.0.0 */ - public function update(mixed ...$columns) : self + public function update(string $table) : self { if ($this->isReadOnly) { throw new \Exception(); } - $this->type = QueryType::UPDATE; - - /** @var mixed[] $columns */ - /** @var mixed $table */ - foreach ($columns as $column) { - if (\is_string($column) || $column instanceof self) { - $this->updates[] = $column; - } else { - throw new \InvalidArgumentException(); - } - } + $this->type = QueryType::UPDATE; + $this->updates[] = $table; return $this; } diff --git a/Utils/IO/Csv/CsvDatabaseMapper.php b/Utils/IO/Csv/CsvDatabaseMapper.php index 0ec5fc702..f746d8683 100644 --- a/Utils/IO/Csv/CsvDatabaseMapper.php +++ b/Utils/IO/Csv/CsvDatabaseMapper.php @@ -166,7 +166,7 @@ class CsvDatabaseMapper implements IODatabaseMapper // update data while (($cells = \fgetcsv($fp)) !== false) { $query = new Builder($this->con); - $query->update(...$titles)->into($table); + $query->update($table); for ($j = 2; $j <= $columns; ++$j) { $query->sets((string) $titles[$j - 2], $cells[$j - 1]); diff --git a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php index fa0d18a59..3f460740e 100755 --- a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php +++ b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php @@ -221,7 +221,7 @@ class SpreadsheetDatabaseMapper implements IODatabaseMapper $line = 2; while (!empty($workSheet->getCell('A' . $line)->getCalculatedValue())) { $query = new Builder($this->con); - $query->update(...$titles)->into($table); + $query->update($table); for ($j = 2; $j <= $columns; ++$j) { $query->sets((string) $titles[$j - 2], $workSheet->getCell(StringUtils::intToAlphabet($j) . $line)->getCalculatedValue());