Browse Source

update postgre sql (#1118)

* update english documents

* refactor zk client

* update documents

* update zkclient

* update zkclient

* update documents

* add architecture-design

* change i18n

* update i18n

* update english documents

* add architecture-design

* update english documents

* update en-US documents

* add architecture-design

* update demo site

* add mybatis plus model

* modify mybatisplus

* modify mybatisplus

* change interface by mybatisplus

* add unit test

* refactor dao interface.

* add unit test for dao...

* add unit test for dao...

* add unit test for dao...

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml

* update some dao bugs

* update for some bugs

* update some bugs

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml

* update

* update

* add multiply settings for application.yml

* add multiply settings for application.yml

* revert

* update configuration settings in task record dao...

* change application_master to application-master

* change application_master to application-master

* update application.yml to application.properties

* revert

* revert

* add properties

* add properties

* revert

* revert

* add api start up..
add alert send try catch

* update dao info level

* fix bug: task cannot submit when recovery failover

* fix bug: task cannot submit when recovery failover

* merge from dev-db

* revert

* revert

* fix bug: get process definition list failed.

* fix bug: process instance interval is error

* revert

* revert

* update

* support stop submit success tasks

* update kill process

* update for stop process

* update for stop process

* add some logs for stop process

* update for small bug.

* add check strategy before submit task

* revert

* update

* update

* revert

* wait task instance exists if null.

* revert

* update

* change desc to description.

* add check user and definitions function when delete tenant

* update

* change desc to description.

* change desc to description.

* change desc to description.

* remove check resources when delete tenant

* change desc to description.

* change mybatisplus version to 3.2.0

* update

* change the notice to apache.

* update

* update postgre sql
bao liang 5 years ago
parent
commit
6a1991e83c

+ 3 - 5
NOTICE

@@ -1,7 +1,5 @@
-Easy Scheduler
-Copyright 2019 The Analysys Foundation
+Apache DolphinScheduler (incubating)
+Copyright 2019 The Apache Software Foundation
 
 This product includes software developed at
-The Analysys Foundation (https://www.analysys.cn/).
-
-
+The Apache Software Foundation (http://www.apache.org/).

+ 173 - 146
sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_ddl.sql

@@ -212,11 +212,11 @@ alter table QRTZ_TRIGGERS add CONSTRAINT QRTZ_TRIGGERS_ibfk_1 FOREIGN KEY (SCHED
 
 
 --
+-- Table structure for table t_ds_access_token
 --
 
-DROP TABLE IF EXISTS t_escheduler_access_token;
-CREATE TABLE t_escheduler_access_token (
+DROP TABLE IF EXISTS t_ds_access_token;
+CREATE TABLE t_ds_access_token (
   id int NOT NULL  ,
   user_id int DEFAULT NULL ,
   token varchar(64) DEFAULT NULL ,
@@ -227,11 +227,11 @@ CREATE TABLE t_escheduler_access_token (
 ) ;
 
 --
+-- Table structure for table t_ds_alert
 --
 
-DROP TABLE IF EXISTS t_escheduler_alert;
-CREATE TABLE t_escheduler_alert (
+DROP TABLE IF EXISTS t_ds_alert;
+CREATE TABLE t_ds_alert (
   id int NOT NULL  ,
   title varchar(64) DEFAULT NULL ,
   show_type int DEFAULT NULL ,
@@ -247,26 +247,26 @@ CREATE TABLE t_escheduler_alert (
   PRIMARY KEY (id)
 ) ;
 --
+-- Table structure for table t_ds_alertgroup
 --
 
-DROP TABLE IF EXISTS t_escheduler_alertgroup;
-CREATE TABLE t_escheduler_alertgroup (
+DROP TABLE IF EXISTS t_ds_alertgroup;
+CREATE TABLE t_ds_alertgroup (
   id int NOT NULL  ,
   group_name varchar(255) DEFAULT NULL ,
   group_type int DEFAULT NULL ,
-  "desc" varchar(255) DEFAULT NULL ,
+  description varchar(255) DEFAULT NULL ,
   create_time timestamp DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
   PRIMARY KEY (id)
 ) ;
 
 --
+-- Table structure for table t_ds_command
 --
 
-DROP TABLE IF EXISTS t_escheduler_command;
-CREATE TABLE t_escheduler_command (
+DROP TABLE IF EXISTS t_ds_command;
+CREATE TABLE t_ds_command (
   id int NOT NULL  ,
   command_type int DEFAULT NULL ,
   process_definition_id int DEFAULT NULL ,
@@ -286,11 +286,11 @@ CREATE TABLE t_escheduler_command (
 ) ;
 
 --
+-- Table structure for table t_ds_datasource
 --
 
-DROP TABLE IF EXISTS t_escheduler_datasource;
-CREATE TABLE t_escheduler_datasource (
+DROP TABLE IF EXISTS t_ds_datasource;
+CREATE TABLE t_ds_datasource (
   id int NOT NULL  ,
   name varchar(64) NOT NULL ,
   note varchar(256) DEFAULT NULL ,
@@ -303,11 +303,11 @@ CREATE TABLE t_escheduler_datasource (
 ) ;
 
 --
+-- Table structure for table t_ds_error_command
 --
 
-DROP TABLE IF EXISTS t_escheduler_error_command;
-CREATE TABLE t_escheduler_error_command (
+DROP TABLE IF EXISTS t_ds_error_command;
+CREATE TABLE t_ds_error_command (
   id int NOT NULL ,
   command_type int DEFAULT NULL ,
   executor_id int DEFAULT NULL ,
@@ -327,11 +327,11 @@ CREATE TABLE t_escheduler_error_command (
   PRIMARY KEY (id)
 );
 --
+-- Table structure for table t_ds_master_server
 --
 
-DROP TABLE IF EXISTS t_escheduler_master_server;
-CREATE TABLE t_escheduler_master_server (
+DROP TABLE IF EXISTS t_ds_master_server;
+CREATE TABLE t_ds_master_server (
   id int NOT NULL  ,
   host varchar(45) DEFAULT NULL ,
   port int DEFAULT NULL ,
@@ -343,11 +343,11 @@ CREATE TABLE t_escheduler_master_server (
 ) ;
 
 --
+-- Table structure for table t_ds_process_definition
 --
 
-DROP TABLE IF EXISTS t_escheduler_process_definition;
-CREATE TABLE t_escheduler_process_definition (
+DROP TABLE IF EXISTS t_ds_process_definition;
+CREATE TABLE t_ds_process_definition (
   id int NOT NULL  ,
   name varchar(255) DEFAULT NULL ,
   version int DEFAULT NULL ,
@@ -355,7 +355,7 @@ CREATE TABLE t_escheduler_process_definition (
   project_id int DEFAULT NULL ,
   user_id int DEFAULT NULL ,
   process_definition_json text ,
-  "desc" text ,
+  description text ,
   global_params text ,
   flag int DEFAULT NULL ,
   locations text ,
@@ -369,14 +369,14 @@ CREATE TABLE t_escheduler_process_definition (
   PRIMARY KEY (id)
 ) ;
 
-create index process_definition_index on t_escheduler_process_definition (project_id,id);
+create index process_definition_index on t_ds_process_definition (project_id,id);
 
 --
+-- Table structure for table t_ds_process_instance
 --
 
-DROP TABLE IF EXISTS t_escheduler_process_instance;
-CREATE TABLE t_escheduler_process_instance (
+DROP TABLE IF EXISTS t_ds_process_instance;
+CREATE TABLE t_ds_process_instance (
   id int NOT NULL  ,
   name varchar(255) DEFAULT NULL ,
   process_definition_id int DEFAULT NULL ,
@@ -411,32 +411,32 @@ CREATE TABLE t_escheduler_process_instance (
   tenant_id int NOT NULL DEFAULT '-1' ,
   PRIMARY KEY (id)
 ) ;
-  create index process_instance_index on t_escheduler_process_instance (process_definition_id,id);
-  create index start_time_index on t_escheduler_process_instance (start_time);
+  create index process_instance_index on t_ds_process_instance (process_definition_id,id);
+  create index start_time_index on t_ds_process_instance (start_time);
 
 --
+-- Table structure for table t_ds_project
 --
 
-DROP TABLE IF EXISTS t_escheduler_project;
-CREATE TABLE t_escheduler_project (
+DROP TABLE IF EXISTS t_ds_project;
+CREATE TABLE t_ds_project (
   id int NOT NULL  ,
   name varchar(100) DEFAULT NULL ,
-  ”desc“ varchar(200) DEFAULT NULL ,
+  description varchar(200) DEFAULT NULL ,
   user_id int DEFAULT NULL ,
   flag int DEFAULT '1' ,
   create_time timestamp DEFAULT CURRENT_TIMESTAMP ,
   update_time timestamp DEFAULT CURRENT_TIMESTAMP ,
   PRIMARY KEY (id)
 ) ;
-  create index user_id_index on t_escheduler_project (user_id);
+  create index user_id_index on t_ds_project (user_id);
 
 --
+-- Table structure for table t_ds_queue
 --
 
-DROP TABLE IF EXISTS t_escheduler_queue;
-CREATE TABLE t_escheduler_queue (
+DROP TABLE IF EXISTS t_ds_queue;
+CREATE TABLE t_ds_queue (
   id int NOT NULL  ,
   queue_name varchar(64) DEFAULT NULL ,
   queue varchar(64) DEFAULT NULL ,
@@ -447,11 +447,11 @@ CREATE TABLE t_escheduler_queue (
 
 
 --
+-- Table structure for table t_ds_relation_datasource_user
 --
 
-DROP TABLE IF EXISTS t_escheduler_relation_datasource_user;
-CREATE TABLE t_escheduler_relation_datasource_user (
+DROP TABLE IF EXISTS t_ds_relation_datasource_user;
+CREATE TABLE t_ds_relation_datasource_user (
   id int NOT NULL  ,
   user_id int NOT NULL ,
   datasource_id int DEFAULT NULL ,
@@ -463,11 +463,11 @@ CREATE TABLE t_escheduler_relation_datasource_user (
 ;
 
 --
+-- Table structure for table t_ds_relation_process_instance
 --
 
-DROP TABLE IF EXISTS t_escheduler_relation_process_instance;
-CREATE TABLE t_escheduler_relation_process_instance (
+DROP TABLE IF EXISTS t_ds_relation_process_instance;
+CREATE TABLE t_ds_relation_process_instance (
   id int NOT NULL  ,
   parent_process_instance_id int DEFAULT NULL ,
   parent_task_instance_id int DEFAULT NULL ,
@@ -477,11 +477,11 @@ CREATE TABLE t_escheduler_relation_process_instance (
 
 
 --
+-- Table structure for table t_ds_relation_project_user
 --
 
-DROP TABLE IF EXISTS t_escheduler_relation_project_user;
-CREATE TABLE t_escheduler_relation_project_user (
+DROP TABLE IF EXISTS t_ds_relation_project_user;
+CREATE TABLE t_ds_relation_project_user (
   id int NOT NULL  ,
   user_id int NOT NULL ,
   project_id int DEFAULT NULL ,
@@ -490,14 +490,14 @@ CREATE TABLE t_escheduler_relation_project_user (
   update_time timestamp DEFAULT NULL ,
   PRIMARY KEY (id)
 ) ;
-create index relation_project_user_id_index on t_escheduler_relation_project_user (user_id);
+create index relation_project_user_id_index on t_ds_relation_project_user (user_id);
 
 --
+-- Table structure for table t_ds_relation_resources_user
 --
 
-DROP TABLE IF EXISTS t_escheduler_relation_resources_user;
-CREATE TABLE t_escheduler_relation_resources_user (
+DROP TABLE IF EXISTS t_ds_relation_resources_user;
+CREATE TABLE t_ds_relation_resources_user (
   id int NOT NULL ,
   user_id int NOT NULL ,
   resources_id int DEFAULT NULL ,
@@ -508,11 +508,11 @@ CREATE TABLE t_escheduler_relation_resources_user (
 ) ;
 
 --
+-- Table structure for table t_ds_relation_udfs_user
 --
 
-DROP TABLE IF EXISTS t_escheduler_relation_udfs_user;
-CREATE TABLE t_escheduler_relation_udfs_user (
+DROP TABLE IF EXISTS t_ds_relation_udfs_user;
+CREATE TABLE t_ds_relation_udfs_user (
   id int NOT NULL  ,
   user_id int NOT NULL ,
   udf_id int DEFAULT NULL ,
@@ -524,11 +524,11 @@ CREATE TABLE t_escheduler_relation_udfs_user (
 ;
 
 --
+-- Table structure for table t_ds_relation_user_alertgroup
 --
 
-DROP TABLE IF EXISTS t_escheduler_relation_user_alertgroup;
-CREATE TABLE t_escheduler_relation_user_alertgroup (
+DROP TABLE IF EXISTS t_ds_relation_user_alertgroup;
+CREATE TABLE t_ds_relation_user_alertgroup (
   id int NOT NULL,
   alertgroup_id int DEFAULT NULL,
   user_id int DEFAULT NULL,
@@ -538,15 +538,15 @@ CREATE TABLE t_escheduler_relation_user_alertgroup (
 );
 
 --
+-- Table structure for table t_ds_resources
 --
 
-DROP TABLE IF EXISTS t_escheduler_resources;
-CREATE TABLE t_escheduler_resources (
+DROP TABLE IF EXISTS t_ds_resources;
+CREATE TABLE t_ds_resources (
   id int NOT NULL  ,
   alias varchar(64) DEFAULT NULL ,
   file_name varchar(64) DEFAULT NULL ,
-  "desc" varchar(256) DEFAULT NULL ,
+  description varchar(256) DEFAULT NULL ,
   user_id int DEFAULT NULL ,
   type int DEFAULT NULL ,
   size bigint DEFAULT NULL ,
@@ -557,11 +557,11 @@ CREATE TABLE t_escheduler_resources (
 ;
 
 --
+-- Table structure for table t_ds_schedules
 --
 
-DROP TABLE IF EXISTS t_escheduler_schedules;
-CREATE TABLE t_escheduler_schedules (
+DROP TABLE IF EXISTS t_ds_schedules;
+CREATE TABLE t_ds_schedules (
   id int NOT NULL  ,
   process_definition_id int NOT NULL ,
   start_time timestamp NOT NULL ,
@@ -580,11 +580,11 @@ CREATE TABLE t_escheduler_schedules (
 );
 
 --
+-- Table structure for table t_ds_session
 --
 
-DROP TABLE IF EXISTS t_escheduler_session;
-CREATE TABLE t_escheduler_session (
+DROP TABLE IF EXISTS t_ds_session;
+CREATE TABLE t_ds_session (
   id varchar(64) NOT NULL ,
   user_id int DEFAULT NULL ,
   ip varchar(45) DEFAULT NULL ,
@@ -593,11 +593,11 @@ CREATE TABLE t_escheduler_session (
 );
 
 --
+-- Table structure for table t_ds_task_instance
 --
 
-DROP TABLE IF EXISTS t_escheduler_task_instance;
-CREATE TABLE t_escheduler_task_instance (
+DROP TABLE IF EXISTS t_ds_task_instance;
+CREATE TABLE t_ds_task_instance (
   id int NOT NULL  ,
   name varchar(255) DEFAULT NULL ,
   task_type varchar(64) DEFAULT NULL ,
@@ -624,15 +624,15 @@ CREATE TABLE t_escheduler_task_instance (
 ) ;
 
 --
+-- Table structure for table t_ds_tenant
 --
 
-DROP TABLE IF EXISTS t_escheduler_tenant;
-CREATE TABLE t_escheduler_tenant (
+DROP TABLE IF EXISTS t_ds_tenant;
+CREATE TABLE t_ds_tenant (
   id int NOT NULL  ,
   tenant_code varchar(64) DEFAULT NULL ,
   tenant_name varchar(64) DEFAULT NULL ,
-  "desc" varchar(256) DEFAULT NULL ,
+  description varchar(256) DEFAULT NULL ,
   queue_id int DEFAULT NULL ,
   create_time timestamp DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
@@ -640,11 +640,11 @@ CREATE TABLE t_escheduler_tenant (
 ) ;
 
 --
+-- Table structure for table t_ds_udfs
 --
 
-DROP TABLE IF EXISTS t_escheduler_udfs;
-CREATE TABLE t_escheduler_udfs (
+DROP TABLE IF EXISTS t_ds_udfs;
+CREATE TABLE t_ds_udfs (
   id int NOT NULL  ,
   user_id int NOT NULL ,
   func_name varchar(100) NOT NULL ,
@@ -652,7 +652,7 @@ CREATE TABLE t_escheduler_udfs (
   type int NOT NULL ,
   arg_types varchar(255) DEFAULT NULL ,
   database varchar(255) DEFAULT NULL ,
-  "desc" varchar(255) DEFAULT NULL ,
+  description varchar(255) DEFAULT NULL ,
   resource_id int NOT NULL ,
   resource_name varchar(255) NOT NULL ,
   create_time timestamp NOT NULL ,
@@ -661,11 +661,11 @@ CREATE TABLE t_escheduler_udfs (
 ) ;
 
 --
+-- Table structure for table t_ds_user
 --
 
-DROP TABLE IF EXISTS t_escheduler_user;
-CREATE TABLE t_escheduler_user (
+DROP TABLE IF EXISTS t_ds_user;
+CREATE TABLE t_ds_user (
   id int NOT NULL  ,
   user_name varchar(64) DEFAULT NULL ,
   user_password varchar(64) DEFAULT NULL ,
@@ -680,23 +680,23 @@ CREATE TABLE t_escheduler_user (
 );
 
 --
+-- Table structure for table t_ds_version
 --
 
-DROP TABLE IF EXISTS t_escheduler_version;
-CREATE TABLE t_escheduler_version (
+DROP TABLE IF EXISTS t_ds_version;
+CREATE TABLE t_ds_version (
   id int NOT NULL ,
   version varchar(200) NOT NULL,
   PRIMARY KEY (id)
 ) ;
-create index version_index on t_escheduler_version(version);
+create index version_index on t_ds_version(version);
 
 --
+-- Table structure for table t_ds_worker_group
 --
 
-DROP TABLE IF EXISTS t_escheduler_worker_group;
-CREATE TABLE t_escheduler_worker_group (
+DROP TABLE IF EXISTS t_ds_worker_group;
+CREATE TABLE t_ds_worker_group (
   id bigint NOT NULL  ,
   name varchar(256) DEFAULT NULL ,
   ip_list varchar(256) DEFAULT NULL ,
@@ -706,11 +706,11 @@ CREATE TABLE t_escheduler_worker_group (
 ) ;
 
 --
+-- Table structure for table t_ds_worker_server
 --
 
-DROP TABLE IF EXISTS t_escheduler_worker_server;
-CREATE TABLE t_escheduler_worker_server (
+DROP TABLE IF EXISTS t_ds_worker_server;
+CREATE TABLE t_ds_worker_server (
   id int NOT NULL  ,
   host varchar(45) DEFAULT NULL ,
   port int DEFAULT NULL ,
@@ -722,83 +722,83 @@ CREATE TABLE t_escheduler_worker_server (
 ) ;
 
 
-DROP SEQUENCE IF EXISTS t_escheduler_access_token_id_sequence;
-CREATE SEQUENCE  t_escheduler_access_token_id_sequence;
-ALTER TABLE t_escheduler_access_token ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_access_token_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_alert_id_sequence;
-CREATE SEQUENCE  t_escheduler_alert_id_sequence;
-ALTER TABLE t_escheduler_alert ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_alert_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_alertgroup_id_sequence;
-CREATE SEQUENCE  t_escheduler_alertgroup_id_sequence;
-ALTER TABLE t_escheduler_alertgroup ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_alertgroup_id_sequence');
-
-DROP SEQUENCE IF EXISTS t_escheduler_command_id_sequence;
-CREATE SEQUENCE  t_escheduler_command_id_sequence;
-ALTER TABLE t_escheduler_command ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_command_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_datasource_id_sequence;
-CREATE SEQUENCE  t_escheduler_datasource_id_sequence;
-ALTER TABLE t_escheduler_datasource ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_datasource_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_master_server_id_sequence;
-CREATE SEQUENCE  t_escheduler_master_server_id_sequence;
-ALTER TABLE t_escheduler_master_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_master_server_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_process_definition_id_sequence;
-CREATE SEQUENCE  t_escheduler_process_definition_id_sequence;
-ALTER TABLE t_escheduler_process_definition ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_process_definition_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_process_instance_id_sequence;
-CREATE SEQUENCE  t_escheduler_process_instance_id_sequence;
-ALTER TABLE t_escheduler_process_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_process_instance_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_project_id_sequence;
-CREATE SEQUENCE  t_escheduler_project_id_sequence;
-ALTER TABLE t_escheduler_project ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_project_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_queue_id_sequence;
-CREATE SEQUENCE  t_escheduler_queue_id_sequence;
-ALTER TABLE t_escheduler_queue ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_queue_id_sequence');
-
-DROP SEQUENCE IF EXISTS t_escheduler_relation_datasource_user_id_sequence;
-CREATE SEQUENCE  t_escheduler_relation_datasource_user_id_sequence;
-ALTER TABLE t_escheduler_relation_datasource_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_relation_datasource_user_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_relation_process_instance_id_sequence;
-CREATE SEQUENCE  t_escheduler_relation_process_instance_id_sequence;
-ALTER TABLE t_escheduler_relation_process_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_relation_process_instance_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_relation_project_user_id_sequence;
-CREATE SEQUENCE  t_escheduler_relation_project_user_id_sequence;
-ALTER TABLE t_escheduler_relation_project_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_relation_project_user_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_relation_resources_user_id_sequence;
-CREATE SEQUENCE  t_escheduler_relation_resources_user_id_sequence;
-ALTER TABLE t_escheduler_relation_resources_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_relation_resources_user_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_relation_udfs_user_id_sequence;
-CREATE SEQUENCE  t_escheduler_relation_udfs_user_id_sequence;
-ALTER TABLE t_escheduler_relation_udfs_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_relation_udfs_user_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_relation_user_alertgroup_id_sequence;
-CREATE SEQUENCE  t_escheduler_relation_user_alertgroup_id_sequence;
-ALTER TABLE t_escheduler_relation_user_alertgroup ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_relation_user_alertgroup_id_sequence');
-
-DROP SEQUENCE IF EXISTS t_escheduler_resources_id_sequence;
-CREATE SEQUENCE  t_escheduler_resources_id_sequence;
-ALTER TABLE t_escheduler_resources ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_resources_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_schedules_id_sequence;
-CREATE SEQUENCE  t_escheduler_schedules_id_sequence;
-ALTER TABLE t_escheduler_schedules ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_schedules_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_task_instance_id_sequence;
-CREATE SEQUENCE  t_escheduler_task_instance_id_sequence;
-ALTER TABLE t_escheduler_task_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_task_instance_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_tenant_id_sequence;
-CREATE SEQUENCE  t_escheduler_tenant_id_sequence;
-ALTER TABLE t_escheduler_tenant ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_tenant_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_udfs_id_sequence;
-CREATE SEQUENCE  t_escheduler_udfs_id_sequence;
-ALTER TABLE t_escheduler_udfs ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_udfs_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_user_id_sequence;
-CREATE SEQUENCE  t_escheduler_user_id_sequence;
-ALTER TABLE t_escheduler_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_user_id_sequence');
-
-DROP SEQUENCE IF EXISTS t_escheduler_version_id_sequence;
-CREATE SEQUENCE  t_escheduler_version_id_sequence;
-ALTER TABLE t_escheduler_version ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_version_id_sequence');
-
-DROP SEQUENCE IF EXISTS t_escheduler_worker_group_id_sequence;
-CREATE SEQUENCE  t_escheduler_worker_group_id_sequence;
-ALTER TABLE t_escheduler_worker_group ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_worker_group_id_sequence');
-DROP SEQUENCE IF EXISTS t_escheduler_worker_server_id_sequence;
-CREATE SEQUENCE  t_escheduler_worker_server_id_sequence;
-ALTER TABLE t_escheduler_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_escheduler_worker_server_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_access_token_id_sequence;
+CREATE SEQUENCE  t_ds_access_token_id_sequence;
+ALTER TABLE t_ds_access_token ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_access_token_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_alert_id_sequence;
+CREATE SEQUENCE  t_ds_alert_id_sequence;
+ALTER TABLE t_ds_alert ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_alert_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_alertgroup_id_sequence;
+CREATE SEQUENCE  t_ds_alertgroup_id_sequence;
+ALTER TABLE t_ds_alertgroup ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_alertgroup_id_sequence');
+
+DROP SEQUENCE IF EXISTS t_ds_command_id_sequence;
+CREATE SEQUENCE  t_ds_command_id_sequence;
+ALTER TABLE t_ds_command ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_command_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_datasource_id_sequence;
+CREATE SEQUENCE  t_ds_datasource_id_sequence;
+ALTER TABLE t_ds_datasource ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_datasource_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_master_server_id_sequence;
+CREATE SEQUENCE  t_ds_master_server_id_sequence;
+ALTER TABLE t_ds_master_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_master_server_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_process_definition_id_sequence;
+CREATE SEQUENCE  t_ds_process_definition_id_sequence;
+ALTER TABLE t_ds_process_definition ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_process_definition_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_process_instance_id_sequence;
+CREATE SEQUENCE  t_ds_process_instance_id_sequence;
+ALTER TABLE t_ds_process_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_process_instance_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_project_id_sequence;
+CREATE SEQUENCE  t_ds_project_id_sequence;
+ALTER TABLE t_ds_project ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_project_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_queue_id_sequence;
+CREATE SEQUENCE  t_ds_queue_id_sequence;
+ALTER TABLE t_ds_queue ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_queue_id_sequence');
+
+DROP SEQUENCE IF EXISTS t_ds_relation_datasource_user_id_sequence;
+CREATE SEQUENCE  t_ds_relation_datasource_user_id_sequence;
+ALTER TABLE t_ds_relation_datasource_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_relation_datasource_user_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_relation_process_instance_id_sequence;
+CREATE SEQUENCE  t_ds_relation_process_instance_id_sequence;
+ALTER TABLE t_ds_relation_process_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_relation_process_instance_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_relation_project_user_id_sequence;
+CREATE SEQUENCE  t_ds_relation_project_user_id_sequence;
+ALTER TABLE t_ds_relation_project_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_relation_project_user_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_relation_resources_user_id_sequence;
+CREATE SEQUENCE  t_ds_relation_resources_user_id_sequence;
+ALTER TABLE t_ds_relation_resources_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_relation_resources_user_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_relation_udfs_user_id_sequence;
+CREATE SEQUENCE  t_ds_relation_udfs_user_id_sequence;
+ALTER TABLE t_ds_relation_udfs_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_relation_udfs_user_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_relation_user_alertgroup_id_sequence;
+CREATE SEQUENCE  t_ds_relation_user_alertgroup_id_sequence;
+ALTER TABLE t_ds_relation_user_alertgroup ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_relation_user_alertgroup_id_sequence');
+
+DROP SEQUENCE IF EXISTS t_ds_resources_id_sequence;
+CREATE SEQUENCE  t_ds_resources_id_sequence;
+ALTER TABLE t_ds_resources ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_resources_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_schedules_id_sequence;
+CREATE SEQUENCE  t_ds_schedules_id_sequence;
+ALTER TABLE t_ds_schedules ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_schedules_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_task_instance_id_sequence;
+CREATE SEQUENCE  t_ds_task_instance_id_sequence;
+ALTER TABLE t_ds_task_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_task_instance_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_tenant_id_sequence;
+CREATE SEQUENCE  t_ds_tenant_id_sequence;
+ALTER TABLE t_ds_tenant ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_tenant_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_udfs_id_sequence;
+CREATE SEQUENCE  t_ds_udfs_id_sequence;
+ALTER TABLE t_ds_udfs ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_udfs_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_user_id_sequence;
+CREATE SEQUENCE  t_ds_user_id_sequence;
+ALTER TABLE t_ds_user ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_user_id_sequence');
+
+DROP SEQUENCE IF EXISTS t_ds_version_id_sequence;
+CREATE SEQUENCE  t_ds_version_id_sequence;
+ALTER TABLE t_ds_version ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_version_id_sequence');
+
+DROP SEQUENCE IF EXISTS t_ds_worker_group_id_sequence;
+CREATE SEQUENCE  t_ds_worker_group_id_sequence;
+ALTER TABLE t_ds_worker_group ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_group_id_sequence');
+DROP SEQUENCE IF EXISTS t_ds_worker_server_id_sequence;
+CREATE SEQUENCE  t_ds_worker_server_id_sequence;
+ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_server_id_sequence');

+ 7 - 5
sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql

@@ -1,8 +1,8 @@
-INSERT INTO "t_escheduler_user" VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-INSERT INTO "t_escheduler_alertgroup" VALUES (1, 'escheduler管理员告警组', '0', 'escheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39');
-INSERT INTO "t_escheduler_relation_user_alertgroup" VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
+-- Records of t_ds_user,user : admin , password : dolphinscheduler123
+INSERT INTO "t_ds_user" VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO "t_ds_alertgroup" VALUES (1, 'dolphinscheduler管理员告警组', '0', 'dolphinscheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39');
+INSERT INTO "t_ds_relation_user_alertgroup" VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
 
-INSERT INTO "t_escheduler_queue" VALUES ('1', 'default', 'default');
-INSERT INTO "t_escheduler_version" VALUES ('1', '1.2.0');
+-- Records of t_ds_queue,default queue name : default
+INSERT INTO "t_ds_queue" VALUES ('1', 'default', 'default');
+INSERT INTO "t_ds_version" VALUES ('1', '1.2.0');