Merge branch 'CommentQuotes' into 2.3

9e37731c · Benjamin Eberlei · fdc866a3 · de38dc32 · 9e37731c
Commit 9e37731c authored Oct 16, 2012 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

MySqlPlatform.php lib/Doctrine/DBAL/Platforms/MySqlPlatform.php +3 -1

No files found.
--- a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+++ b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
@@ -372,7 +372,9 @@ class MySqlPlatform extends AbstractPlatform
        $query .= 'TABLE ' . $tableName . ' (' . $queryFields . ') ';

        if (isset($options['comment'])) {
-            $query .= 'COMMENT = ' . $options['comment'] . ' ';
+            $comment = trim($options['comment'], " '");
+
+            $query .= sprintf("COMMENT = '%s' ", str_replace("'", "''", $comment));
        }

        if ( ! isset($options['charset'])) {