Merge pull request propelorm#1694 from propelorm/feature/performance

Updated TableMap generator to add column name map for normalization, …
elacasse · Jan 13, 2021 · a422bdd · a422bdd
2 parents 8aaf565 + 832c9f1
commit a422bdd
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 3 deletions.
diff --git a/src/Propel/Generator/Builder/Om/TableMapBuilder.php b/src/Propel/Generator/Builder/Om/TableMapBuilder.php
@@ -146,6 +146,7 @@ protected function addClassBody(&$script)
         $this->addAttributes($script);
 
         $script .= $this->addFieldsAttributes();
+        $this->addNormalizedColumnNameMap($script);
 
         if ($table->hasValueSetColumns()) {
             $this->addValueSetColumnAttributes($script);
@@ -444,6 +445,64 @@ protected function addFieldsAttributes()
         ]);
     }
 
+    /**
+     * @param string $script
+     *
+     * @return void
+     */
+    protected function addNormalizedColumnNameMap(&$script): void
+    {
+        $script .= '
+    /**
+     * Holds a list of column names and their normalized version.
+     *
+     * @var string[]
+     */
+    protected $normalizedColumnNameMap = [' . PHP_EOL;
+
+        $table = $this->getTable();
+        $tableColumns = $table->getColumns();
+
+        foreach ($tableColumns as $num => $column) {
+            $normalizedName = strtoupper($column->getName());
+
+            // ColumnName => COLUMN_NAME
+            $script .= '
+        \'' . $column->getPhpName() . '\' => \'' . $normalizedName . '\',';
+
+            // TableName.ColumnName => COLUMN_NAME
+            $script .= '
+        \'' . $table->getPhpName() . '.' . $column->getPhpName() . '\' => \'' . $normalizedName . '\',';
+
+            // columnName => COLUMN_NAME
+            $script .= '
+        \'' . $column->getCamelCaseName() . '\' => \'' . $normalizedName . '\',';
+
+            // tableName.columnName => COLUMN_NAME
+            $script .= '
+        \'' . $table->getCamelCaseName() . '.' . $column->getCamelCaseName() . '\' => \'' . $normalizedName . '\',';
+
+            // TableNameTableMap::COL_COLUMN_NAME => COLUMN_NAME
+            $script .= '
+        \'' . $this->getColumnConstant($column, $this->getTableMapClass()) . '\' => \'' . $normalizedName . '\',';
+
+            // COL_COLUMN_NAME => COLUMN_NAME
+            $script .= '
+        \'' . $column->getConstantName() . '\' => \'' . $normalizedName . '\',';
+
+            // column_name => COLUMN_NAME
+            $script .= '
+        \'' . $column->getName() . '\' => \'' . $normalizedName . '\',';
+
+            // table_name.column_name => COLUMN_NAME
+            $script .= '
+        \'' . $table->getName() . '.' . $column->getName() . '\' => \'' . $normalizedName . '\',';
+        }
+
+        $script .= '
+    ];' . PHP_EOL;
+    }
+
     /**
      * Closes class.
      *

diff --git a/src/Propel/Runtime/Map/TableMap.php b/src/Propel/Runtime/Map/TableMap.php
@@ -67,6 +67,13 @@ class TableMap
      */
     protected $columnsByPhpName = [];
 
+    /**
+     * Map of normalized column names
+     *
+     * @var string[]
+     */
+    protected $normalizedColumnNameMap = [];
+
     /**
      * The database this table belongs to
      *
@@ -411,6 +418,16 @@ private static function getPrimaryKey(Criteria $criteria)
         return $pk;
     }
 
+    /**
+     * @param string $columnName
+     *
+     * @return string
+     */
+    protected function getNormalizedColumnName(string $columnName): string
+    {
+        return $this->normalizedColumnNameMap[$columnName] ?? ColumnMap::normalizeName($columnName);
+    }
+
     /**
      * Add a column to the table.
      *
@@ -445,7 +462,7 @@ public function addColumn($name, $phpName, $type, $isNotNull = false, $size = nu
             $this->foreignKeys[$name] = $col;
         }
 
-        $this->columns[ColumnMap::normalizeName($name)] = $col;
+        $this->columns[$this->getNormalizedColumnName($name)] = $col;
         $this->columnsByPhpName[$phpName] = $col;
 
         return $col;
@@ -479,7 +496,7 @@ public function hasColumn($name, $normalize = true)
         if ($name instanceof ColumnMap) {
             $name = $name->getName();
         } elseif ($normalize) {
-            $name = ColumnMap::normalizeName($name);
+            $name = $this->getNormalizedColumnName($name);
         }
 
         return isset($this->columns[$name]);
@@ -498,7 +515,7 @@ public function hasColumn($name, $normalize = true)
     public function getColumn($name, $normalize = true)
     {
         if ($normalize) {
-            $name = ColumnMap::normalizeName($name);
+            $name = $this->getNormalizedColumnName($name);
         }
         if (!$this->hasColumn($name, false)) {
             throw new ColumnNotFoundException(sprintf('Cannot fetch ColumnMap for undefined column: %s in table %s.', $name, $this->getName()));