Refactor DDLQueryBuilder::getColumnDefinition()

CHANGELOG.md

@@ -9,6 +9,8 @@
 - Enh #312: Change property `Schema::$typeMap` to constant `Schema::TYPE_MAP` (@Tigrov)
 - Enh #318: Resolve deprecated methods (@Tigrov)
 - Enh #319: Minor refactoring of `DDLQueryBuilder` and `Schema` (@Tigrov)
+- Enh #320: Minor refactoring of `DDLQueryBuilder::getColumnDefinition()` method (@Tigrov)
+- Bug #320: Change visibility of `DDLQueryBuilder::getColumnDefinition()` method to `private` (@Tigrov)
 - Bug #314: Fix `Command::insertWithReturningPks()` method for empty values (@Tigrov)
 
 ## 1.1.0 November 12, 2023

src/DDLQueryBuilder.php

@@ -10,6 +10,7 @@
 use Yiisoft\Db\QueryBuilder\AbstractDDLQueryBuilder;
 
 use function preg_match;
+use function preg_quote;
 use function preg_replace;
 use function trim;
 
@@ -167,27 +168,23 @@ public function renameColumn(string $table, string $oldName, string $newName): s
      * @param string $table The table name.
      * @param string $column The column name.
      *
-     * @throws Throwable In case when table doesn't contain a column.
-     *
-     * @return string The column definition.
+     * @return string The column definition or empty string in case when schema does not contain the table
+     * or the table doesn't contain the column.
      */
-    public function getColumnDefinition(string $table, string $column): string
+    private function getColumnDefinition(string $table, string $column): string
     {
-        $result = '';
         $sql = $this->schema->getTableSchema($table)?->getCreateSql();
 
         if (empty($sql)) {
             return '';
         }
 
-        if (preg_match_all('/^\s*([`"])(.*?)\\1\s+(.*?),?$/m', $sql, $matches) > 0) {
-            foreach ($matches[2] as $i => $c) {
-                if ($c === $column) {
-                    $result = $matches[3][$i];
-                }
-            }
+        $quotedColumn = preg_quote($column, '/');
+
+        if (preg_match("/^\s*([`\"])$quotedColumn\\1\s+(.*?),?$/m", $sql, $matches) !== 1) {
+            return '';
         }
 
-        return $result;
+        return $matches[2];
     }
 }

tests/QueryBuilderTest.php

@@ -516,7 +516,6 @@ public function testInsertInteger()
     public function testRenameColumn(): void
     {
         $db = $this->getConnection();
-
         $qb = $db->getQueryBuilder();
 
         $this->assertSame(
@@ -525,6 +524,20 @@ public function testRenameColumn(): void
             SQL,
             $qb->renameColumn('alpha', 'string_identifier', 'string_identifier_test'),
         );
+
+        $this->assertSame(
+            <<<SQL
+            ALTER TABLE `alpha` CHANGE `non_exist_column` `new_column`
+            SQL,
+            $qb->renameColumn('alpha', 'non_exist_column', 'new_column'),
+        );
+
+        $this->assertSame(
+            <<<SQL
+            ALTER TABLE `non_exist_table` CHANGE `non_exist_column` `new_column`
+            SQL,
+            $qb->renameColumn('non_exist_table', 'non_exist_column', 'new_column'),
+        );
     }
 
     /**