调整sequence生成策略后重新修复单元测试

entropy-cloud · Nov 5, 2023 · f841d7a · f841d7a
1 parent 18885a0
commit f841d7a
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 8 deletions.
diff --git a/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
@@ -9300,6 +9300,18 @@
     "allPublicMethods": true,
     "fields": [],
     "methods": [
+      {
+        "name": "addColumn",
+        "parameterTypes": [
+          "io.nop.orm.model.IColumnModel"
+        ]
+      },
+      {
+        "name": "addTenantIdForTables",
+        "parameterTypes": [
+          "java.util.Collection"
+        ]
+      },
       {
         "name": "createTable",
         "parameterTypes": [
@@ -9328,6 +9340,12 @@
           "boolean"
         ]
       },
+      {
+        "name": "dropColumn",
+        "parameterTypes": [
+          "io.nop.orm.model.IColumnModel"
+        ]
+      },
       {
         "name": "dropTable",
         "parameterTypes": [
@@ -9347,6 +9365,19 @@
         "parameterTypes": [
           "java.lang.String"
         ]
+      },
+      {
+        "name": "getDmlLibPath",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "modifyColumn",
+        "parameterTypes": [
+          "io.nop.orm.model.IColumnModel",
+          "io.nop.orm.model.IColumnModel"
+        ]
       }
     ],
     "name": "io.nop.orm.ddl.DdlSqlCreator",

diff --git a/nop-cli-core/src/main/resources/nop-vfs-index.txt b/nop-cli-core/src/main/resources/nop-vfs-index.txt
@@ -74,6 +74,7 @@
 /nop/orm/imp/template.orm.xlsx
 /nop/orm/xlib/ddl/ddl.xlib
 /nop/orm/xlib/ddl/ddl_h2.xlib
+/nop/orm/xlib/ddl/ddl_h2gis.xlib
 /nop/orm/xlib/ddl/ddl_mariadb.xlib
 /nop/orm/xlib/ddl/ddl_mssql.xlib
 /nop/orm/xlib/ddl/ddl_mysql.xlib
@@ -166,6 +167,8 @@
 /nop/templates/api/{serviceModuleName}/src/main/java/{servicePackagePath}/impl/{serviceModel.name}Impl.java.xgen
 /nop/templates/api/{serviceModuleName}/src/main/java/{servicePackagePath}/{serviceModel.name}Spi.java.xgen
 /nop/templates/api/{serviceModuleName}/src/main/resources/_vfs/{moduleId}/beans/_api-impl.beans.xml.xgen
+/nop/templates/api/{serviceModuleName}/src/main/resources/_vfs/{moduleId}/model/{!!serviceModel.tagSet.@biz}{serviceModel.bizObjName}/_{serviceModel.name}.xbiz.xgen
+/nop/templates/api/{serviceModuleName}/src/main/resources/_vfs/{moduleId}/model/{!!serviceModel.tagSet.@biz}{serviceModel.bizObjName}/{serviceModel.bizObjName}.xbiz.xgen
 /nop/templates/ast/@init.xrun
 /nop/templates/ast/src/main/java/{ast.packagePath}/_gen/_{astNode.name}.java.xgen
 /nop/templates/ast/src/main/java/{ast.packagePath}/{ast.name}Kind.java.xgen
@@ -206,6 +209,7 @@
 /nop/templates/orm-web/src/main/resources/_vfs/{moduleId}/pages/{metaInfo.forEntity}{metaInfo.baseObjName}/{metaInfo.objName}.lib.xjs
 /nop/templates/orm-web/src/main/resources/_vfs/{moduleId}/pages/{metaInfo.forEntity}{metaInfo.baseObjName}/{metaInfo.objName}.view.xml.xgen
 /nop/templates/orm/@init.xrun
+/nop/templates/orm/deploy/sql/{dialect}/_add_tenant_{appName}.sql.xgen
 /nop/templates/orm/deploy/sql/{dialect}/_create_{appName}.sql.xgen
 /nop/templates/orm/deploy/sql/{dialect}/_drop_{appName}.sql.xgen
 /nop/templates/orm/pom.xml.xgen

diff --git a/...ntity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_sys_sequence.csv b/...ntity/TestNopRuleDefinitionBizModel/testDecisionMatrix/output/tables/nop_sys_sequence.csv
@@ -1,2 +1,2 @@
 _chgType,SEQ_NAME,SEQ_TYPE,IS_UUID,NEXT_VALUE,STEP_SIZE,CACHE_SIZE,MAX_VALUE,RESET_TYPE,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
-A,default,seq,0,101,1,100,,,0,1,autotest-ref,*,autotest-ref,*,
+A,default,seq,0,1,1,100,,,0,0,autotest-ref,*,autotest-ref,*,
diff --git a/...ervice/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_sys_sequence.csv b/...ervice/entity/TestNopRuleDefinitionBizModel/testImport/output/tables/nop_sys_sequence.csv
@@ -1,2 +1,2 @@
 _chgType,SEQ_NAME,SEQ_TYPE,IS_UUID,NEXT_VALUE,STEP_SIZE,CACHE_SIZE,MAX_VALUE,RESET_TYPE,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
-A,default,seq,0,101,1,100,,,0,1,autotest-ref,*,autotest-ref,*,
+A,default,seq,0,101,1,1,,,0,0,autotest-ref,*,autotest-ref,*,
diff --git a/.../entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_sys_sequence.csv b/.../entity/TestNopRuleDefinitionBizModel/testUpdateByFile/output/tables/nop_sys_sequence.csv
@@ -1,2 +1,2 @@
 _chgType,SEQ_NAME,SEQ_TYPE,IS_UUID,NEXT_VALUE,STEP_SIZE,CACHE_SIZE,MAX_VALUE,RESET_TYPE,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
-A,default,seq,0,101,1,100,,,0,1,autotest-ref,*,autotest-ref,*,
+A,default,seq,0,1,1,100,,,0,0,autotest-ref,*,autotest-ref,*,
diff --git a/...-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 b/...-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5
@@ -2,7 +2,7 @@
   "data": {
     "sid": "@var:NopSysNoticeTemplate@sid",
     "name": "123",
-    "tplType": "@var:NopSysCodeRule@sid",
+    "tplType": "1",
     "content": "xyz",
     "delFlag": 0,
     "version": 0,
@@ -12,7 +12,7 @@
     "updateTime": "@var:NopSysNoticeTemplate@updateTime",
     "remark": "sss",
     "id": "@var:NopSysNoticeTemplate@sid",
-    "extCode": "D2023123002",
+    "extCode": "D2023123001",
     "extFldA": "x"
   },
   "status": 0

diff --git a/.../io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/tables/nop_sys_ext_field.csv b/.../io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/tables/nop_sys_ext_field.csv
@@ -1,3 +1,3 @@
 _chgType,ENTITY_NAME,ENTITY_ID,FIELD_NAME,FIELD_TYPE,DECIMAL_SCALE,DECIMAL_VALUE,DATE_VALUE,TIMESTAMP_VALUE,STRING_VALUE,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK
-A,io.nop.sys.dao.entity.NopSysNoticeTemplate,3,fldA,11,,,,,x,0,autotest-ref,*,autotest-ref,*,
-A,io.nop.sys.dao.entity.NopSysNoticeTemplate,3,fldC,11,,,,,D2023123002,0,autotest-ref,*,autotest-ref,*,
+A,io.nop.sys.dao.entity.NopSysNoticeTemplate,@var:NopSysNoticeTemplate@sid,fldA,11,,,,,x,0,autotest-ref,*,autotest-ref,*,
+A,io.nop.sys.dao.entity.NopSysNoticeTemplate,@var:NopSysNoticeTemplate@sid,fldC,11,,,,,D2023123001,0,autotest-ref,*,autotest-ref,*,
diff --git a/nop-sys/nop-sys-service/src/test/java/io/nop/sys/service/TestCodeRule.java b/nop-sys/nop-sys-service/src/test/java/io/nop/sys/service/TestCodeRule.java
@@ -51,6 +51,6 @@ public void testCodeRule() {
         entity.setName("abc");
         scope.setLocalValue("entity", entity);
         String code = codeRuleGenerator.generate("test", scope);
-        assertEquals("D2023abc002", code);
+        assertEquals("D2023abc001", code);
     }
 }