WIP

SOHELAHMED7 · SOHELAHMED7 · Dec 21, 2022 · Jul 6, 2022 · Jul 7, 2022 · Jul 7, 2022
commit 4fb7b28f2fcd4e5b2ce10d5cb6af41f9c7c7d93b
diff --git a/src/db/ColumnSchema.php b/src/db/ColumnSchema.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @copyright Copyright (c) 2018 Carsten Brandt <[email protected]> and contributors
+ * @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
+ */
+
+namespace cebe\yii2openapi\db;
+
+class ColumnSchema extends \yii\db\ColumnSchema
+{
+    /**
+     * @var string|null|false
+     * Custom DB type which contains real DB type
+     * Contains x-db-type string if present in OpenAPI YAML/json file
+     * @see \cebe\yii2openapi\lib\items\Attribute::$xDbType and `x-db-type` docs in README.md
+     * Used to detect what kind of migration code for column is to be generated
+     * e.g. `double_p double precision NULL DEFAULT NULL`
+     * instead of
+     * ```php
+     *   $this->createTable('{{%alldbdatatypes}}', [
+     *       ...
+     *       'double_p' => 'double precision NULL DEFAULT NULL',
+     *       ...
+     * ```
+     */
+    public $xDbType;
+}
diff --git a/src/lib/ColumnToCode.php b/src/lib/ColumnToCode.php
@@ -110,6 +110,7 @@ public function __construct(
 
     public function getCode(bool $quoted = false):string
     {
+        // echo PHP_EOL;VarDumper::dump($this->column->xDbType);echo PHP_EOL;
         if ($this->isPk) {
             return '$this->' . $this->fluentParts['type'];
         }

diff --git a/src/lib/items/Attribute.php b/src/lib/items/Attribute.php
@@ -13,7 +13,7 @@
 use cebe\yii2openapi\generator\ApiGenerator;
 use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use yii\base\BaseObject;
-use yii\db\ColumnSchema;
+use cebe\yii2openapi\db\ColumnSchema;
 use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 use yii\db\mysql\Schema as MySqlSchema;
@@ -284,6 +284,7 @@ public function toColumnSchema():ColumnSchema
             'type' => $this->yiiAbstractTypeForDbSpecificType($this->dbType),
             'allowNull' => $this->allowNull(),
             'size' => $this->size > 0 ? $this->size : null,
+            'xDbType' => $this->xDbType,
         ]);
         $column->isPrimaryKey = $this->primary;
         $column->autoIncrement = $this->primary && $this->phpType === 'int';

diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
@@ -420,7 +420,7 @@ protected function isNeedUsingExpression(string $fromType, string $toType):bool
         return !(in_array($fromType, $dates) && in_array($toType, $dates));
     }
 
-    public function tmpSaveNewCol(ColumnSchema $columnSchema)//: ColumnSchema TODO
+    public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema)//: ColumnSchema TODO
     {
         $tableName = 'tmp_table_';
 
@@ -432,6 +432,10 @@ public function tmpSaveNewCol(ColumnSchema $columnSchema)//: ColumnSchema TODO
             // die;
         }
 
+        // echo PHP_EOL;
+        // VarDumper::dump($columnSchema->xDbType);echo PHP_EOL;
+
+
         Yii::$app->db->createCommand()->createTable($tableName, [
             $columnSchema->name => $this->newColStr($columnSchema), // TODO
             // $columnSchema->name.' '.$this->newColStr($columnSchema), // TODO for xDbType
@@ -445,7 +449,7 @@ public function tmpSaveNewCol(ColumnSchema $columnSchema)//: ColumnSchema TODO
         return $table->columns[$columnSchema->name];
     }
 
-    public function newColStr(ColumnSchema $columnSchema): string
+    public function newColStr(\cebe\yii2openapi\db\ColumnSchema $columnSchema): string
     {
         $ctc = new ColumnToCode(\Yii::$app->db->schema, $columnSchema, false, false, true);
         // VarDumper::dump($ctc->getCode()); die;

diff --git a/src/lib/migrations/MigrationRecordBuilder.php b/src/lib/migrations/MigrationRecordBuilder.php
@@ -55,6 +55,11 @@ public function createTable(string $tableAlias, array $columns):string
         $codeColumns = array_map(function (ColumnSchema $column) {
             return $this->columnToCode($column, false)->getCode();
         }, $columns);
+
+        // VarDumper::dump('$codeColumns');
+        // VarDumper::dump($codeColumns);
+        // VarDumper::dump($columns);
+
         $codeColumns = str_replace([PHP_EOL, "\\\'"], [PHP_EOL . self::INDENT, "'"], VarDumper::export($codeColumns));
         return sprintf(self::ADD_TABLE, $tableAlias, $codeColumns);
     }

diff --git a/src/lib/migrations/MysqlMigrationBuilder.php b/src/lib/migrations/MysqlMigrationBuilder.php
@@ -115,13 +115,15 @@ public static function getColumnSchemaBuilderClass(): string
 
     public function modifyCurrent(ColumnSchema $current): void
     {
+        /** @var $current \yii\db\mysql\ColumnSchema */
         if ($current->phpType === 'integer' && $current->defaultValue !== null) {
             $current->defaultValue = (int)$current->defaultValue;
         }
     }
 
     public function modifyDesired(ColumnSchema $desired): void
     {
+        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\mysql\ColumnSchema */
         if ($desired->phpType === 'int' && $desired->defaultValue !== null) {
             $desired->defaultValue = (int)$desired->defaultValue;
         }
@@ -134,6 +136,8 @@ public function modifyDesired(ColumnSchema $desired): void
 
     public function modifyDesiredInContextOfCurrent(ColumnSchema $current, ColumnSchema $desired): void
     {
+        /** @var $current \yii\db\mysql\ColumnSchema */
+        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\mysql\ColumnSchema */
         if ($current->dbType === 'tinyint(1)' && $desired->type === 'boolean') {
             if (is_bool($desired->defaultValue) || is_string($desired->defaultValue)) {
                 $desired->defaultValue = (int)$desired->defaultValue;

diff --git a/src/lib/migrations/PostgresMigrationBuilder.php b/src/lib/migrations/PostgresMigrationBuilder.php
@@ -14,7 +14,6 @@
 
 final class PostgresMigrationBuilder extends BaseMigrationBuilder
 {
-
     /**
      * @param array|ColumnSchema[] $columns
      * @throws \yii\base\InvalidConfigException
@@ -203,13 +202,15 @@ public static function getColumnSchemaBuilderClass(): string
 
     public function modifyCurrent(ColumnSchema $current): void
     {
+        /** @var $current \yii\db\pgsql\ColumnSchema */
         if ($current->phpType === 'integer' && $current->defaultValue !== null) {
             $current->defaultValue = (int)$current->defaultValue;
         }
     }
 
     public function modifyDesired(ColumnSchema $desired): void
     {
+        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\pgsql\ColumnSchema */
         if (in_array($desired->phpType, ['int', 'integer']) && $desired->defaultValue !== null) {
             $desired->defaultValue = (int)$desired->defaultValue;
         }
@@ -221,6 +222,8 @@ public function modifyDesired(ColumnSchema $desired): void
 
     public function modifyDesiredInContextOfCurrent(ColumnSchema $current, ColumnSchema $desired): void
     {
+        /** @var $current \yii\db\pgsql\ColumnSchema */
+        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\pgsql\ColumnSchema */
         if ($current->type === $desired->type && !$desired->size && $this->isDbDefaultSize($current)) {
             $desired->size = $current->size;
         }

diff --git a/src/lib/openapi/PropertySchema.php b/src/lib/openapi/PropertySchema.php
@@ -356,9 +356,9 @@ public function guessDbType($forReference = false):string
         }
         if ($this->hasAttr(CustomSpecAttr::DB_TYPE) && $this->getAttr(CustomSpecAttr::DB_TYPE) !== false) {
             $customDbType = strtolower($this->getAttr(CustomSpecAttr::DB_TYPE));
-            if ($customDbType === 'varchar') {
-                return YiiDbSchema::TYPE_STRING;
-            }
+            // if ($customDbType === 'varchar') {
+            //     return YiiDbSchema::TYPE_STRING;
+            // }
             if ($customDbType !== null) {
                 return $customDbType;
             }

diff --git a/tests/specs/x_db_type/pgsql/x_db_type_pgsql.yaml b/tests/specs/x_db_type/pgsql/x_db_type_pgsql.yaml
@@ -161,6 +161,9 @@ components:
         double_p_2:
           type: string
           x-db-type: DOUBLE PRECISION
+        double_p_3:
+          type: string
+          x-db-type: double precision
 
         real:
           type: string

diff --git a/tests/unit/XDbTypeTest.php b/tests/unit/XDbTypeTest.php
@@ -18,16 +18,16 @@ class XDbTypeTest extends DbTestCase
     public function testXDbTypeFresh()
     {
         // default db is Mysql
-        $this->deleteTables();
-        $testFile = Yii::getAlias("@specs/x_db_type/mysql/x_db_type_mysql.php");
-        $this->runGenerator($testFile, 'mysql');
-        // $this->compareFiles($testFile); # TODO
-
-        // same yaml file is used for MySQL and MariaDB
-        $this->changeDbToMariadb();
-        $this->deleteTables();
-        $testFile = Yii::getAlias("@specs/x_db_type/mysql/x_db_type_mysql.php");
-        $this->runGenerator($testFile, 'maria');
+        // $this->deleteTables();
+        // $testFile = Yii::getAlias("@specs/x_db_type/mysql/x_db_type_mysql.php");
+        // $this->runGenerator($testFile, 'mysql');
+        // // $this->compareFiles($testFile); # TODO
+
+        // // same yaml file is used for MySQL and MariaDB
+        // $this->changeDbToMariadb();
+        // $this->deleteTables();
+        // $testFile = Yii::getAlias("@specs/x_db_type/mysql/x_db_type_mysql.php");
+        // $this->runGenerator($testFile, 'maria');
         // $this->compareFiles($testFile); # TODO
 
         $this->changeDbToPgsql();
@@ -39,12 +39,7 @@ public function testXDbTypeFresh()
 
     public function testXDbTypeSecondaryWithNewColumn() // v2
     {
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%newcolumns}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%editcolumns}}')->execute();
-
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%alldbdatatypes}}')->execute();
-
+        $this->deleteTables();
         Yii::$app->db->createCommand()->createTable('{{%newcolumns}}', [
             'id' => 'pk',
             'name' => 'string not null',
@@ -58,12 +53,7 @@ public function testXDbTypeSecondaryWithNewColumn() // v2
 
     public function testXDbTypeSecondaryWithEditColumn() // v3
     {
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%newcolumns}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%editcolumns}}')->execute();
-
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%alldbdatatypes}}')->execute();
-
+        $this->deleteTables();
         Yii::$app->db->createCommand()->createTable('{{%editcolumns}}', [
             'id' => 'pk',
             'name' => 'varchar(255) not null default "Horse"',