修复单元测试

entropy-cloud · Aug 29, 2024 · 4756527 · 4756527
1 parent d41beac
commit 4756527
Show file tree

Hide file tree

Showing 26 changed files with 128 additions and 101 deletions.
diff --git a/nop-batch/deploy/sql/mysql/_add_tenant_nop-batch.sql b/nop-batch/deploy/sql/mysql/_add_tenant_nop-batch.sql
@@ -1,11 +1,11 @@
 
-    alter table nop_batch_file add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+    alter table nop_batch_file add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_record_result add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_record_result add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_task add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_task add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_task_state add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_task_state add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
 alter table nop_batch_file drop primary key;
 alter table nop_batch_file add primary key (NOP_TENANT_ID, SID);

diff --git a/nop-batch/deploy/sql/mysql/_create_nop-batch.sql b/nop-batch/deploy/sql/mysql/_create_nop-batch.sql
@@ -11,9 +11,9 @@ CREATE TABLE nop_batch_file(
   ACCEPT_DATE DATE NOT NULL    COMMENT '文件接收时间',
   VERSION BIGINT NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_batch_file primary key (SID)
 );
@@ -40,9 +40,9 @@ CREATE TABLE nop_batch_task(
   SKIP_COUNT BIGINT NULL    COMMENT '跳过数量',
   VERSION BIGINT NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_batch_task primary key (SID)
 );
@@ -58,9 +58,9 @@ CREATE TABLE nop_batch_task_state(
   TIMESTAMP_VALUE TIMESTAMP(3) NULL    COMMENT '时间点值',
   VERSION BIGINT NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   constraint PK_nop_batch_task_state primary key (TASK_ID,FIELD_NAME)
 );
 
@@ -73,9 +73,9 @@ CREATE TABLE nop_batch_record_result(
   ERROR_STACK VARCHAR(4000) NULL    COMMENT '错误堆栈',
   VERSION BIGINT NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   constraint PK_nop_batch_record_result primary key (TASK_ID,RECORD_KEY)
 );
 

diff --git a/nop-batch/deploy/sql/oracle/_add_tenant_nop-batch.sql b/nop-batch/deploy/sql/oracle/_add_tenant_nop-batch.sql
@@ -1,11 +1,11 @@
 
-    alter table nop_batch_file add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+    alter table nop_batch_file add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_record_result add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_record_result add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_task add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_task add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_task_state add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_task_state add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
 alter table nop_batch_file drop constraint PK_nop_batch_file;
 alter table nop_batch_file add constraint PK_nop_batch_file primary key (NOP_TENANT_ID, SID);

diff --git a/nop-batch/deploy/sql/postgresql/_add_tenant_nop-batch.sql b/nop-batch/deploy/sql/postgresql/_add_tenant_nop-batch.sql
@@ -1,11 +1,11 @@
 
-    alter table nop_batch_file add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+    alter table nop_batch_file add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_record_result add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_record_result add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_task add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_task add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_batch_task_state add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_batch_task_state add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
 alter table nop_batch_file drop constraint PK_nop_batch_file;
 alter table nop_batch_file add constraint PK_nop_batch_file primary key (NOP_TENANT_ID, SID);

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
@@ -8201,6 +8201,13 @@
           "io.nop.core.model.tree.ITreeVisitor"
         ]
       },
+      {
+        "name": "withAttr",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      },
       {
         "name": "wrapChildren",
         "parameterTypes": [
@@ -10995,6 +11002,10 @@
         "name": "isSupportWithAsClause",
         "parameterTypes": []
       },
+      {
+        "name": "isUseAsInFrom",
+        "parameterTypes": []
+      },
       {
         "name": "isUseGetStringForDate",
         "parameterTypes": []
@@ -11404,6 +11415,10 @@
         "name": "isSupportWithAsClause",
         "parameterTypes": []
       },
+      {
+        "name": "isUseAsInFrom",
+        "parameterTypes": []
+      },
       {
         "name": "isUseGetStringForDate",
         "parameterTypes": []
@@ -12063,6 +12078,10 @@
         "name": "getSupportWithAsClause",
         "parameterTypes": []
       },
+      {
+        "name": "getUseAsInFrom",
+        "parameterTypes": []
+      },
       {
         "name": "getUseGetStringForDate",
         "parameterTypes": []
@@ -12209,6 +12228,12 @@
           "java.lang.Boolean"
         ]
       },
+      {
+        "name": "setUseAsInFrom",
+        "parameterTypes": [
+          "java.lang.Boolean"
+        ]
+      },
       {
         "name": "setUseGetStringForDate",
         "parameterTypes": [

diff --git a/nop-demo/nop-quarkus-demo/src/test/java/io/nop/demo/biz/TestDemoBizModel.java b/nop-demo/nop-quarkus-demo/src/test/java/io/nop/demo/biz/TestDemoBizModel.java
@@ -1,5 +1,6 @@
 package io.nop.demo.biz;
 
+import io.nop.api.core.annotations.autotest.NopTestConfig;
 import io.nop.api.core.beans.ApiRequest;
 import io.nop.api.core.beans.ApiResponse;
 import io.nop.api.core.util.FutureHelper;
@@ -14,6 +15,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@NopTestConfig(localDb = true, initDatabaseSchema = true)
 public class TestDemoBizModel extends JunitBaseTestCase {
 
     @Inject

diff --git a/nop-job/deploy/sql/mysql/_add_tenant_nop-job.sql b/nop-job/deploy/sql/mysql/_add_tenant_nop-job.sql
@@ -1,7 +1,7 @@
 
-    alter table nop_job_definition add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+    alter table nop_job_definition add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_job_instance add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_job_instance add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
 alter table nop_job_definition drop primary key;
 alter table nop_job_definition add primary key (NOP_TENANT_ID, SID);

diff --git a/nop-job/deploy/sql/mysql/_create_nop-job.sql b/nop-job/deploy/sql/mysql/_create_nop-job.sql
@@ -10,23 +10,23 @@ CREATE TABLE nop_job_definition(
   STATUS INTEGER NOT NULL    COMMENT '任务状态',
   CRON_EXPR VARCHAR(100) NULL    COMMENT '定时表达式',
   REPEAT_INTERVAL INTEGER NULL    COMMENT '定时执行间隔',
-  IS_FIXED_DELAY TINYINT NULL  default '0'    COMMENT '是否固定延时',
+  IS_FIXED_DELAY TINYINT default '0'  NULL    COMMENT '是否固定延时',
   MAX_EXECUTION_COUNT INTEGER NULL    COMMENT '最多执行次数',
   MIN_SCHEDULE_TIME TIMESTAMP(3) NULL    COMMENT '最近调度时间',
   MAX_SCHEDULE_TIME TIMESTAMP(3) NULL    COMMENT '最大调度时间',
   MISFIRE_THRESHOLD INTEGER NULL    COMMENT '超时阈值',
   MAX_FAILED_COUNT INTEGER NULL    COMMENT '最大允许失败次数',
-  IS_USE_DEFAULT_CALENDAR TINYINT NULL  default '0'    COMMENT '使用系统内置日历',
+  IS_USE_DEFAULT_CALENDAR TINYINT default '0'  NULL    COMMENT '使用系统内置日历',
   PAUSE_CALENDARS VARCHAR(4000) NULL    COMMENT '暂停日历',
   SCHEDULER_GROUP VARCHAR(50) NOT NULL    COMMENT '调度器分组',
   SCHEDULER_ID VARCHAR(32) NOT NULL    COMMENT '调度器ID',
   SCHEDULER_EPOCH BIGINT NOT NULL    COMMENT '调度器世代',
   SCHEDULER_LOAD_TIME TIMESTAMP(3) NULL    COMMENT '调度器加载时间',
   VERSION BIGINT NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_job_definition primary key (SID)
 );
@@ -41,14 +41,14 @@ CREATE TABLE nop_job_instance(
   STATUS INTEGER NOT NULL    COMMENT '任务状态',
   SCHEDULED_EXEC_TIME TIMESTAMP(3) NULL    COMMENT '调度执行时间',
   EXEC_TIME TIMESTAMP(3) NULL    COMMENT '实际执行时间',
-  ONCE_TASK TINYINT NULL  default '0'    COMMENT '是否只执行一次',
+  ONCE_TASK TINYINT default '0'  NULL    COMMENT '是否只执行一次',
   ERR_CODE VARCHAR(200) NULL    COMMENT '错误码',
   ERR_MSG VARCHAR(500) NULL    COMMENT '错误消息',
   VERSION BIGINT NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_job_instance primary key (JOB_ID)
 );

diff --git a/nop-job/deploy/sql/oracle/_add_tenant_nop-job.sql b/nop-job/deploy/sql/oracle/_add_tenant_nop-job.sql
@@ -1,7 +1,7 @@
 
-    alter table nop_job_definition add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+    alter table nop_job_definition add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_job_instance add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_job_instance add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
 alter table nop_job_definition drop constraint PK_nop_job_definition;
 alter table nop_job_definition add constraint PK_nop_job_definition primary key (NOP_TENANT_ID, SID);

diff --git a/nop-job/deploy/sql/oracle/_create_nop-job.sql b/nop-job/deploy/sql/oracle/_create_nop-job.sql
@@ -10,13 +10,13 @@ CREATE TABLE nop_job_definition(
   STATUS INTEGER NOT NULL ,
   CRON_EXPR VARCHAR2(100)  ,
   REPEAT_INTERVAL INTEGER  ,
-  IS_FIXED_DELAY SMALLINT   default '0' ,
+  IS_FIXED_DELAY SMALLINT default '0'   ,
   MAX_EXECUTION_COUNT INTEGER  ,
   MIN_SCHEDULE_TIME TIMESTAMP  ,
   MAX_SCHEDULE_TIME TIMESTAMP  ,
   MISFIRE_THRESHOLD INTEGER  ,
   MAX_FAILED_COUNT INTEGER  ,
-  IS_USE_DEFAULT_CALENDAR SMALLINT   default '0' ,
+  IS_USE_DEFAULT_CALENDAR SMALLINT default '0'   ,
   PAUSE_CALENDARS VARCHAR2(4000)  ,
   SCHEDULER_GROUP VARCHAR2(50) NOT NULL ,
   SCHEDULER_ID VARCHAR2(32) NOT NULL ,
@@ -41,7 +41,7 @@ CREATE TABLE nop_job_instance(
   STATUS INTEGER NOT NULL ,
   SCHEDULED_EXEC_TIME TIMESTAMP  ,
   EXEC_TIME TIMESTAMP  ,
-  ONCE_TASK SMALLINT   default '0' ,
+  ONCE_TASK SMALLINT default '0'   ,
   ERR_CODE VARCHAR2(200)  ,
   ERR_MSG VARCHAR2(500)  ,
   VERSION NUMBER(20) NOT NULL ,

diff --git a/nop-job/deploy/sql/postgresql/_add_tenant_nop-job.sql b/nop-job/deploy/sql/postgresql/_add_tenant_nop-job.sql
@@ -1,7 +1,7 @@
 
-    alter table nop_job_definition add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+    alter table nop_job_definition add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_job_instance add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_job_instance add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
 alter table nop_job_definition drop constraint PK_nop_job_definition;
 alter table nop_job_definition add constraint PK_nop_job_definition primary key (NOP_TENANT_ID, SID);

diff --git a/nop-job/deploy/sql/postgresql/_create_nop-job.sql b/nop-job/deploy/sql/postgresql/_create_nop-job.sql
@@ -10,13 +10,13 @@ CREATE TABLE nop_job_definition(
   STATUS INT4 NOT NULL ,
   CRON_EXPR VARCHAR(100)  ,
   REPEAT_INTERVAL INT4  ,
-  IS_FIXED_DELAY INT4   default '0' ,
+  IS_FIXED_DELAY INT4 default '0'   ,
   MAX_EXECUTION_COUNT INT4  ,
   MIN_SCHEDULE_TIME TIMESTAMP  ,
   MAX_SCHEDULE_TIME TIMESTAMP  ,
   MISFIRE_THRESHOLD INT4  ,
   MAX_FAILED_COUNT INT4  ,
-  IS_USE_DEFAULT_CALENDAR INT4   default '0' ,
+  IS_USE_DEFAULT_CALENDAR INT4 default '0'   ,
   PAUSE_CALENDARS VARCHAR(4000)  ,
   SCHEDULER_GROUP VARCHAR(50) NOT NULL ,
   SCHEDULER_ID VARCHAR(32) NOT NULL ,
@@ -41,7 +41,7 @@ CREATE TABLE nop_job_instance(
   STATUS INT4 NOT NULL ,
   SCHEDULED_EXEC_TIME TIMESTAMP  ,
   EXEC_TIME TIMESTAMP  ,
-  ONCE_TASK INT4   default '0' ,
+  ONCE_TASK INT4 default '0'   ,
   ERR_CODE VARCHAR(200)  ,
   ERR_MSG VARCHAR(500)  ,
   VERSION INT8 NOT NULL ,

diff --git a/nop-report/deploy/sql/mysql/_add_tenant_nop-report.sql b/nop-report/deploy/sql/mysql/_add_tenant_nop-report.sql
@@ -1,11 +1,11 @@
 
-    alter table nop_report_dataset add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+    alter table nop_report_dataset add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_dataset_auth add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_report_dataset_auth add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_definition add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_report_definition add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_result_file add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_report_result_file add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
 alter table nop_report_dataset drop primary key;
 alter table nop_report_dataset add primary key (NOP_TENANT_ID, DS_ID);

diff --git a/nop-report/deploy/sql/mysql/_create_nop-report.sql b/nop-report/deploy/sql/mysql/_create_nop-report.sql
@@ -7,9 +7,9 @@ CREATE TABLE nop_report_definition(
   STATUS INTEGER NOT NULL    COMMENT '状态',
   VERSION INTEGER NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_report_definition primary key (RPT_ID)
 );
@@ -26,9 +26,9 @@ CREATE TABLE nop_report_dataset(
   STATUS INTEGER NOT NULL    COMMENT '状态',
   VERSION INTEGER NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_report_dataset primary key (DS_ID)
 );
@@ -39,9 +39,9 @@ CREATE TABLE nop_report_dataset_auth(
   PERMISSIONS VARCHAR(100) NOT NULL    COMMENT '许可权限',
   VERSION INTEGER NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_report_dataset_auth primary key (DS_ID)
 );
@@ -59,9 +59,9 @@ CREATE TABLE nop_report_result_file(
   DESCRIPTION VARCHAR(1000) NULL    COMMENT '描述',
   VERSION INTEGER NOT NULL    COMMENT '数据版本',
   CREATED_BY VARCHAR(50) NOT NULL    COMMENT '创建人',
-  CREATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '创建时间',
+  CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '创建时间',
   UPDATED_BY VARCHAR(50) NOT NULL    COMMENT '修改人',
-  UPDATE_TIME TIMESTAMP(3) NOT NULL  DEFAULT CURRENT_TIMESTAMP(3)    COMMENT '修改时间',
+  UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3)  NOT NULL    COMMENT '修改时间',
   REMARK VARCHAR(200) NULL    COMMENT '备注',
   constraint PK_nop_report_result_file primary key (SID)
 );

diff --git a/nop-report/deploy/sql/oracle/_add_tenant_nop-report.sql b/nop-report/deploy/sql/oracle/_add_tenant_nop-report.sql
@@ -1,11 +1,11 @@
 
-    alter table nop_report_dataset add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+    alter table nop_report_dataset add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_dataset_auth add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_report_dataset_auth add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_definition add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_report_definition add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_result_file add column NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
+alter table nop_report_result_file add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL;
 
 alter table nop_report_dataset drop constraint PK_nop_report_dataset;
 alter table nop_report_dataset add constraint PK_nop_report_dataset primary key (NOP_TENANT_ID, DS_ID);

diff --git a/nop-report/deploy/sql/postgresql/_add_tenant_nop-report.sql b/nop-report/deploy/sql/postgresql/_add_tenant_nop-report.sql
@@ -1,11 +1,11 @@
 
-    alter table nop_report_dataset add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+    alter table nop_report_dataset add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_dataset_auth add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_report_dataset_auth add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_definition add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_report_definition add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
-alter table nop_report_result_file add column NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
+alter table nop_report_result_file add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL;
 
 alter table nop_report_dataset drop constraint PK_nop_report_dataset;
 alter table nop_report_dataset add constraint PK_nop_report_dataset primary key (NOP_TENANT_ID, DS_ID);