This is an automated email from the ASF dual-hosted git repository.
lyndsi pushed a commit to branch lyndsi-fix-refetch-async-queries
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to
refs/heads/lyndsi-fix-refetch-async-queries by this push:
new 2f4bb0e3a1 Fix unintentional merge changes
2f4bb0e3a1 is described below
commit 2f4bb0e3a1938d4fc72ff65b824629f363773187
Author: lyndsiWilliams <[email protected]>
AuthorDate: Tue Oct 4 16:22:38 2022 -0500
Fix unintentional merge changes
---
superset/databases/commands/validate.py | 12 ------------
superset/db_engine_specs/gsheets.py | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/superset/databases/commands/validate.py
b/superset/databases/commands/validate.py
index 853e813cc6..3921a02ab4 100644
--- a/superset/databases/commands/validate.py
+++ b/superset/databases/commands/validate.py
@@ -16,14 +16,12 @@
# under the License.
import json
from contextlib import closing
-from symbol import parameters
from typing import Any, Dict, Optional
from flask_babel import gettext as __
from superset.commands.base import BaseCommand
from superset.databases.commands.exceptions import (
- DatabaseExtraJSONValidationError,
DatabaseOfflineError,
DatabaseTestConnectionFailedError,
InvalidEngineError,
@@ -39,15 +37,6 @@ from superset.models.core import Database
BYPASS_VALIDATION_ENGINES = {"bigquery"}
-def get_engine_parameters(properties: Dict[str, Any]) -> Dict[str, Any]:
- try:
- if properties.get("extra"):
- return json.loads(properties["extra"]).get("engine_params", {})
- return {}
- except:
- raise DatabaseExtraJSONValidationError("Unable to parse extra_json
data")
-
-
class ValidateDatabaseParametersCommand(BaseCommand):
def __init__(self, properties: Dict[str, Any]):
self._properties = properties.copy()
@@ -98,7 +87,6 @@ class ValidateDatabaseParametersCommand(BaseCommand):
# try to connect
sqlalchemy_uri = engine_spec.build_sqlalchemy_uri( # type: ignore
- parameters,
encrypted_extra,
)
if self._model and sqlalchemy_uri == self._model.safe_sqlalchemy_uri():
diff --git a/superset/db_engine_specs/gsheets.py
b/superset/db_engine_specs/gsheets.py
index 2360361c9b..78b42d2b3a 100644
--- a/superset/db_engine_specs/gsheets.py
+++ b/superset/db_engine_specs/gsheets.py
@@ -251,6 +251,7 @@ class GSheetsEngineSpec(SqliteEngineSpec):
conn = engine.connect()
idx = 0
for name, url in table_catalog.items():
+
if not name:
errors.append(
SupersetError(
