WIP

Author: simon-mundy

src/Sql/Argument/Identifier.php

@@ -11,7 +11,7 @@
 final readonly class Identifier implements ArgumentInterface
 {
     public function __construct(
-        private string $identifier
+        public string $identifier
     ) {
     }
 

src/Sql/Part/Columns.php

@@ -4,6 +4,7 @@
 
 namespace PhpDb\Sql\Part;
 
+use PhpDb\Sql\Argument\Identifier;
 use PhpDb\Sql\ArgumentInterface;
 use PhpDb\Sql\ExpressionInterface;
 use PhpDb\Sql\Platform\AbstractSqlRenderer;
@@ -57,7 +58,9 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
 
             $column = $ref->column;
 
-            if ($column instanceof ArgumentInterface) {
+            if ($column instanceof Identifier) {
+                $columnSql = $prefix . $platform->quoteIdentifier($column->identifier);
+            } elseif ($column instanceof ArgumentInterface) {
                 $columnSql = $prefix . $column->render($renderer, '', $pi);
             } else {
                 $columnSql = $renderer->render($column, $ref->alias ?? 'column');

src/Sql/Part/GroupBy.php

@@ -4,6 +4,7 @@
 
 namespace PhpDb\Sql\Part;
 
+use PhpDb\Sql\Argument\Identifier;
 use PhpDb\Sql\ArgumentInterface;
 use PhpDb\Sql\Platform\AbstractSqlRenderer;
 
@@ -21,13 +22,16 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
             return null;
         }
 
-        $groups = [];
-        $pi     = 0;
+        $platform = $renderer->platform;
+        $groups   = [];
 
         foreach ($this->group as $ref) {
             $column = $ref->column;
 
-            if ($column instanceof ArgumentInterface) {
+            if ($column instanceof Identifier) {
+                $groups[] = $platform->quoteIdentifier($column->identifier);
+            } elseif ($column instanceof ArgumentInterface) {
+                $pi       = 0;
                 $groups[] = $column->render($renderer, '', $pi);
             } else {
                 $groups[] = $renderer->render($column);

src/Sql/Part/OrderBy.php

@@ -4,6 +4,7 @@
 
 namespace PhpDb\Sql\Part;
 
+use PhpDb\Sql\Argument\Identifier;
 use PhpDb\Sql\ArgumentInterface;
 use PhpDb\Sql\ExpressionInterface;
 use PhpDb\Sql\Platform\AbstractSqlRenderer;
@@ -29,13 +30,17 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
             return null;
         }
 
-        $orders = [];
-        $pi     = 0;
+        $platform = $renderer->platform;
+        $orders   = [];
 
         foreach ($this->order as $spec) {
             $column = $spec->column;
 
-            if ($column instanceof ArgumentInterface) {
+            if ($column instanceof Identifier) {
+                $orders[] = $platform->quoteIdentifier($column->identifier)
+                           . ' ' . $spec->direction;
+            } elseif ($column instanceof ArgumentInterface) {
+                $pi       = 0;
                 $orders[] = $column->render($renderer, '', $pi)
                            . ' ' . $spec->direction;
             } else {

test/unit/Sql/JoinTest.php

@@ -7,7 +7,7 @@
 use PhpDb\Sql\Join;
 use PhpDb\Sql\Part\JoinSpec;
 use PhpDb\Sql\Part\Table;
-use PhpDb\Sql\Select;
+use PhpDb\Sql\TableIdentifier;
 use PhpDbTest\DeprecatedAssertionsTrait;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\IgnoreDeprecations;
@@ -92,14 +92,12 @@ public function testCurrentReturnsTheCurrentJoinSpecification(): void
         $join = new Join();
         $join->add(Table::createJoinSpec($name, $on));
 
-        $expectedSpecification = [
-            'name'    => $name,
-            'on'      => $on,
-            'columns' => [Select::SQL_STAR],
-            'type'    => Join::JOIN_INNER,
-        ];
-
-        self::assertEquals($expectedSpecification, $join->current());
+        $current = $join->current();
+        self::assertInstanceOf(TableIdentifier::class, $current['name']);
+        self::assertEquals('baz', $current['name']->getTable());
+        self::assertEquals($on, $current['on']);
+        self::assertArrayNotHasKey('columns', $current);
+        self::assertEquals(Join::JOIN_INNER, $current['type']);
     }
 
     public function testValidReturnsTrueIfTheIteratorIsAtAValidPositionAndFalseIfNot(): void

test/unit/Sql/SelectTest.php

@@ -158,34 +158,25 @@ public function testJoin(): void
     {
         $select = new Select();
 
-        // First mutation
         $result = $select->join('foo', 'x = y');
 
-        // Verify fluent interface
         self::assertSame($select, $result);
 
-        // Verify the first mutation occurred
         $joins = $select->getRawState('joins');
         self::assertInstanceOf(Join::class, $joins);
-        self::assertEquals(
-            [
-                [
-                    'name'    => 'foo',
-                    'on'      => 'x = y',
-                    'columns' => [Select::SQL_STAR],
-                    'type'    => Select::JOIN_INNER,
-                ],
-            ],
-            $joins->getJoins()
-        );
+        $joinList = $joins->getJoins();
+        self::assertCount(1, $joinList);
+        self::assertInstanceOf(TableIdentifier::class, $joinList[0]['name']);
+        self::assertEquals('foo', $joinList[0]['name']->getTable());
+        self::assertEquals('x = y', $joinList[0]['on']);
+        self::assertEquals(Select::JOIN_INNER, $joinList[0]['type']);
 
-        // Second mutation to verify mutability (joins accumulate)
         $select->join('bar', 'a = b');
 
-        // Verify the instance was actually mutated
         $joins2 = $select->getRawState('joins');
         self::assertCount(2, $joins2->getJoins());
-        self::assertEquals('bar', $joins2->getJoins()[1]['name']);
+        self::assertInstanceOf(TableIdentifier::class, $joins2->getJoins()[1]['name']);
+        self::assertEquals('bar', $joins2->getJoins()[1]['name']->getTable());
     }
 
     #[TestDox('unit test: Test join() exception with bad join')]
@@ -631,10 +622,12 @@ public function testReset(): void
         $select->join('foo', 'id = boo');
         $joins = $select->getRawState(Select::JOINS);
         self::assertInstanceOf(Join::class, $joins);
-        self::assertEquals(
-            [['name' => 'foo', 'on' => 'id = boo', 'columns' => ['*'], 'type' => 'INNER']],
-            $joins->getJoins()
-        );
+        $joinList = $joins->getJoins();
+        self::assertCount(1, $joinList);
+        self::assertInstanceOf(TableIdentifier::class, $joinList[0]['name']);
+        self::assertEquals('foo', $joinList[0]['name']->getTable());
+        self::assertEquals('id = boo', $joinList[0]['on']);
+        self::assertEquals('INNER', $joinList[0]['type']);
         $select->reset(Select::JOINS);
         $emptyJoins = $select->getRawState(Select::JOINS);
         self::assertInstanceOf(Join::class, $emptyJoins);