Handle quoting of values

Author: SOHELAHMED7

src/lib/ColumnToCode.php

@@ -177,8 +177,8 @@ private function resolve():void
         $this->rawParts['nullable'] = $this->column->allowNull ? 'NULL' : 'NOT NULL';
         $this->fluentParts['nullable'] = $this->column->allowNull === true ? 'null()' : 'notNull()';
 
-        $this->fluentParts['comment'] = $this->column->comment ? 'comment(\''.$this->column->comment.'\')' : $this->fluentParts['comment'];
-        $this->rawParts['comment'] = $this->column->comment ? 'COMMENT \''.$this->column->comment.'\'' : $this->fluentParts['comment'];
+        $this->fluentParts['comment'] = $this->column->comment ? 'comment('.var_export($this->column->comment, true).')' : $this->fluentParts['comment'];
+        $this->rawParts['comment'] = $this->column->comment ? 'COMMENT '.var_export($this->column->comment, true) : $this->rawParts['comment'];
 
         if (array_key_exists($dbType, self::INT_TYPE_MAP)) {
             $this->fluentParts['type'] = self::INT_TYPE_MAP[$dbType] . $fluentSize;

src/lib/migrations/BaseMigrationBuilder.php

@@ -449,16 +449,16 @@ public function tmpSaveNewCol(string $tableAlias, \cebe\yii2openapi\db\ColumnSch
         if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
             $allEnumValues = $columnSchema->enumValues;
             $allEnumValues = array_map(function ($aValue) {
-                return "'$aValue'";
+                return $this->db->quoteValue($aValue);
             }, $allEnumValues);
             Yii::$app->db->createCommand(
                 'CREATE TYPE '.$tmpEnumName($columnSchema->name).' AS ENUM('.implode(', ', $allEnumValues).')'
-            )->execute(); // TODO quote value
+            )->execute();
         }
 
         Yii::$app->db->createCommand()->createTable($tmpTableName, $column)->execute();
         if (ApiGenerator::isPostgres() && $columnSchema->comment) {
-            Yii::$app->db->createCommand("COMMENT ON COLUMN $tmpTableName.$columnSchema->name IS '$columnSchema->comment'")->execute(); // TODO quote comment
+            Yii::$app->db->createCommand("COMMENT ON COLUMN $tmpTableName.$columnSchema->name IS {$this->db->quoteValue($columnSchema->comment)}")->execute();
         }
 
         $table = Yii::$app->db->getTableSchema($tmpTableName);

src/lib/migrations/MigrationRecordBuilder.php

@@ -46,7 +46,7 @@ final class MigrationRecordBuilder
 
     public const ALTER_COLUMN_RAW_PGSQL = MigrationRecordBuilder::INDENT . "\$this->db->createCommand('ALTER TABLE %s ALTER COLUMN \"%s\" SET DATA TYPE %s')->execute();";
 
-    public const ADD_COMMENT_ON_COLUMN = MigrationRecordBuilder::INDENT . "\$this->addCommentOnColumn('%s', '%s', '%s');";
+    public const ADD_COMMENT_ON_COLUMN = MigrationRecordBuilder::INDENT . "\$this->addCommentOnColumn('%s', '%s', %s);";
 
     public const DROP_COMMENT_FROM_COLUMN = MigrationRecordBuilder::INDENT . "\$this->dropCommentFromColumn('%s', '%s');";
 
@@ -352,7 +352,7 @@ public static function makeString(array $codeColumns): string
 
     public function addCommentOnColumn($table, string $column, string $comment): string
     {
-        return sprintf(self::ADD_COMMENT_ON_COLUMN, $table, $column, $comment);
+        return sprintf(self::ADD_COMMENT_ON_COLUMN, $table, $column, var_export($comment, true));
     }
 
     public function dropCommentFromColumn($table, string $column): string

tests/specs/issue_fix/60_description_of_a_property_in_spec_must_correspond_to_db_table_column_comment/index.yml

@@ -13,15 +13,15 @@ components:
           type: integer
         name:
           type: string
-          description: desc
+          description: desc with ' quote
 #        colour:
 #          type: string
           # maxLength: 255
           # x-db-type: varbinary # TODO
         description:
           type: number
           x-db-type: double precision
-          description: desc 2
+          description: desc ' 2
     Animal:
       type: object
       properties:

tests/specs/issue_fix/60_description_of_a_property_in_spec_must_correspond_to_db_table_column_comment/mysql/migrations_mysql_db/m200000_000001_create_table_fruits.php

@@ -9,8 +9,8 @@ public function up()
     {
         $this->createTable('{{%fruits}}', [
             'id' => $this->primaryKey(),
-            'name' => $this->text()->null()->comment('desc'),
-            0 => 'description double precision NULL DEFAULT NULL COMMENT \'desc 2\'',
+            'name' => $this->text()->null()->comment('desc with \' quote'),
+            0 => 'description double precision NULL DEFAULT NULL COMMENT \'desc \\\' 2\'',
         ]);
     }
 

tests/specs/issue_fix/60_description_of_a_property_in_spec_must_correspond_to_db_table_column_comment/mysql/models/base/Fruit.php

@@ -10,8 +10,8 @@
  * This is the model class for table "fruits".
  *
  * @property int $id
- * @property string $name desc
- * @property double $description desc 2
+ * @property string $name desc with ' quote
+ * @property double $description desc ' 2
  *
  */
 abstract class Fruit extends \yii\db\ActiveRecord

tests/specs/issue_fix/60_description_of_a_property_in_spec_must_correspond_to_db_table_column_comment/pgsql/migrations_pgsql_db/m200000_000001_create_table_fruits.php

@@ -9,11 +9,11 @@ public function safeUp()
     {
         $this->createTable('{{%fruits}}', [
             'id' => $this->primaryKey(),
-            'name' => $this->text()->null()->defaultValue(null)->comment('desc'),
+            'name' => $this->text()->null()->defaultValue(null)->comment('desc with \' quote'),
             0 => '"description" double precision NULL DEFAULT NULL',
         ]);
-        $this->addCommentOnColumn('{{%fruits}}', 'name', 'desc');
-        $this->addCommentOnColumn('{{%fruits}}', 'description', 'desc 2');
+        $this->addCommentOnColumn('{{%fruits}}', 'name', 'desc with \' quote');
+        $this->addCommentOnColumn('{{%fruits}}', 'description', 'desc \' 2');
     }
 
     public function safeDown()

tests/specs/issue_fix/60_description_of_a_property_in_spec_must_correspond_to_db_table_column_comment/pgsql/models/base/Fruit.php

@@ -10,8 +10,8 @@
  * This is the model class for table "fruits".
  *
  * @property int $id
- * @property string $name desc
- * @property double $description desc 2
+ * @property string $name desc with ' quote
+ * @property double $description desc ' 2
  *
  */
 abstract class Fruit extends \yii\db\ActiveRecord