Browse Source

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
pull/2/head
qiaozhanwei 5 years ago committed by lgcareer
parent
commit
e17f43456b
  1. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
  2. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
  3. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
  4. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
  5. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
  6. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java
  7. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
  8. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
  9. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
  10. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
  11. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
  12. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
  13. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java
  14. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
  15. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
  16. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
  17. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java
  18. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
  19. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
  20. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
  21. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
  22. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java
  23. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java
  24. 2
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java

@ -25,7 +25,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("t_escheduler_access_token") @TableName("t_ds_access_token")
public class AccessToken { public class AccessToken {
@TableId(value="id", type=IdType.AUTO) @TableId(value="id", type=IdType.AUTO)

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java

@ -33,7 +33,7 @@ import java.util.Map;
* alert * alert
*/ */
@Data @Data
@TableName("t_escheduler_alert") @TableName("t_ds_alert")
public class Alert { public class Alert {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java

@ -25,7 +25,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("t_escheduler_alertgroup") @TableName("t_ds_alertgroup")
public class AlertGroup { public class AlertGroup {

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java

@ -29,7 +29,7 @@ import java.util.Date;
* command * command
*/ */
@Data @Data
@TableName("t_escheduler_command") @TableName("t_ds_command")
public class Command { public class Command {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java

@ -28,7 +28,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("t_escheduler_datasource") @TableName("t_ds_datasource")
public class DataSource { public class DataSource {
/** /**
* id * id

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java

@ -25,7 +25,7 @@ import java.util.Date;
/** /**
* data source user relation * data source user relation
*/ */
@TableName("t_escheduler_relation_datasource_user") @TableName("t_ds_relation_datasource_user")
public class DatasourceUser { public class DatasourceUser {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java

@ -26,7 +26,7 @@ import java.util.Date;
/** /**
* command * command
*/ */
@TableName("t_escheduler_error_command") @TableName("t_ds_error_command")
public class ErrorCommand { public class ErrorCommand {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java

@ -37,7 +37,7 @@ import java.util.stream.Collectors;
* process definition * process definition
*/ */
@Data @Data
@TableName("t_escheduler_process_definition") @TableName("t_ds_process_definition")
public class ProcessDefinition { public class ProcessDefinition {
/** /**
* id * id

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java

@ -30,7 +30,7 @@ import java.util.Date;
* process instance * process instance
*/ */
@Data @Data
@TableName("t_escheduler_process_instance") @TableName("t_ds_process_instance")
public class ProcessInstance { public class ProcessInstance {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java

@ -25,7 +25,7 @@ import lombok.Data;
* process instance map * process instance map
*/ */
@Data @Data
@TableName("t_escheduler_relation_process_instance") @TableName("t_ds_relation_process_instance")
public class ProcessInstanceMap { public class ProcessInstanceMap {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java

@ -28,7 +28,7 @@ import java.util.Date;
* project * project
*/ */
@Data @Data
@TableName("t_escheduler_project") @TableName("t_ds_project")
public class Project { public class Project {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java

@ -25,7 +25,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("t_escheduler_relation_project_user") @TableName("t_ds_relation_project_user")
public class ProjectUser { public class ProjectUser {
/** /**
* id * id

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java

@ -27,7 +27,7 @@ import java.util.Date;
* queue * queue
*/ */
@Data @Data
@TableName("t_escheduler_queue") @TableName("t_ds_queue")
public class Queue { public class Queue {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java

@ -26,7 +26,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
@Data @Data
@TableName("t_escheduler_resources") @TableName("t_ds_resources")
public class Resource { public class Resource {
/** /**
* id * id

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java

@ -27,7 +27,7 @@ import java.util.Date;
* resource user relation * resource user relation
*/ */
@Data @Data
@TableName("t_escheduler_relation_resources_user") @TableName("t_ds_relation_resources_user")
public class ResourcesUser { public class ResourcesUser {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java

@ -33,7 +33,7 @@ import java.util.Date;
* *
*/ */
@Data @Data
@TableName("t_escheduler_schedules") @TableName("t_ds_schedules")
public class Schedule { public class Schedule {
@TableId(value="id", type=IdType.AUTO) @TableId(value="id", type=IdType.AUTO)

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java

@ -27,7 +27,7 @@ import java.util.Date;
* session * session
*/ */
@Data @Data
@TableName("t_escheduler_session") @TableName("t_ds_session")
public class Session { public class Session {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java

@ -33,7 +33,7 @@ import java.util.Date;
* task instance * task instance
*/ */
@Data @Data
@TableName("t_escheduler_task_instance") @TableName("t_ds_task_instance")
public class TaskInstance { public class TaskInstance {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java

@ -28,7 +28,7 @@ import java.util.Date;
* tenant * tenant
*/ */
@Data @Data
@TableName("t_escheduler_tenant") @TableName("t_ds_tenant")
public class Tenant { public class Tenant {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java

@ -27,7 +27,7 @@ import java.util.Date;
* udf user relation * udf user relation
*/ */
@Data @Data
@TableName("t_escheduler_relation_udfs_user") @TableName("t_ds_relation_udfs_user")
public class UDFUser { public class UDFUser {
/** /**

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java

@ -29,7 +29,7 @@ import java.util.Date;
* udf function * udf function
*/ */
@Data @Data
@TableName("t_escheduler_udfs") @TableName("t_ds_udfs")
public class UdfFunc { public class UdfFunc {
/** /**
* id * id

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java

@ -32,7 +32,7 @@ import java.util.Date;
* user * user
*/ */
@Data @Data
@TableName("t_escheduler_user") @TableName("t_ds_user")
@ApiModel(description = "UserModelDesc") @ApiModel(description = "UserModelDesc")
public class User { public class User {

2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java

@ -28,7 +28,7 @@ import java.util.Date;
* user alert group * user alert group
*/ */
@Data @Data
@TableName("t_escheduler_relation_user_alertgroup") @TableName("t_ds_relation_user_alertgroup")
public class UserAlertGroup { public class UserAlertGroup {
/** /**

2
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 * worker group for task running
*/ */
@Data @Data
@TableName("t_escheduler_worker_group") @TableName("t_ds_worker_group")
public class WorkerGroup { public class WorkerGroup {
@TableId(value="id", type=IdType.AUTO) @TableId(value="id", type=IdType.AUTO)

Loading…
Cancel
Save