Replace sentinel bytes with direct quote-char properties

simon-mundy · simon-mundy · commit 4ac0bf5ece89 · 2026-03-04T23:43:53.000+11:00
Remove the sentinel indirection (\x01/\x02 bytes + strtr at boundaries)
and instead quote identifiers directly using $qo/$qc/$qs properties on
the renderer, initialized from the platform in init().

Same performance benefit (no platform-&gt;quoteIdentifier calls, no
identifier cache) with simpler code and zero post-processing.
diff --git a/src/Sql/AbstractPreparableSql.php b/src/Sql/AbstractPreparableSql.php
@@ -8,11 +8,8 @@
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\ParameterContainer;
 use PhpDb\Adapter\StatementContainerInterface;
-use PhpDb\Sql\Platform\AbstractSqlRenderer;
 use PhpDb\Sql\Platform\Sql92Renderer;
 
-use function strtr;
-
 abstract class AbstractPreparableSql extends AbstractSql implements PreparableSqlInterface
 {
     #[Override]
@@ -28,17 +25,9 @@ public function prepareStatement(
             $statementContainer->setParameterContainer($parameterContainer);
         }
 
-        $renderer = (new Sql92Renderer())->init(
-            $adapter->getPlatform(),
-            $adapter->getDriver(),
-            $parameterContainer
-        );
-
         $statementContainer->setSql(
-            strtr(
-                $this->buildSqlString($renderer),
-                AbstractSqlRenderer::QI_PAIR,
-                $renderer->quoteChars
+            $this->buildSqlString(
+                (new Sql92Renderer())->init($adapter->getPlatform(), $adapter->getDriver(), $parameterContainer)
             )
         );
 
diff --git a/src/Sql/AbstractSql.php b/src/Sql/AbstractSql.php
@@ -10,8 +10,6 @@
 use PhpDb\Sql\Platform\AbstractSqlRenderer;
 use PhpDb\Sql\Platform\Sql92Renderer;
 
-use function strtr;
-
 abstract class AbstractSql implements SqlInterface
 {
     private ?AbstractSqlRenderer $renderer = null;
@@ -24,12 +22,8 @@ public function getSqlString(?PlatformInterface $adapterPlatform = null): string
     {
         $this->renderer ??= new Sql92Renderer();
 
-        $renderer = $this->renderer->init($adapterPlatform ?? new DefaultAdapterPlatform());
-
-        return strtr(
-            $this->buildSqlString($renderer),
-            AbstractSqlRenderer::QI_PAIR,
-            $renderer->quoteChars
+        return $this->buildSqlString(
+            $this->renderer->init($adapterPlatform ?? new DefaultAdapterPlatform())
         );
     }
 
diff --git a/src/Sql/Argument/Identifier.php b/src/Sql/Argument/Identifier.php
@@ -6,23 +6,12 @@
 
 use PhpDb\Sql\ArgumentInterface;
 use PhpDb\Sql\ArgumentType;
-use PhpDb\Sql\Platform\AbstractSqlRenderer;
-
-use function str_contains;
-use function str_replace;
 
 final readonly class Identifier implements ArgumentInterface
 {
-    public string $qi;
-
     public function __construct(
         public string $identifier
     ) {
-        $this->qi = str_contains($identifier, '.')
-            ? AbstractSqlRenderer::QI_OPEN
-                . str_replace('.', AbstractSqlRenderer::QI_SEP, $identifier)
-                . AbstractSqlRenderer::QI_CLOSE
-            : AbstractSqlRenderer::QI_OPEN . $identifier . AbstractSqlRenderer::QI_CLOSE;
     }
 
     public function getType(): ArgumentType
diff --git a/src/Sql/Insert.php b/src/Sql/Insert.php
@@ -158,7 +158,7 @@ public function buildSqlString(AbstractSqlRenderer $renderer): string
             if ($columnNames !== []) {
                 $columns = [];
                 foreach ($columnNames as $col) {
-                    $columns[] = AbstractSqlRenderer::QI_OPEN . $col . AbstractSqlRenderer::QI_CLOSE;
+                    $columns[] = $renderer->qo . $col . $renderer->qc;
                 }
                 return $keyword . ' ' . $tableSql
                     . ' (' . implode(', ', $columns) . ') ' . $selectSql;
@@ -178,7 +178,7 @@ public function buildSqlString(AbstractSqlRenderer $renderer): string
         $hasParamContainer = $renderer->parameterContainer instanceof ParameterContainer;
 
         foreach ($this->columns as $column => $value) {
-            $columns[] = AbstractSqlRenderer::QI_OPEN . $column . AbstractSqlRenderer::QI_CLOSE;
+            $columns[] = $renderer->qo . $column . $renderer->qc;
 
             if ($value === null) {
                 $values[] = 'NULL';
diff --git a/src/Sql/Part/Columns.php b/src/Sql/Part/Columns.php
@@ -17,6 +17,7 @@
 use function is_array;
 use function is_numeric;
 use function key;
+use function str_replace;
 
 class Columns extends AbstractPart
 {
@@ -79,7 +80,8 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
                 $column = $ref->column;
 
                 if ($column instanceof Identifier) {
-                    $columnSql = $prefix . $column->qi;
+                    $columnSql = $prefix
+                        . $renderer->qo . str_replace('.', $renderer->qs, $column->identifier) . $renderer->qc;
                 } elseif ($column instanceof ArgumentInterface) {
                     $columnSql = $prefix . $renderer->renderArgument($column, '', $pi);
                 } else {
@@ -88,7 +90,7 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
 
                 if ($ref->columnAlias !== null) {
                     $fragments[] = $columnSql . ' AS '
-                        . AbstractSqlRenderer::QI_OPEN . $ref->columnAlias . AbstractSqlRenderer::QI_CLOSE;
+                        . $renderer->qo . $ref->columnAlias . $renderer->qc;
                 } elseif ($ref->containsAlias) {
                     $fragments[] = $columnSql;
                 } else {
diff --git a/src/Sql/Part/GroupBy.php b/src/Sql/Part/GroupBy.php
@@ -10,6 +10,7 @@
 
 use function implode;
 use function is_array;
+use function str_replace;
 
 class GroupBy extends AbstractPart
 {
@@ -28,7 +29,7 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
             $column = $ref->column;
 
             if ($column instanceof Identifier) {
-                $groups[] = $column->qi;
+                $groups[] = $renderer->qo . str_replace('.', $renderer->qs, $column->identifier) . $renderer->qc;
             } elseif ($column instanceof ArgumentInterface) {
                 $pi       = 0;
                 $groups[] = $renderer->renderArgument($column, '', $pi);
diff --git a/src/Sql/Part/InsertSelect.php b/src/Sql/Part/InsertSelect.php
@@ -34,7 +34,7 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
 
         $columns = [];
         foreach (array_keys($this->columns) as $name) {
-            $columns[] = AbstractSqlRenderer::QI_OPEN . $name . AbstractSqlRenderer::QI_CLOSE;
+            $columns[] = $renderer->qo . $name . $renderer->qc;
         }
         $columnsSql = implode(', ', $columns);
 
diff --git a/src/Sql/Part/InsertValues.php b/src/Sql/Part/InsertValues.php
@@ -48,7 +48,7 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
         $isPdoDriver = $renderer->driver instanceof PdoDriverInterface;
 
         foreach ($this->columnValues as $cv) {
-            $columns[] = AbstractSqlRenderer::QI_OPEN . $cv->column . AbstractSqlRenderer::QI_CLOSE;
+            $columns[] = $renderer->qo . $cv->column . $renderer->qc;
 
             $values[] = match ($cv->value->getType()) {
                 ArgumentType::Parameter => $renderer->bindParameter(
diff --git a/src/Sql/Part/OrderBy.php b/src/Sql/Part/OrderBy.php
@@ -16,6 +16,7 @@
 use function ltrim;
 use function preg_split;
 use function str_contains;
+use function str_replace;
 
 class OrderBy extends AbstractPart
 {
@@ -37,7 +38,9 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
             $column = $spec->column;
 
             if ($column instanceof Identifier) {
-                $orders[] = $column->qi . ' ' . $spec->direction;
+                $orders[] = $renderer->qo
+                    . str_replace('.', $renderer->qs, $column->identifier)
+                    . $renderer->qc . ' ' . $spec->direction;
             } elseif ($column instanceof ArgumentInterface) {
                 $pi       = 0;
                 $orders[] = $renderer->renderArgument($column, '', $pi)
diff --git a/src/Sql/Part/Set.php b/src/Sql/Part/Set.php
@@ -5,7 +5,6 @@
 namespace PhpDb\Sql\Part;
 
 use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Sql\Argument\Identifier;
 use PhpDb\Sql\Argument\NullValue;
 use PhpDb\Sql\Argument\Parameter;
 use PhpDb\Sql\Argument\Select as SelectArgument;
@@ -18,15 +17,13 @@
 
 use function implode;
 use function is_string;
+use function str_replace;
 
 class Set extends AbstractPart
 {
     /** @var array<string, ArgumentInterface>|null */
     public ?array $model = null;
 
-    /** @var array<string, Identifier> */
-    private array $columnIds = [];
-
     public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', int &$paramIndex = 0): ?string
     {
         if ($this->model === null || $this->model === []) {
@@ -39,7 +36,7 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i
         $isPdoDriver = $renderer->driver instanceof PdoDriverInterface;
 
         foreach ($this->model as $column => $arg) {
-            $prefix = $this->columnIds[$column]->qi . ' = ';
+            $prefix = $renderer->qo . str_replace('.', $renderer->qs, $column) . $renderer->qc . ' = ';
 
             $setSql[] = $prefix . match ($arg->getType()) {
                 ArgumentType::Parameter => $renderer->bindParameter(
@@ -67,17 +64,15 @@ public function set(array $values, string|int $flag = 'set'): static
         $this->model ??= [];
 
         if ($flag === 'set') {
-            $this->model     = [];
-            $this->columnIds = [];
+            $this->model = [];
         }
 
         foreach ($values as $k => $v) {
             if (! is_string($k)) {
                 throw new Exception\InvalidArgumentException('set() expects a string for the value key');
             }
 
-            $this->model[$k]     = $this->normalizeValue($k, $v);
-            $this->columnIds[$k] = new Identifier($k);
+            $this->model[$k] = $this->normalizeValue($k, $v);
         }
         return $this;
     }
diff --git a/src/Sql/Platform/AbstractSqlRenderer.php b/src/Sql/Platform/AbstractSqlRenderer.php
@@ -27,17 +27,11 @@
 use function preg_split;
 use function spl_object_id;
 use function str_replace;
-use function strtr;
 
 use const PREG_SPLIT_DELIM_CAPTURE;
 
 abstract class AbstractSqlRenderer
 {
-    public const QI_OPEN  = "\x01";
-    public const QI_CLOSE = "\x02";
-    public const QI_SEP   = "\x02.\x01";
-    public const QI_PAIR  = "\x01\x02";
-
     private const IDENTIFIER_PATTERN
         = '/\b(?!(?:AS|AND|OR|BETWEEN)\b)([a-zA-Z_]\w*+(?:\.[a-zA-Z_]\w*+)*)(?!\s*\()/i';
 
@@ -46,7 +40,11 @@ abstract class AbstractSqlRenderer
 
     public PlatformInterface $platform;
 
-    public string $quoteChars = '""';
+    public string $qo = '"';
+
+    public string $qc = '"';
+
+    public string $qs = '"."';
 
     public ?DriverInterface $driver = null;
 
@@ -75,7 +73,9 @@ public function init(
             $this->platform            = $platform;
             $this->identifierSeparator = $platform->getIdentifierSeparator();
             $qi                        = $platform->quoteIdentifier('x');
-            $this->quoteChars          = $qi[0] . $qi[-1];
+            $this->qo                  = $qi[0];
+            $this->qc                  = $qi[-1];
+            $this->qs                  = $qi[-1] . '.' . $qi[0];
             $this->tablePrefixCache    = [];
         }
 
@@ -128,19 +128,19 @@ public function renderTableSource(
 
         if ($table instanceof TableIdentifier) {
             $rendered = $table->schema === null
-                ? self::QI_OPEN . $table->table . self::QI_CLOSE
-                : self::QI_OPEN . $table->schema . self::QI_SEP . $table->table . self::QI_CLOSE;
+                ? $this->qo . $table->table . $this->qc
+                : $this->qo . $table->schema . $this->qs . $table->table . $this->qc;
         } elseif ($table instanceof Select) {
             $rendered = '(' . $this->processSubSelect($table) . ')';
         } elseif (is_string($table)) {
-            $rendered = self::QI_OPEN . str_replace('.', self::QI_SEP, $table) . self::QI_CLOSE;
+            $rendered = $this->qo . str_replace('.', $this->qs, $table) . $this->qc;
         } else {
             $pi       = 0;
             $rendered = $table->toSql($this, '', $pi);
         }
 
         if ($alias !== null) {
-            $rendered .= ' AS ' . self::QI_OPEN . $alias . self::QI_CLOSE;
+            $rendered .= ' AS ' . $this->qo . $alias . $this->qc;
         }
 
         return $rendered;
@@ -156,12 +156,12 @@ public function renderResolvedTable(
 
         if ($table instanceof TableIdentifier) {
             $prefix = $alias !== null
-                ? self::QI_OPEN . $alias . self::QI_CLOSE
+                ? $this->qo . $alias . $this->qc
                 : ($table->schema !== null
-                    ? self::QI_OPEN . $table->schema . self::QI_SEP . $table->table . self::QI_CLOSE
-                    : self::QI_OPEN . $table->table . self::QI_CLOSE);
+                    ? $this->qo . $table->schema . $this->qs . $table->table . $this->qc
+                    : $this->qo . $table->table . $this->qc);
         } else {
-            $prefix = self::QI_OPEN . $alias . self::QI_CLOSE;
+            $prefix = $this->qo . $alias . $this->qc;
         }
 
         return $this->tablePrefixCache[$id] = $prefix . $this->identifierSeparator;
@@ -173,9 +173,9 @@ public function renderIdentifiersIn(string $part): string
         $count       = count($identifiers);
 
         for ($idx = 1; $idx < $count; $idx += 2) {
-            $identifiers[$idx] = self::QI_OPEN
-                . str_replace('.', self::QI_SEP, $identifiers[$idx])
-                . self::QI_CLOSE;
+            $identifiers[$idx] = $this->qo
+                . str_replace('.', $this->qs, $identifiers[$idx])
+                . $this->qc;
         }
 
         return implode('', $identifiers);
@@ -186,21 +186,13 @@ public function render(ExpressionInterface $expression, ?string $paramPrefix = n
         if ($this->parameterContainer === null) {
             $paramIndex = 0;
 
-            return strtr(
-                $expression->toSql($this, '', $paramIndex),
-                self::QI_PAIR,
-                $this->quoteChars
-            );
+            return $expression->toSql($this, '', $paramIndex);
         }
 
         $paramPrefix = $this->resolveParamPrefix($paramPrefix);
         $paramIndex  = &$this->instanceParameterIndex[$paramPrefix];
 
-        return strtr(
-            $expression->toSql($this, $paramPrefix, $paramIndex),
-            self::QI_PAIR,
-            $this->quoteChars
-        );
+        return $expression->toSql($this, $paramPrefix, $paramIndex);
     }
 
     public function renderArgument(
@@ -209,7 +201,9 @@ public function renderArgument(
         int &$paramIndex,
     ): string {
         return match (true) {
-            $argument instanceof Identifier    => strtr($argument->qi, self::QI_PAIR, $this->quoteChars),
+            $argument instanceof Identifier => $this->qo
+                . str_replace('.', $this->qs, $argument->identifier)
+                . $this->qc,
             $argument instanceof Literal       => $argument->literal,
             $argument instanceof NullValue     => 'NULL',
             $argument instanceof Parameter     => $this->bindParameter($argument),
@@ -256,21 +250,21 @@ public function processSubSelect(Select $subselect): string
             $this->subselectCount++;
             $this->paramPrefix = 'subselect' . $this->subselectCount;
 
-            $sql = strtr($subselect->buildSqlString($this), self::QI_PAIR, $this->quoteChars);
+            $sql = $subselect->buildSqlString($this);
 
             $this->paramPrefix = $savedPrefix;
             return $sql;
         }
 
-        return strtr($subselect->buildSqlString($this), self::QI_PAIR, $this->quoteChars);
+        return $subselect->buildSqlString($this);
     }
 
     /** @param list<Identifier> $identifiers */
     private function renderIdentifiers(array $identifiers): string
     {
         $quoted = [];
         foreach ($identifiers as $id) {
-            $quoted[] = strtr($id->qi, self::QI_PAIR, $this->quoteChars);
+            $quoted[] = $this->qo . str_replace('.', $this->qs, $id->identifier) . $this->qc;
         }
         return implode(', ', $quoted);
     }
diff --git a/src/Sql/Sql.php b/src/Sql/Sql.php

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function toSql(AbstractSqlRenderer $renderer, string $paramPrefix = '', i`
`34`	`34`
`35`	`35`	`$columns = [];`
`36`	`36`	`foreach (array_keys($this->columns) as $name) {`
`37`		`- $columns[] = AbstractSqlRenderer::QI_OPEN . $name . AbstractSqlRenderer::QI_CLOSE;`
	`37`	`+ $columns[] = $renderer->qo . $name . $renderer->qc;`
`38`	`38`	`}`
`39`	`39`	`$columnsSql = implode(', ', $columns);`
`40`	`40`