From e17f43456b342f7156a016d505cf43c6f9f394d2 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Mon, 30 Sep 2019 16:10:09 +0800
Subject: [PATCH] entity title table name modify (#946)

* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify
---
 .../org/apache/dolphinscheduler/dao/entity/AccessToken.java     | 2 +-
 .../main/java/org/apache/dolphinscheduler/dao/entity/Alert.java | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/Command.java    | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/DataSource.java | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/DatasourceUser.java  | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/ErrorCommand.java    | 2 +-
 .../apache/dolphinscheduler/dao/entity/ProcessDefinition.java   | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/ProcessInstance.java | 2 +-
 .../apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java  | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/Project.java    | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/ProjectUser.java     | 2 +-
 .../main/java/org/apache/dolphinscheduler/dao/entity/Queue.java | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/Resource.java   | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/ResourcesUser.java   | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/Schedule.java   | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/Session.java    | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/TaskInstance.java    | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/Tenant.java     | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/UDFUser.java    | 2 +-
 .../java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java    | 2 +-
 .../main/java/org/apache/dolphinscheduler/dao/entity/User.java  | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java  | 2 +-
 .../org/apache/dolphinscheduler/dao/entity/WorkerGroup.java     | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
index 11d50a5b08..33f6d2e24b 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
@@ -25,7 +25,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("t_escheduler_access_token")
+@TableName("t_ds_access_token")
 public class AccessToken {
 
     @TableId(value="id", type=IdType.AUTO)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
index f5c56656d7..d989f82fa2 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
@@ -33,7 +33,7 @@ import java.util.Map;
  *  alert
  */
 @Data
-@TableName("t_escheduler_alert")
+@TableName("t_ds_alert")
 public class Alert {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
index 62afb4969a..2aae4bdc26 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
@@ -25,7 +25,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("t_escheduler_alertgroup")
+@TableName("t_ds_alertgroup")
 public class AlertGroup {
 
 
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
index 2f42dfee0b..c36369aedd 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
@@ -29,7 +29,7 @@ import java.util.Date;
  * command
  */
 @Data
-@TableName("t_escheduler_command")
+@TableName("t_ds_command")
 public class Command {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
index f61b8339e8..433fa2ebbf 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
@@ -28,7 +28,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("t_escheduler_datasource")
+@TableName("t_ds_datasource")
 public class DataSource {
   /**
    * id
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java
index 85331cf8e2..805f075bfb 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java
@@ -25,7 +25,7 @@ import java.util.Date;
 /**
  * data source user relation
  */
-@TableName("t_escheduler_relation_datasource_user")
+@TableName("t_ds_relation_datasource_user")
 public class DatasourceUser {
 
   /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
index ef92bea7b0..7f3eb38760 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
@@ -26,7 +26,7 @@ import java.util.Date;
 /**
  * command
  */
-@TableName("t_escheduler_error_command")
+@TableName("t_ds_error_command")
 public class ErrorCommand {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
index a86f0c7c2f..d3de4123b0 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
  * process definition
  */
 @Data
-@TableName("t_escheduler_process_definition")
+@TableName("t_ds_process_definition")
 public class ProcessDefinition {
     /**
      * id
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
index 770cd98e56..afc7f7aac4 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
@@ -30,7 +30,7 @@ import java.util.Date;
  * process instance
  */
 @Data
-@TableName("t_escheduler_process_instance")
+@TableName("t_ds_process_instance")
 public class ProcessInstance {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
index 0c6424ec8a..c85a6b73e0 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
@@ -25,7 +25,7 @@ import lombok.Data;
  * process instance map
  */
 @Data
-@TableName("t_escheduler_relation_process_instance")
+@TableName("t_ds_relation_process_instance")
 public class ProcessInstanceMap {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
index 3dcaf4490a..721541fafb 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
@@ -28,7 +28,7 @@ import java.util.Date;
  * project
  */
 @Data
-@TableName("t_escheduler_project")
+@TableName("t_ds_project")
 public class Project {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
index 0e089d8cba..188749b27e 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
@@ -25,7 +25,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("t_escheduler_relation_project_user")
+@TableName("t_ds_relation_project_user")
 public class ProjectUser {
     /**
      * id
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java
index 94f8206914..7a2894aa58 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * queue
  */
 @Data
-@TableName("t_escheduler_queue")
+@TableName("t_ds_queue")
 public class Queue {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
index 1ac3f3ef34..68ee53aece 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
@@ -26,7 +26,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("t_escheduler_resources")
+@TableName("t_ds_resources")
 public class Resource {
   /**
    * id
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
index b1d66880e7..0901153380 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * resource user relation
  */
 @Data
-@TableName("t_escheduler_relation_resources_user")
+@TableName("t_ds_relation_resources_user")
 public class ResourcesUser {
 
   /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
index ab7cf47d7e..65ae4d8e12 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
@@ -33,7 +33,7 @@ import java.util.Date;
  *
  */
 @Data
-@TableName("t_escheduler_schedules")
+@TableName("t_ds_schedules")
 public class Schedule {
 
   @TableId(value="id", type=IdType.AUTO)
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java
index a5c27b17cd..6606d52685 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * session
  */
 @Data
-@TableName("t_escheduler_session")
+@TableName("t_ds_session")
 public class Session {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
index 41b3fdcfa5..5abb2919d0 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
@@ -33,7 +33,7 @@ import java.util.Date;
  * task instance
  */
 @Data
-@TableName("t_escheduler_task_instance")
+@TableName("t_ds_task_instance")
 public class TaskInstance {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
index ba8ff2ea3a..72ebaaa785 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
@@ -28,7 +28,7 @@ import java.util.Date;
  * tenant
  */
 @Data
-@TableName("t_escheduler_tenant")
+@TableName("t_ds_tenant")
 public class Tenant {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
index c89008e915..aea1a40de1 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * udf user relation
  */
 @Data
-@TableName("t_escheduler_relation_udfs_user")
+@TableName("t_ds_relation_udfs_user")
 public class UDFUser {
 
   /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
index bf69f02c15..2b2c487b4f 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
@@ -29,7 +29,7 @@ import java.util.Date;
  * udf function
  */
 @Data
-@TableName("t_escheduler_udfs")
+@TableName("t_ds_udfs")
 public class UdfFunc {
     /**
      * id
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
index f1a7d4a009..c4df0679ef 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
@@ -32,7 +32,7 @@ import java.util.Date;
  * user
  */
 @Data
-@TableName("t_escheduler_user")
+@TableName("t_ds_user")
 @ApiModel(description = "UserModelDesc")
 public class  User {
 
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
index a79e250ab0..84742468b6 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
@@ -28,7 +28,7 @@ import java.util.Date;
  * user alert group
  */
 @Data
-@TableName("t_escheduler_relation_user_alertgroup")
+@TableName("t_ds_relation_user_alertgroup")
 public class UserAlertGroup {
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java
index 29532eef83..5c4595b1cf 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * worker group for task running
  */
 @Data
-@TableName("t_escheduler_worker_group")
+@TableName("t_ds_worker_group")
 public class WorkerGroup {
 
     @TableId(value="id", type=IdType.AUTO)