[3.0] 废弃模型的一些不合理特性

doc/base/version/2.1-3.0.md

@@ -27,3 +27,15 @@
 ### 废弃
 
 * 废弃命名空间声明在 `config.php` 的写法，统一写到 `composer.json` 的 `imi.namespace`
+
+* 废弃支持模型 insert、update 传入 $data 参数
+
+* 废弃模型基类中使用 `ConfigValue` 注解，改为在 `Meta` 类中读取配置
+
+* 废弃按表指定模型生成配置
+
+* 废弃 `Imi\Model\ModelManager`
+
+* 废弃 `Model::updateBatch()` 和 `Model::deleteBatch()`
+
+* 废弃模型查询时动态指定字段名的特殊处理

doc/components/orm/config.md

@@ -11,9 +11,8 @@
         'Imi\Pgsql\Test\Model\Article' => [
             'name' => 'tb_article', // 覆盖注解中定义的表名，还支持：数据库名.表名
             'dbPoolName' => null, // 覆盖注解中定义的连接池名
+            'prefix' => null, // 覆盖注解中定义的表名前缀
         ],
     ],
 ]
 ```
-
-> 覆盖表名、连接池名的特性，请更新到 imi v2.0.10 及更高版本，重新生成模型基类后有效

doc/dev/generate/model.md

@@ -90,36 +90,6 @@ imi 支持两种自定义模型生成目标的配置方式。
 ]
 ```
 
-#### 按表指定-MySQL
-
-项目配置文件：
-
-```php
-[
-    'tools'  =>  [
-        'generate/model'    =>  [
-            'relation'  =>  [
-                '表名1'   =>  [
-                    'namespace' =>  '生成到的命名空间',
-                    // 是否备份记录，不建议所有表都备份数据，一般用于字典表、默认数据等情况
-                    'withRecords' => true,
-                    'fields' => [
-                        '字段名' => [
-                            'typeDefinition' => false,
-                        ],
-                    ],
-                ],
-                '表名2'   =>  [
-                    'namespace' =>  '生成到的命名空间',
-                ],
-            ],
-        ],
-    ],
-]
-```
-
-> 即将废弃，推荐使用 `按命名空间指定`
-
 ### 生成模型事件-MySQL
 
 在生成模型时，会触发以下事件：
@@ -297,34 +267,6 @@ vendor/bin/imi-cli generate/pgModel "命名空间"
 
 imi 支持两种自定义模型生成目标的配置方式。
 
-#### 按表指定-PostgreSQL
-
-项目配置文件：
-
-```php
-[
-    'tools'  =>  [
-        'generate/model'    =>  [
-            'relation'  =>  [
-                '表名1'   =>  [
-                    'namespace' =>  '生成到的命名空间',
-                    // 是否备份记录，不建议所有表都备份数据，一般用于字典表、默认数据等情况
-                    'withRecords' => true,
-                    'fields' => [
-                        '字段名' => [
-                            'typeDefinition' => false,
-                        ],
-                    ],
-                ],
-                '表名2'   =>  [
-                    'namespace' =>  '生成到的命名空间',
-                ],
-            ],
-        ],
-    ],
-]
-```
-
 #### 按命名空间指定-PostgreSQL
 
 项目配置文件：

phpstan-baseline/baseline-core.neon

@@ -15,36 +15,11 @@ parameters:
 			count: 3
 			path: ../src/Db/Query/Query.php
 
-		-
-			message: "#^Argument of an invalid type ArrayAccess supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: ../src/Model/Model.php
-
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 1
-			path: ../src/Model/Model.php
-
-		-
-			message: "#^PHPDoc tag @return with type T\\|null is not subtype of native type Imi\\\\Bean\\\\Annotation\\\\Base\\|null\\.$#"
-			count: 1
-			path: ../src/Model/ModelManager.php
-
 		-
 			message: "#^Parameter \\#2 \\$class of static method Imi\\\\Server\\\\ServerManager\\:\\:getServer\\(\\) expects class\\-string\\<Imi\\\\Server\\\\Contract\\\\IServer\\>\\|null, string given\\.$#"
 			count: 1
 			path: ../src/Server/Group/Listener/GroupRestore.php
 
-		-
-			message: "#^Method Imi\\\\Test\\\\Component\\\\Model\\\\Article\\:\\:getQueryRelationsList\\(\\) should return Imi\\\\Test\\\\Component\\\\Model\\\\Article\\|null but returns Imi\\\\Test\\\\Component\\\\Model\\\\ArticleEx\\|null\\.$#"
-			count: 1
-			path: ../tests/unit/Component/Model/Article.php
-
-		-
-			message: "#^Property Imi\\\\Test\\\\Component\\\\Model\\\\Article\\:\\:\\$queryRelationsList \\(Imi\\\\Test\\\\Component\\\\Model\\\\ArticleEx\\|null\\) does not accept Imi\\\\Test\\\\Component\\\\Model\\\\Article\\|null\\.$#"
-			count: 1
-			path: ../tests/unit/Component/Model/Article.php
-
 		-
 			message: "#^Argument of an invalid type Imi\\\\Util\\\\ArrayData supplied for foreach, only iterables are supported\\.$#"
 			count: 1

src/Components/pgsql/src/Model/Cli/Model/ModelGenerate.php

@@ -142,52 +142,34 @@
                 continue;
             }
             $className = $this->getClassName($table, $prefix);
-            if (isset($configData['relation'][$table]))
+            $hasResult = false;
+            $fileName = '';
+            $modelNamespace = '';
+            $tableConfig = null;
+            foreach ($configData['namespace'] ?? [] as $namespaceName => $namespaceItem)
             {
-                $configItem = $configData['relation'][$table];
-                $modelNamespace = $configItem['namespace'] ?? $namespace;
-                $path = Imi::getNamespacePath($modelNamespace, true);
-                if (null === $path)
+                if (($tableConfig = ($namespaceItem['tables'][$table] ?? null)) || \in_array($table, $namespaceItem['tables'] ?? []))
                 {
-                    $this->output->writeln('<error>Namespace</error> <comment>' . $modelNamespace . '</comment> <error>cannot found</error>');
-                    exit(255);
-                }
-                File::createDir($path);
-                $basePath = $path . '/Base';
-                File::createDir($basePath);
-                $fileName = File::path($path, $className . '.php');
-            }
-            else
-            {
-                $hasResult = false;
-                $fileName = '';
-                $modelNamespace = '';
-                $tableConfig = null;
-                foreach ($configData['namespace'] ?? [] as $namespaceName => $namespaceItem)
-                {
-                    if (($tableConfig = ($namespaceItem['tables'][$table] ?? null)) || \in_array($table, $namespaceItem['tables'] ?? []))
+                    $modelNamespace = $namespaceName;
+                    $path = Imi::getNamespacePath($modelNamespace, true);
+                    if (null === $path)
                     {
-                        $modelNamespace = $namespaceName;
-                        $path = Imi::getNamespacePath($modelNamespace, true);
-                        if (null === $path)
-                        {
-                            $this->output->writeln('<error>Namespace</error> <comment>' . $modelNamespace . '</comment> <error>cannot found</error>');
-                            exit(255);
-                        }
-                        File::createDir($path);
-                        $basePath = $path . '/Base';
-                        File::createDir($basePath);
-                        $fileName = File::path($path, $className . '.php');
-                        $hasResult = true;
-                        break;
+                        $this->output->writeln('<error>Namespace</error> <comment>' . $modelNamespace . '</comment> <error>cannot found</error>');
+                        exit(255);
                     }
+                    File::createDir($path);
+                    $basePath = $path . '/Base';
+                    File::createDir($basePath);
+                    $fileName = File::path($path, $className . '.php');
+                    $hasResult = true;
+                    break;
                 }
-                if (!$hasResult)
-                {
-                    $modelNamespace = $namespace;
-                    $fileName = File::path($modelPath, $className . '.php');
-                    $basePath = $baseModelPath;
-                }
+            }
+            if (!$hasResult)
+            {
+                $modelNamespace = $namespace;
+                $fileName = File::path($modelPath, $className . '.php');
+                $basePath = $baseModelPath;
             }
             if (false === $override && is_file($fileName))
             {
@@ -236,7 +218,12 @@
             order by attnum
             ;
             SQL)->getArray();
-            $this->parseFields($poolName, $fields, $data, 'v' === $item['relkind'], $table, $configData);
+            $typeDefinitions = [];
+            foreach ($fields as $field)
+            {
+                $typeDefinitions[$field['attname']] = ($tableConfig['fields'][$field['attname']]['typeDefinition'] ?? null) ?? true;
+            }
+            $this->parseFields($poolName, $fields, $data, 'v' === $item['relkind'], $table, $typeDefinitions);
 
             $baseFileName = File::path($basePath, $className . 'Base.php');
             if (!is_file($baseFileName) || true === $override || 'base' === $override)
@@ -290,7 +277,7 @@
     /**
      * 处理字段信息.
      */
-    private function parseFields(?string $poolName, array $fields, ?array &$data, bool $isView, string $table, ?array $config): void
+    private function parseFields(?string $poolName, array $fields, ?array &$data, bool $isView, string $table, ?array $typeDefinitions): void
     {
         foreach ($fields as $field)
         {
@@ -334,7 +321,7 @@
                 'primaryKeyIndex'   => $primaryKeyIndex = ($field['ordinal_position'] ?? 0) - 1,
                 'isAutoIncrement'   => '' !== $field['attidentity'],
                 'comment'           => $field['description'] ?? '',
-                'typeDefinition'    => $config['relation'][$table]['fields'][$field['attname']]['typeDefinition'] ?? true,
+                'typeDefinition'    => $typeDefinitions[$field['attname']],
                 'ref'               => \in_array($type, ['json', 'jsonb']),
                 'virtual'           => 's' === $field['attgenerated'],
             ];
@@ -378,7 +365,7 @@
         'double'      => ['float', '?float', '(float)'],
         'float4'      => ['float', '?float', '(float)'],
         'float8'      => ['float', '?float', '(float)'],
-        'numeric'     => ['string|float|int', \PHP_VERSION_ID >= 80000 ? 'string|float|int|null' : '', ''],
+        'numeric'     => ['string|float|int', 'string|float|int|null', ''],
         'json'        => ['\\' . \Imi\Util\LazyArrayObject::class . '|array', '', ''],
         'jsonb'       => ['\\' . \Imi\Util\LazyArrayObject::class . '|array', '', ''],
     ];

src/Components/pgsql/src/Model/Cli/Model/base-template.tpl

@@ -6,7 +6,6 @@ declare(strict_types=1);
 
 namespace <?php echo $namespace; ?>\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -16,9 +15,13 @@ use <?php echo $baseClassName; ?> as Model;
  * <?php echo $tableComment; ?> 基类.
  *
  * @Entity(camel=<?php echo var_export($entity, true); ?>, bean=<?php echo var_export($bean, true); ?>, incrUpdate=<?php echo var_export($incrUpdate, true); ?>)
- * @Table(name=@ConfigValue(name="@app.models.<?php echo $namespace; ?>\<?php echo $className; ?>.name", default="<?php echo $table['name']; ?>"), usePrefix=<?php var_export($table['usePrefix']); ?><?php if (isset($table['id'][0]))
- { ?>, id={<?php echo '"', implode('", "', $table['id']), '"'; ?>}<?php } ?>, dbPoolName=@ConfigValue(name="@app.models.<?php echo $namespace; ?>\<?php echo $className; ?>.poolName"<?php if (null !== $poolName)
- {?>, default="<?php echo $poolName; ?>"<?php }?>))
+ * @Table(name="<?php echo $table['name']; ?>", usePrefix=<?php var_export($table['usePrefix']); ?><?php if (isset($table['id'][0]))
+ { ?>, id={<?php echo '"', implode('", "', $table['id']), '"'; ?>}<?php } ?>, dbPoolName=<?php if (null === $poolName)
+ { ?>null<?php }
+ else
+ {
+     echo '"', $poolName, '"';
+ }?>)
  *
 <?php foreach ($fields as $field)
 { ?>

src/Components/pgsql/tests/Model/Base/ArrayTestBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\ArrayTest.name", default="tb_array_test"), usePrefix=false, id={"id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\ArrayTest.poolName"))
+ * @Table(name="tb_array_test", usePrefix=false, id={"id"}, dbPoolName=null)
  *
  * @property int|null                  $id
  * @property array<int>|null           $arr1

src/Components/pgsql/tests/Model/Base/ArticleBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\Article.name", default="tb_article"), usePrefix=false, id={"id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\Article.poolName"))
+ * @Table(name="tb_article", usePrefix=false, id={"id"}, dbPoolName=null)
  *
  * @property int|null    $id
  * @property string|null $title

src/Components/pgsql/tests/Model/Base/MemberBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\Member.name", default="tb_member"), usePrefix=false, id={"id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\Member.poolName"))
+ * @Table(name="tb_member", usePrefix=false, id={"id"}, dbPoolName=null)
  *
  * @property int|null    $id
  * @property string|null $username 用户名

src/Components/pgsql/tests/Model/Base/NoIncPkBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\NoIncPk.name", default="tb_no_inc_pk"), usePrefix=false, id={"a_id", "b_id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\NoIncPk.poolName"))
+ * @Table(name="tb_no_inc_pk", usePrefix=false, id={"a_id", "b_id"}, dbPoolName=null)
  *
  * @property int|null    $aId
  * @property int|null    $bId

src/Components/pgsql/tests/Model/Base/PerformanceBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\Performance.name", default="tb_performance"), usePrefix=false, id={"id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\Performance.poolName"))
+ * @Table(name="tb_performance", usePrefix=false, id={"id"}, dbPoolName=null)
  *
  * @property int|null    $id
  * @property string|null $value

src/Components/pgsql/tests/Model/Base/TestJsonBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\TestJson.name", default="tb_test_json"), usePrefix=false, id={"id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\TestJson.poolName"))
+ * @Table(name="tb_test_json", usePrefix=false, id={"id"}, dbPoolName=null)
  *
  * @property int|null                             $id
  * @property \Imi\Util\LazyArrayObject|array|null $jsonData json数据

src/Components/pgsql/tests/Model/Base/TestSoftDeleteBase.php

@@ -4,7 +4,6 @@
 
 namespace Imi\Pgsql\Test\Model\Base;
 
-use Imi\Config\Annotation\ConfigValue;
 use Imi\Model\Annotation\Column;
 use Imi\Model\Annotation\Entity;
 use Imi\Model\Annotation\Table;
@@ -15,7 +14,7 @@
  *
  * @Entity(camel=true, bean=true, incrUpdate=false)
  *
- * @Table(name=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\TestSoftDelete.name", default="tb_test_soft_delete"), usePrefix=false, id={"id"}, dbPoolName=@ConfigValue(name="@app.models.Imi\Pgsql\Test\Model\TestSoftDelete.poolName"))
+ * @Table(name="tb_test_soft_delete", usePrefix=false, id={"id"}, dbPoolName=null)
  *
  * @property int|null    $id
  * @property string|null $title