From f512e3c31f4850c7272e868b291193a58c661d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=B6=E5=90=8D?= <13774486042@163.com> Date: Thu, 16 Jun 2022 09:39:53 +0800 Subject: [PATCH] [fix][python] Correct variable type of SQL type (#10464) --- .../src/pydolphinscheduler/tasks/sql.py | 8 ++++---- .../pydolphinscheduler/tests/tasks/test_sql.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/tasks/sql.py b/dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/tasks/sql.py index c15170c44..a1259824f 100644 --- a/dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/tasks/sql.py +++ b/dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/tasks/sql.py @@ -31,8 +31,8 @@ log = logging.getLogger(__file__) class SqlType: """SQL type, for now it just contain `SELECT` and `NO_SELECT`.""" - SELECT = 0 - NOT_SELECT = 1 + SELECT = "0" + NOT_SELECT = "1" class Sql(Task): @@ -64,7 +64,7 @@ class Sql(Task): name: str, datasource_name: str, sql: str, - sql_type: Optional[int] = None, + sql_type: Optional[str] = None, pre_statements: Optional[str] = None, post_statements: Optional[str] = None, display_rows: Optional[int] = 10, @@ -80,7 +80,7 @@ class Sql(Task): self.display_rows = display_rows @property - def sql_type(self) -> int: + def sql_type(self) -> str: """Judgement sql type, it will return the SQL type for type `SELECT` or `NOT_SELECT`. If `param_sql_type` dot not specific, will use regexp to check diff --git a/dolphinscheduler-python/pydolphinscheduler/tests/tasks/test_sql.py b/dolphinscheduler-python/pydolphinscheduler/tests/tasks/test_sql.py index 74ac0f67e..ee0acc442 100644 --- a/dolphinscheduler-python/pydolphinscheduler/tests/tasks/test_sql.py +++ b/dolphinscheduler-python/pydolphinscheduler/tests/tasks/test_sql.py @@ -89,7 +89,7 @@ def test_get_sql_type( "sql": "select 1", "type": "MYSQL", "datasource": 1, - "sqlType": SqlType.SELECT, + "sqlType": "0", "preStatements": [], "postStatements": [], "displayRows": 10, @@ -138,7 +138,7 @@ def test_sql_get_define(mock_datasource): "type": "MYSQL", "datasource": 1, "sql": command, - "sqlType": SqlType.SELECT, + "sqlType": "0", "displayRows": 10, "preStatements": [], "postStatements": [], -- GitLab