Merge pull request #101 from owncloud/pgsql-altertable-keyword-escaping

Fix escaping of column name for specific alter table case
owncloud-archive · Jul 1, 2014 · 6ece897 · 6ece897
2 parents 797bd8a + 58308ec
commit 6ece897
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php b/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
@@ -411,7 +411,7 @@ public function getAlterTableSQL(TableDiff $diff)
             }
 
             if ($columnDiff->hasChanged('length')) {
-                $query = 'ALTER ' . $column->getName() . ' TYPE ' . $column->getType()->getSqlDeclaration($column->toArray(), $this);
+                $query = 'ALTER ' . $oldColumnName . ' TYPE ' . $column->getType()->getSqlDeclaration($column->toArray(), $this);
                 $sql[] = 'ALTER TABLE ' . $diff->name . ' ' . $query;
             }
         }

diff --git a/patches.txt b/patches.txt
@@ -2,3 +2,4 @@ Patches:
 
 - remove dompdf from phpdocx, because we already ship dompdf in the 3rdparty's root folder (see 3ae4904 and e1e3207)
 - some external entity patches from https://github.com/owncloud/3rdparty/pull/74 - they should get superseeded by updating the affected libraries.
+- Doctrine: fix postgres column escaping when using reserved keyword: https://github.com/doctrine/dbal/pull/627