Revert "[fix] make datasource names non-nullable (#8332)" (#8363)

This reverts commit 65a05ca47e.
This commit is contained in:
serenajiang
2019-10-09 11:38:57 -07:00
committed by Erik Ritter
parent 8b85a8f398
commit 7e7ea3d9a0
9 changed files with 14 additions and 77 deletions

View File

@@ -723,7 +723,7 @@ class Database(Model, AuditMixinNullable, ImportMixin):
id = Column(Integer, primary_key=True)
verbose_name = Column(String(250), unique=True)
# short unique name, used in permissions
database_name = Column(String(250), unique=True, nullable=False)
database_name = Column(String(250), unique=True)
sqlalchemy_uri = Column(String(1024))
password = Column(EncryptedType(String(1024), config.get("SECRET_KEY")))
cache_timeout = Column(Integer)
@@ -763,7 +763,7 @@ class Database(Model, AuditMixinNullable, ImportMixin):
export_children = ["tables"]
def __repr__(self):
return self.name
return self.verbose_name if self.verbose_name else self.database_name
@property
def name(self):