[fix] make names non-nullable (#8371)

This commit is contained in:
serenajiang
2019-10-15 16:51:04 -07:00
committed by John Bodley
parent fcb39f9091
commit 876d329474
10 changed files with 174 additions and 17 deletions

View File

@@ -125,6 +125,13 @@ class DruidTests(SupersetTestCase):
.first()
)
if cluster:
for datasource in (
db.session.query(DruidDatasource)
.filter_by(cluster_name=cluster.cluster_name)
.all()
):
db.session.delete(datasource)
db.session.delete(cluster)
db.session.commit()
@@ -297,13 +304,17 @@ class DruidTests(SupersetTestCase):
db.session.merge(cluster)
gamma_ds = self.get_or_create(
DruidDatasource, {"datasource_name": "datasource_for_gamma"}, db.session
DruidDatasource,
{"datasource_name": "datasource_for_gamma", "cluster": cluster},
db.session,
)
gamma_ds.cluster = cluster
db.session.merge(gamma_ds)
no_gamma_ds = self.get_or_create(
DruidDatasource, {"datasource_name": "datasource_not_for_gamma"}, db.session
DruidDatasource,
{"datasource_name": "datasource_not_for_gamma", "cluster": cluster},
db.session,
)
no_gamma_ds.cluster = cluster
db.session.merge(no_gamma_ds)
@@ -340,6 +351,13 @@ class DruidTests(SupersetTestCase):
.first()
)
if cluster:
for datasource in (
db.session.query(DruidDatasource)
.filter_by(cluster_name=cluster.cluster_name)
.all()
):
db.session.delete(datasource)
db.session.delete(cluster)
db.session.commit()