Improve Expression::getDebugQuery() performance (#1224)

atk4 · May 31, 2024 · bd01571 · bd01571
1 parent e2c22d2
commit bd01571
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Persistence/Sql/Expression.php b/src/Persistence/Sql/Expression.php
@@ -24,6 +24,8 @@ abstract class Expression implements Expressionable, \ArrayAccess
 {
     use DiContainerTrait;
 
+    private static ?SqlFormatter $debugFormatter = null;
+
     /** "[]" in template, escape as parameter */
     protected const ESCAPE_PARAM = 'param';
     /** "{}" in template, escape as identifier */
@@ -434,11 +436,14 @@ function ($matches) use ($params, &$i) {
                 return $k;
             }, $sql);
 
-            $sqlFormatter = new SqlFormatter(new NullHighlighter());
-            $sql = $sqlFormatter->format($sql);
+            if (self::$debugFormatter === null) {
+                self::$debugFormatter = new SqlFormatter(new NullHighlighter());
+            }
+
+            $sql = self::$debugFormatter->format($sql);
 
             // fix string literal tokenize 2/2
-            $sql = str_replace(array_keys($origStringTokens), $origStringTokens, $sqlFormatter->format($sql));
+            $sql = str_replace(array_keys($origStringTokens), $origStringTokens, $sql);
         }
 
         return $sql;

diff --git a/src/Schema/Migrator.php b/src/Schema/Migrator.php
@@ -426,12 +426,14 @@ protected function fixTableNameForListMethod(string $tableName): string
 
     public function introspectTableToModel(string $tableName): Model
     {
-        $columns = $this->createSchemaManager()->listTableColumns($this->fixTableNameForListMethod($tableName));
+        $schemaManager = $this->createSchemaManager();
+
+        $columns = $schemaManager->listTableColumns($this->fixTableNameForListMethod($tableName));
         if ($columns === []) {
             $this->assertTableExists($tableName);
         }
 
-        $indexes = $this->createSchemaManager()->listTableIndexes($this->fixTableNameForListMethod($tableName));
+        $indexes = $schemaManager->listTableIndexes($this->fixTableNameForListMethod($tableName));
         $primaryIndexes = array_filter($indexes, static fn ($v) => $v->isPrimary() && count($v->getColumns()) === 1);
         if (count($primaryIndexes) !== 1) {
             throw (new Exception('Table must contain exactly one primary key'))