diff --git a/tests/specs/x_db_default_expression/mysql/x_db_default_expression_mysql.yaml b/tests/specs/x_db_default_expression/mysql/x_db_default_expression_mysql.yaml index 30b9cad0..67ef4f50 100644 --- a/tests/specs/x_db_default_expression/mysql/x_db_default_expression_mysql.yaml +++ b/tests/specs/x_db_default_expression/mysql/x_db_default_expression_mysql.yaml @@ -63,3 +63,9 @@ components: type: string format: date x-db-default-expression: CURRENT_DATE + INTERVAL 1 YEAR + + # https://github.com/yiisoft/yii2/issues/19747 + # ts8: + # type: string + # format: date + # x-db-default-expression: CURRENT_DATE + INTERVAL 1 YEAR diff --git a/tests/specs/x_db_default_expression/pgsql/x_db_default_expression_pgsql.yaml b/tests/specs/x_db_default_expression/pgsql/x_db_default_expression_pgsql.yaml index a5cd2c0f..b0a37326 100644 --- a/tests/specs/x_db_default_expression/pgsql/x_db_default_expression_pgsql.yaml +++ b/tests/specs/x_db_default_expression/pgsql/x_db_default_expression_pgsql.yaml @@ -63,3 +63,9 @@ components: type: string format: date x-db-default-expression: CURRENT_DATE + INTERVAL '1 YEAR' + + # https://github.com/yiisoft/yii2/issues/19747 + # ts8: + # type: string + # format: date + # x-db-default-expression: CURRENT_DATE + INTERVAL 1 YEAR diff --git a/tests/unit/XDbDefaultExpressionTest.php b/tests/unit/XDbDefaultExpressionTest.php index dfa73613..ee07bae5 100644 --- a/tests/unit/XDbDefaultExpressionTest.php +++ b/tests/unit/XDbDefaultExpressionTest.php @@ -191,11 +191,14 @@ private function createTablesForEditExpression() 'd' => 'date DEFAULT \'2011-11-11\'', 'd2' => 'text', // DEFAULT "2011-11-11" 'd3' => 'text', // DEFAULT CURRENT_DATE + INTERVAL 1 YEAR - 'ts7' => 'date DEFAULT (CURRENT_DATE + INTERVAL 2 YEAR)', + 'ts7' => 'date DEFAULT \'2011-11-11\'', + + // https://github.com/yiisoft/yii2/issues/19747 + // 'ts8' => 'date DEFAULT (CURRENT_DATE + INTERVAL 2 YEAR)', ]; if (ApiGenerator::isPostgres()) { $pgsqlColumns = $mysqlColumns; - $pgsqlColumns['ts7'] = 'date DEFAULT (CURRENT_DATE + INTERVAL \'2 YEAR\')'; + $pgsqlColumns['ts7'] = 'date DEFAULT \'2011-11-11\''; Yii::$app->db->createCommand()->createTable('{{%fruits}}', $pgsqlColumns)->execute(); return; }