refactor(database): address whereColumn review polish

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

system/Database/BaseBuilder.php

@@ -747,7 +747,7 @@ public function orWhere($key, $value = null, ?bool $escape = null)
      *
      * @throws InvalidArgumentException
      */
-    public function whereColumn(string $first, string $second, ?bool $escape = null)
+    public function whereColumn(string $first, string $second, ?bool $escape = null): static
     {
         return $this->whereColumnHaving('QBWhere', $first, $second, 'AND ', $escape);
     }
@@ -763,7 +763,7 @@ public function whereColumn(string $first, string $second, ?bool $escape = null)
      *
      * @throws InvalidArgumentException
      */
-    public function orWhereColumn(string $first, string $second, ?bool $escape = null)
+    public function orWhereColumn(string $first, string $second, ?bool $escape = null): static
     {
         return $this->whereColumnHaving('QBWhere', $first, $second, 'OR ', $escape);
     }
@@ -782,7 +782,7 @@ public function orWhereColumn(string $first, string $second, ?bool $escape = nul
      *
      * @throws InvalidArgumentException
      */
-    protected function whereColumnHaving(string $qbKey, string $first, string $second, string $type = 'AND ', ?bool $escape = null)
+    protected function whereColumnHaving(string $qbKey, string $first, string $second, string $type = 'AND ', ?bool $escape = null): static
     {
         [$first, $operator] = $this->parseWhereColumnFirst($first);
         $second             = trim($second);
@@ -793,9 +793,7 @@ protected function whereColumnHaving(string $qbKey, string $first, string $secon
             throw new InvalidArgumentException(sprintf('%s() expects $first and $second to be non-empty strings', $caller));
         }
 
-        if (! is_bool($escape)) {
-            $escape = $this->db->protectIdentifiers;
-        }
+        $escape ??= $this->db->protectIdentifiers;
 
         $prefix = $this->{$qbKey} === [] ? $this->groupGetType('') : $this->groupGetType($type);
 
@@ -3278,6 +3276,8 @@ protected function compileWhereHaving(string $qbKey): string
     }
 
     /**
+     * @used-by compileWhereHaving()
+     *
      * @param array{columnComparison: true, condition: string, escape: bool, first: string, operator: string, second: string} $condition
      */
     private function compileColumnComparison(array $condition): string

tests/system/Database/Builder/WhereTest.php

@@ -352,30 +352,35 @@ public function testOrWhereSameColumn(): void
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testWhereColumn(): void
+    #[DataProvider('provideWhereColumnWithOperators')]
+    public function testWhereColumnWithOperators(string $first, string $operator): void
     {
         $builder = $this->db->table('users');
 
-        $builder->whereColumn('created_at', 'updated_at');
+        $builder->whereColumn($first, 'updated_at');
 
-        $expectedSQL   = 'SELECT * FROM "users" WHERE "created_at" = "updated_at"';
+        $expectedSQL   = sprintf('SELECT * FROM "users" WHERE "created_at" %s "updated_at"', $operator);
         $expectedBinds = [];
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testWhereColumnWithOperator(): void
+    /**
+     * @return iterable<string, array{string, string}>
+     */
+    public static function provideWhereColumnWithOperators(): iterable
     {
-        $builder = $this->db->table('users');
-
-        $builder->whereColumn('updated_at >', 'created_at');
-
-        $expectedSQL   = 'SELECT * FROM "users" WHERE "updated_at" > "created_at"';
-        $expectedBinds = [];
-
-        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-        $this->assertSame($expectedBinds, $builder->getBinds());
+        return [
+            'default' => ['created_at', '='],
+            '='       => ['created_at =', '='],
+            '!='      => ['created_at !=', '!='],
+            '<>'      => ['created_at <>', '<>'],
+            '<'       => ['created_at <', '<'],
+            '>'       => ['created_at >', '>'],
+            '<='      => ['created_at <=', '<='],
+            '>='      => ['created_at >=', '>='],
+        ];
     }
 
     public function testWhereColumnWithAlias(): void