Cleaning up

mako-framework · Jan 20, 2025 · 8725b0f · 8725b0f
1 parent 115767a
commit 8725b0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/mako/database/query/compilers/Firebird.php b/src/mako/database/query/compilers/Firebird.php
@@ -83,7 +83,7 @@ public function updateAndReturn(array $values, array $return): array
 	{
 		$query = $this->update($values);
 
-		$query['sql'] .= ' RETURNING ' . $this->columns($return);
+		$query['sql'] .= ' RETURNING ' . $this->columnNames($return);
 
 		return $query;
 	}

diff --git a/src/mako/database/query/compilers/Postgres.php b/src/mako/database/query/compilers/Postgres.php
@@ -129,7 +129,7 @@ public function updateAndReturn(array $values, array $return): array
 	{
 		$query = $this->update($values);
 
-		$query['sql'] .= ' RETURNING ' . $this->columns($return);
+		$query['sql'] .= ' RETURNING ' . $this->columnNames($return);
 
 		return $query;
 	}

diff --git a/src/mako/database/query/compilers/SQLServer.php b/src/mako/database/query/compilers/SQLServer.php
@@ -11,8 +11,6 @@
 use mako\database\query\Raw;
 use mako\database\query\Subquery;
 
-use function array_map;
-use function explode;
 use function implode;
 use function str_replace;
 
@@ -123,12 +121,16 @@ protected function offset(?int $offset): string
 	 */
 	public function updateAndReturn(array $values, array $return): array
 	{
+		foreach ($return as $key => $column) {
+			$return[$key] = "inserted.{$this->columnName($column)}";
+		}
+
 		$sql = $this->query->getPrefix()
 		. 'UPDATE '
 		. $this->escapeTableName($this->query->getTable())
 		. ' SET '
 		. $this->updateColumns($values)
-		. ' OUTPUT ' . implode(', ', array_map(fn ($column) => "inserted.{$column}", explode(', ', $this->columns($return))))
+		. ' OUTPUT ' . implode(', ', $return)
 		. $this->wheres($this->query->getWheres());
 
 		return ['sql' => $sql, 'params' => $this->params];

diff --git a/src/mako/database/query/compilers/SQLite.php b/src/mako/database/query/compilers/SQLite.php
@@ -116,7 +116,7 @@ public function updateAndReturn(array $values, array $return): array
 	{
 		$query = $this->update($values);
 
-		$query['sql'] .= ' RETURNING ' . $this->columns($return);
+		$query['sql'] .= ' RETURNING ' . $this->columnNames($return);
 
 		return $query;
 	}