Match column collation based on word boundaries

4f1320ce · Gawain Lynch · Luís Cobucci · fb0d0a5c · 4f1320ce
Unverified Commit 4f1320ce authored Sep 16, 2017 by Gawain Lynch Committed by Luís Cobucci Nov 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

SqliteSchemaManager.php lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php +4 -5

No files found.
--- a/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
@@ -443,11 +443,10 @@ class SqliteSchemaManager extends AbstractSchemaManager
     */
    private function parseColumnCollationFromSQL($column, $sql)
    {
-        if (preg_match(
-            '{(?:'.preg_quote($column).'|'.preg_quote($this->_platform->quoteSingleIdentifier($column)).')
-                [^,(]+(?:\([^()]+\)[^,]*)?
-                (?:(?:DEFAULT|CHECK)\s*(?:\(.*?\))?[^,]*)*
-                COLLATE\s+["\']?([^\s,"\')]+)}isx', $sql, $match)) {
+        $pattern = '{(?:\W' . preg_quote($column) . '\W|\W' . preg_quote($this->_platform->quoteSingleIdentifier($column))
+                 . '\W)[^,(]+(?:\([^()]+\)[^,]*)?(?:(?:DEFAULT|CHECK)\s*(?:\(.*?\))?[^,]*)*COLLATE\s+["\']?([^\s,"\')]+)}isx';
+
+        if (preg_match($pattern, $sql, $match) === 1) {
            return $match[1];
        }