Allow multiple columns

Author: freost

src/mako/database/query/Query.php

@@ -1162,62 +1162,64 @@ public function descendingVectorDistance(string $column, array|string|Subquery $
 	/**
 	 * Adds a ORDER BY clause where nulls come either first or last.
 	 */
-	protected function orderByNull(string $column, SortDirection $order = SortDirection::Ascending, bool $nullsLast = true): static
-	{
-		$this->orderings[] = [
-			'type'      => 'nullOrdering',
-			'column'    => $column,
-			'order'     => $order->value,
-			'nullsLast' => $nullsLast,
-		];
+	protected function orderByNull(array|string $column, SortDirection $order = SortDirection::Ascending, bool $nullsLast = true): static
+	{
+		foreach ((array) $column as $col) {
+			$this->orderings[] = [
+				'type'      => 'nullOrdering',
+				'column'    => $col,
+				'order'     => $order->value,
+				'nullsLast' => $nullsLast,
+			];
+		}
 
 		return $this;
 	}
 
 	/**
 	 * Adds a ORDER BY clause where nulls come first.
 	 */
-	public function orderByNullsFirst(string $column, SortDirection|string $order = SortDirection::Ascending): static
+	public function orderByNullsFirst(array|string $column, SortDirection|string $order = SortDirection::Ascending): static
 	{
 		return $this->orderByNull($column, $order, false);
 	}
 
 	/**
 	 * Adds a ORDER BY clause where nulls come last.
 	 */
-	public function orderByNullsLast(string $column, SortDirection|string $order = SortDirection::Ascending): static
+	public function orderByNullsLast(array|string $column, SortDirection|string $order = SortDirection::Ascending): static
 	{
 		return $this->orderByNull($column, $order, true);
 	}
 
 	/**
 	 * Adds an ascending ORDER BY clause where nulls come first.
 	 */
-	public function ascendingNullsFirst(string $column): static
+	public function ascendingNullsFirst(array|string $column): static
 	{
 		return $this->orderByNull($column, SortDirection::Ascending, false);
 	}
 
 	/**
 	 * Adds a descending ORDER BY clause where nulls come first.
 	 */
-	public function descendingNullsFirst(string $column): static
+	public function descendingNullsFirst(array|string $column): static
 	{
 		return $this->orderByNull($column, SortDirection::Descending, false);
 	}
 
 	/**
 	 * Adds an ascending ORDER BY clause where nulls come last.
 	 */
-	public function ascendingNullsLast(string $column): static
+	public function ascendingNullsLast(array|string $column): static
 	{
 		return $this->orderByNull($column, SortDirection::Ascending, true);
 	}
 
 	/**
 	 * Adds a descending ORDER BY clause where nulls come last.
 	 */
-	public function descendingNullsLast(string $column): static
+	public function descendingNullsLast(array|string $column): static
 	{
 		return $this->orderByNull($column, SortDirection::Descending, true);
 	}

tests/unit/database/query/compilers/BaseCompilerTest.php

@@ -2077,6 +2077,32 @@ public function testOrderByNullsFirst(): void
 		$this->assertEquals([], $query['params']);
 	}
 
+	/**
+	 *
+	 */
+	public function testOrderByNullsFirstWithMultipleColumns(): void
+	{
+		$query = $this->getBuilder();
+
+		$query->orderByNullsFirst(['text1', 'text2']);
+
+		$query = $query->getCompiler()->select();
+
+		$this->assertEquals('SELECT * FROM "foobar" ORDER BY ("text1" IS NOT NULL), "text1" ASC, ("text2" IS NOT NULL), "text2" ASC', $query['sql']);
+		$this->assertEquals([], $query['params']);
+
+		//
+
+		$query = $this->getBuilder();
+
+		$query->orderByNullsFirst(['text1', 'text2'], SortDirection::Descending);
+
+		$query = $query->getCompiler()->select();
+
+		$this->assertEquals('SELECT * FROM "foobar" ORDER BY ("text1" IS NOT NULL), "text1" DESC, ("text2" IS NOT NULL), "text2" DESC', $query['sql']);
+		$this->assertEquals([], $query['params']);
+	}
+
 	/**
 	 *
 	 */