Reduce accumulation-phase overhead in join, columns, and order setup

Inline buildColumnRefs into Table->join, skip addJoinRefs for empty
columns, use array_push spread, lazy column normalization, and remove
trim from OrderSpec direction check.

Author: simon-mundy

src/Sql/Part/Columns.php

@@ -10,6 +10,7 @@
 use PhpDb\Sql\Platform\AbstractSqlRenderer;
 use PhpDb\Sql\Select;
 
+use function array_push;
 use function count;
 use function current;
 use function implode;
@@ -23,14 +24,14 @@ class Columns extends AbstractPart
     private array $columnRefs            = [];
     private array $rawColumns            = [Select::SQL_STAR];
     private bool $prefixColumnsWithTable = true;
+    private bool $isNormalized           = false;
     private ?From $from                  = null;
     /** @var ColumnRef[] */
     private array $joinRefs = [];
 
     public function __construct(?From $from = null)
     {
         $this->from = $from;
-        $this->normalizeColumns();
     }
 
     public function setFrom(?From $from): void
@@ -40,6 +41,11 @@ public function setFrom(?From $from): void
 
     public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', int &$paramIndex = 0): ?string
     {
+        if (! $this->isNormalized) {
+            $this->normalizeColumns();
+            $this->isNormalized = true;
+        }
+
         $refs       = $this->columnRefs;
         $fromPrefix = $this->prefixColumnsWithTable && $this->from !== null && $this->from->table !== null
             ? $renderer->renderResolvedTable($this->from->table, $this->from->alias)
@@ -100,13 +106,18 @@ public function isEmpty(): bool
 
     public function set(array $columns): static
     {
-        $this->rawColumns = $columns;
-        $this->normalizeColumns();
+        $this->rawColumns   = $columns;
+        $this->isNormalized = false;
         return $this;
     }
 
     public function add(array|ArgumentInterface|ExpressionInterface|string $column, ?string $alias = null): static
     {
+        if (! $this->isNormalized) {
+            $this->normalizeColumns();
+            $this->isNormalized = true;
+        }
+
         if (is_array($column)) {
             $key    = key($column);
             $alias  = ! is_numeric($key) ? $key : null;
@@ -142,9 +153,7 @@ public function getPrefixColumnsWithTable(): bool
     /** @param ColumnRef[] $refs */
     public function addJoinRefs(array $refs): static
     {
-        foreach ($refs as $ref) {
-            $this->joinRefs[] = $ref;
-        }
+        array_push($this->joinRefs, ...$refs);
         return $this;
     }
 

src/Sql/Part/OrderBy.php

@@ -13,6 +13,7 @@
 use function implode;
 use function is_array;
 use function is_string;
+use function ltrim;
 use function preg_split;
 use function str_contains;
 
@@ -77,7 +78,7 @@ public function add(ArgumentInterface|ExpressionInterface|array|string $order):
                 $this->order[] = new OrderSpec($k, $v);
             } elseif (str_contains($v, ' ')) {
                 [$col, $dir]   = explode(' ', $v, 2);
-                $this->order[] = new OrderSpec($col, $dir);
+                $this->order[] = new OrderSpec($col, ltrim($dir));
             } else {
                 $this->order[] = new OrderSpec($v);
             }

src/Sql/Part/OrderSpec.php

@@ -10,7 +10,6 @@
 
 use function is_string;
 use function strcasecmp;
-use function trim;
 
 final readonly class OrderSpec
 {
@@ -25,7 +24,7 @@ public function __construct(
         string $direction = self::ORDER_ASCENDING,
     ) {
         $this->column    = is_string($column) ? new Identifier($column) : $column;
-        $this->direction = strcasecmp(trim($direction), self::ORDER_DESCENDING) === 0
+        $this->direction = strcasecmp($direction, self::ORDER_DESCENDING) === 0
             ? self::ORDER_DESCENDING
             : self::ORDER_ASCENDING;
     }

src/Sql/Part/Table.php

@@ -90,7 +90,19 @@ public function join(
     ): static {
         $spec = self::createJoinSpec($name, $on, $columns, $type);
         $this->join->add($spec);
-        $this->columns->addJoinRefs(self::buildColumnRefs($columns, $spec->table, $spec->alias));
+
+        if (! is_array($columns)) {
+            $columns = [$columns];
+        }
+
+        if ($columns !== []) {
+            $refs = [];
+            foreach ($columns as $key => $column) {
+                $refs[] = new ColumnRef($key, $column, $spec->table, $spec->alias);
+            }
+            $this->columns->addJoinRefs($refs);
+        }
+
         return $this;
     }
 
@@ -121,23 +133,6 @@ public static function createJoinSpec(
         return new JoinSpec($table, $alias, $on, $type);
     }
 
-    /** @return ColumnRef[] */
-    private static function buildColumnRefs(
-        array|string $columns,
-        TableIdentifier|Select|ExpressionInterface $table,
-        ?string $alias,
-    ): array {
-        if (! is_array($columns)) {
-            $columns = [$columns];
-        }
-
-        $refs = [];
-        foreach ($columns as $key => $column) {
-            $refs[] = new ColumnRef($key, $column, $table, $alias);
-        }
-        return $refs;
-    }
-
     public function hasJoins(): bool
     {
         return $this->join->isEmpty();