From 985473b8a7359610f291b50241a0f3f4f793d12f Mon Sep 17 00:00:00 2001 From: xRain Date: Tue, 25 Aug 2026 12:02:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=85=A8=E9=83=A8=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=E8=9B=87?= =?UTF-8?q?=E5=BD=A2=E5=91=BD=E5=90=8D(Orm.cj=E2=86=92orm.cj=E3=80=81Migra?= =?UTF-8?q?tionRegistry.cj=E2=86=92migration=5Fregistry.cj=20=E7=AD=89=202?= =?UTF-8?q?7=20=E4=B8=AA),=E5=90=8C=E6=AD=A5=E8=BF=81=E7=A7=BB=20CLI=20?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E4=B8=8E?= =?UTF-8?q?=E6=B5=8B=E8=AF=95,=E6=B6=88=E9=99=A4=20G.NAM.02=20=E8=AD=A6?= =?UTF-8?q?=E5=91=8A,=E7=89=88=E6=9C=AC=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- cjpm.toml | 2 +- src/annotations/{Annotations.cj => annotations.cj} | 0 src/cli/{CliContext.cj => cli_context.cj} | 0 src/cli/{MigrationCli.cj => migration_cli.cj} | 6 +++--- ...igrationFileGenerator.cj => migration_file_generator.cj} | 2 +- src/db/{DatasourceFactory.cj => datasource_factory.cj} | 0 src/db/{DbContext.cj => db_context.cj} | 0 src/macros/{DbContextMacro.cj => db_context_macro.cj} | 0 src/macros/{SeedMacro.cj => seed_macro.cj} | 0 .../{MigrationGenerator.cj => migration_generator.cj} | 0 .../{MigrationRegistry.cj => migration_registry.cj} | 0 src/migrations/{Migrations.cj => migrations.cj} | 0 src/migrations/{Migrator.cj => migrator.cj} | 0 src/migrations/{MiniJson.cj => mini_json.cj} | 0 src/migrations/{ModelSnapshot.cj => model_snapshot.cj} | 0 src/model/{EntityModel.cj => entity_model.cj} | 0 src/model/{ValueReader.cj => value_reader.cj} | 0 src/{Orm.cj => orm.cj} | 0 src/query/{QueryBuilder.cj => query_builder.cj} | 0 src/seeds/{Seed.cj => seed.cj} | 0 src/seeds/{SeedRegistry.cj => seed_registry.cj} | 0 src/sql/{ColumnTypes.cj => column_types.cj} | 0 src/sql/{ISqlDialect.cj => i_sql_dialect.cj} | 0 src/sql/{OpenGaussDialect.cj => open_gauss_dialect.cj} | 0 src/sql/{PostgreSqlDialect.cj => postgre_sql_dialect.cj} | 0 src/tests/{MigrationCli_test.cj => migration_cli_test.cj} | 2 +- src/tests/{SimOrm_test.cj => sim_orm_test.cj} | 0 src/tracking/{ChangeTracker.cj => change_tracker.cj} | 0 29 files changed, 7 insertions(+), 7 deletions(-) rename src/annotations/{Annotations.cj => annotations.cj} (100%) rename src/cli/{CliContext.cj => cli_context.cj} (100%) rename src/cli/{MigrationCli.cj => migration_cli.cj} (98%) rename src/cli/{MigrationFileGenerator.cj => migration_file_generator.cj} (99%) rename src/db/{DatasourceFactory.cj => datasource_factory.cj} (100%) rename src/db/{DbContext.cj => db_context.cj} (100%) rename src/macros/{DbContextMacro.cj => db_context_macro.cj} (100%) rename src/macros/{SeedMacro.cj => seed_macro.cj} (100%) rename src/migrations/{MigrationGenerator.cj => migration_generator.cj} (100%) rename src/migrations/{MigrationRegistry.cj => migration_registry.cj} (100%) rename src/migrations/{Migrations.cj => migrations.cj} (100%) rename src/migrations/{Migrator.cj => migrator.cj} (100%) rename src/migrations/{MiniJson.cj => mini_json.cj} (100%) rename src/migrations/{ModelSnapshot.cj => model_snapshot.cj} (100%) rename src/model/{EntityModel.cj => entity_model.cj} (100%) rename src/model/{ValueReader.cj => value_reader.cj} (100%) rename src/{Orm.cj => orm.cj} (100%) rename src/query/{QueryBuilder.cj => query_builder.cj} (100%) rename src/seeds/{Seed.cj => seed.cj} (100%) rename src/seeds/{SeedRegistry.cj => seed_registry.cj} (100%) rename src/sql/{ColumnTypes.cj => column_types.cj} (100%) rename src/sql/{ISqlDialect.cj => i_sql_dialect.cj} (100%) rename src/sql/{OpenGaussDialect.cj => open_gauss_dialect.cj} (100%) rename src/sql/{PostgreSqlDialect.cj => postgre_sql_dialect.cj} (100%) rename src/tests/{MigrationCli_test.cj => migration_cli_test.cj} (99%) rename src/tests/{SimOrm_test.cj => sim_orm_test.cj} (100%) rename src/tracking/{ChangeTracker.cj => change_tracker.cj} (100%) diff --git a/README.md b/README.md index b588a0d..93bcb3a 100644 --- a/README.md +++ b/README.md @@ -272,7 +272,7 @@ public class InitGames { orm-cj/ ├── cjpm.toml # 包配置（name = orm, organization = simcu） ├── src/ -│ ├── Orm.cj # 聚合导出：import simcu::orm.* 即全部可见 +│ ├── orm.cj # 聚合导出：import simcu::orm.* 即全部可见 │ ├── annotations/ # @Table / @Column / @Key / @AutoIncrement / @Ignore / @Required / @MaxLength / @Index / @TableIndex │ ├── macros/ # @DbContext 类级宏 + @Seed 数据填充宏（自动注册，无需手写注册表） │ ├── seeds/ # Seed 基类 + 进程级填充注册表（registerSeed / allSeeds） diff --git a/cjpm.toml b/cjpm.toml index 4aedcec..0d69048 100644 --- a/cjpm.toml +++ b/cjpm.toml @@ -3,7 +3,7 @@ name = "orm" organization = "simcu" description = "SimApi 数据访问层 ORM：数据模型映射 + 增删改查 + 数据库迁移；多方言架构，内置 openGauss/PostgreSQL 方言" - version = "1.3.0" + version = "1.3.1" target-dir = "" output-type = "static" diff --git a/src/annotations/Annotations.cj b/src/annotations/annotations.cj similarity index 100% rename from src/annotations/Annotations.cj rename to src/annotations/annotations.cj diff --git a/src/cli/CliContext.cj b/src/cli/cli_context.cj similarity index 100% rename from src/cli/CliContext.cj rename to src/cli/cli_context.cj diff --git a/src/cli/MigrationCli.cj b/src/cli/migration_cli.cj similarity index 98% rename from src/cli/MigrationCli.cj rename to src/cli/migration_cli.cj index 98981de..a0f870f 100644 --- a/src/cli/MigrationCli.cj +++ b/src/cli/migration_cli.cj @@ -13,7 +13,7 @@ * - 模型:反射收集实例的 DbSet 属性(getModels()) * - 连接/驱动/方言:构造参数 * - 迁移列表:子类 override migrations()(宏默认返回 orm-cj 全局注册表, - * CLI 生成的 src/migrations/MigrationRegistry.cj 在模块加载时自动注册) + * CLI 生成的 src/migrations/migration_registry.cj 在模块加载时自动注册) * * 注意:应用侧(DataContext.cj 或 main.cj)需要一行 * import <应用包名>.migrations.* @@ -55,7 +55,7 @@ public class MigrationCli { // 注册文件与迁移文件同目录(src/migrations/,package = 应用包名.migrations)。 // 子包默认惰性加载,顶层 let 不会执行;应用侧需一行 // `import <应用包名>.migrations.*` 触发加载后,注册才生效。 - private var _registryPath = "src/migrations/MigrationRegistry.cj" + private var _registryPath = "src/migrations/migration_registry.cj" public init() {} @@ -271,7 +271,7 @@ public class MigrationCli { for (f in Directory.readFrom(dir)) { if (f.isRegular()) { let name = f.name - if (name.endsWith(".cj") && name != "MigrationRegistry.cj" && name != "_placeholder.cj") { + if (name.endsWith(".cj") && name != "migration_registry.cj" && name != "_placeholder.cj") { ids.add(name[..name.size - 3]) } } diff --git a/src/cli/MigrationFileGenerator.cj b/src/cli/migration_file_generator.cj similarity index 99% rename from src/cli/MigrationFileGenerator.cj rename to src/cli/migration_file_generator.cj index 44176d3..9039181 100644 --- a/src/cli/MigrationFileGenerator.cj +++ b/src/cli/migration_file_generator.cj @@ -2,7 +2,7 @@ * Copyright (c) 2025 SimcuTeam. All rights reserved. * 迁移落盘生成器(对齐 dotnet ef migrations add): * - Migration 对象 → .cj 源文件文本(迁移类 up/down 用 MigrationBuilder 声明式重建), - * - 自动维护迁移注册文件 MigrationRegistry.cj(add 时插入新迁移实例)。 + * - 自动维护迁移注册文件 migration_registry.cj(add 时插入新迁移实例)。 * * 生成文件的格式: * // 此文件由 simcu::orm CLI 自动生成,请勿手动编辑 diff --git a/src/db/DatasourceFactory.cj b/src/db/datasource_factory.cj similarity index 100% rename from src/db/DatasourceFactory.cj rename to src/db/datasource_factory.cj diff --git a/src/db/DbContext.cj b/src/db/db_context.cj similarity index 100% rename from src/db/DbContext.cj rename to src/db/db_context.cj diff --git a/src/macros/DbContextMacro.cj b/src/macros/db_context_macro.cj similarity index 100% rename from src/macros/DbContextMacro.cj rename to src/macros/db_context_macro.cj diff --git a/src/macros/SeedMacro.cj b/src/macros/seed_macro.cj similarity index 100% rename from src/macros/SeedMacro.cj rename to src/macros/seed_macro.cj diff --git a/src/migrations/MigrationGenerator.cj b/src/migrations/migration_generator.cj similarity index 100% rename from src/migrations/MigrationGenerator.cj rename to src/migrations/migration_generator.cj diff --git a/src/migrations/MigrationRegistry.cj b/src/migrations/migration_registry.cj similarity index 100% rename from src/migrations/MigrationRegistry.cj rename to src/migrations/migration_registry.cj diff --git a/src/migrations/Migrations.cj b/src/migrations/migrations.cj similarity index 100% rename from src/migrations/Migrations.cj rename to src/migrations/migrations.cj diff --git a/src/migrations/Migrator.cj b/src/migrations/migrator.cj similarity index 100% rename from src/migrations/Migrator.cj rename to src/migrations/migrator.cj diff --git a/src/migrations/MiniJson.cj b/src/migrations/mini_json.cj similarity index 100% rename from src/migrations/MiniJson.cj rename to src/migrations/mini_json.cj diff --git a/src/migrations/ModelSnapshot.cj b/src/migrations/model_snapshot.cj similarity index 100% rename from src/migrations/ModelSnapshot.cj rename to src/migrations/model_snapshot.cj diff --git a/src/model/EntityModel.cj b/src/model/entity_model.cj similarity index 100% rename from src/model/EntityModel.cj rename to src/model/entity_model.cj diff --git a/src/model/ValueReader.cj b/src/model/value_reader.cj similarity index 100% rename from src/model/ValueReader.cj rename to src/model/value_reader.cj diff --git a/src/Orm.cj b/src/orm.cj similarity index 100% rename from src/Orm.cj rename to src/orm.cj diff --git a/src/query/QueryBuilder.cj b/src/query/query_builder.cj similarity index 100% rename from src/query/QueryBuilder.cj rename to src/query/query_builder.cj diff --git a/src/seeds/Seed.cj b/src/seeds/seed.cj similarity index 100% rename from src/seeds/Seed.cj rename to src/seeds/seed.cj diff --git a/src/seeds/SeedRegistry.cj b/src/seeds/seed_registry.cj similarity index 100% rename from src/seeds/SeedRegistry.cj rename to src/seeds/seed_registry.cj diff --git a/src/sql/ColumnTypes.cj b/src/sql/column_types.cj similarity index 100% rename from src/sql/ColumnTypes.cj rename to src/sql/column_types.cj diff --git a/src/sql/ISqlDialect.cj b/src/sql/i_sql_dialect.cj similarity index 100% rename from src/sql/ISqlDialect.cj rename to src/sql/i_sql_dialect.cj diff --git a/src/sql/OpenGaussDialect.cj b/src/sql/open_gauss_dialect.cj similarity index 100% rename from src/sql/OpenGaussDialect.cj rename to src/sql/open_gauss_dialect.cj diff --git a/src/sql/PostgreSqlDialect.cj b/src/sql/postgre_sql_dialect.cj similarity index 100% rename from src/sql/PostgreSqlDialect.cj rename to src/sql/postgre_sql_dialect.cj diff --git a/src/tests/MigrationCli_test.cj b/src/tests/migration_cli_test.cj similarity index 99% rename from src/tests/MigrationCli_test.cj rename to src/tests/migration_cli_test.cj index 4d14367..7529668 100644 --- a/src/tests/MigrationCli_test.cj +++ b/src/tests/migration_cli_test.cj @@ -188,7 +188,7 @@ class MigrationFileGeneratorTests { @Expect(text.contains("public class InitialCreate <: Migration")) // 注册文件：首次创建 + 追加 + 幂等 - let registryPath = "${dir}/MigrationRegistry.cj" + let registryPath = "${dir}/migration_registry.cj" fg.updateRegistry("testpkg", registryPath, "InitialCreate") fg.updateRegistry("testpkg", registryPath, "AddAge") fg.updateRegistry("testpkg", registryPath, "AddAge") diff --git a/src/tests/SimOrm_test.cj b/src/tests/sim_orm_test.cj similarity index 100% rename from src/tests/SimOrm_test.cj rename to src/tests/sim_orm_test.cj diff --git a/src/tracking/ChangeTracker.cj b/src/tracking/change_tracker.cj similarity index 100% rename from src/tracking/ChangeTracker.cj rename to src/tracking/change_tracker.cj