[main] Disable resetting main DB attributes (#6845)

This commit is contained in:
John Bodley 2019-02-13 16:41:16 -08:00 committed by GitHub
parent 103a97f87d
commit 60d5f89faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View File

@ -865,10 +865,12 @@ def get_or_create_main_db():
logging.info('Creating database reference')
dbobj = get_main_database(db.session)
if not dbobj:
dbobj = models.Database(database_name='main')
dbobj = models.Database(
database_name='main',
allow_csv_upload=True,
expose_in_sqllab=True,
)
dbobj.set_sqlalchemy_uri(conf.get('SQLALCHEMY_DATABASE_URI'))
dbobj.expose_in_sqllab = True
dbobj.allow_csv_upload = True
db.session.add(dbobj)
db.session.commit()
return dbobj

View File

@ -646,15 +646,14 @@ class CoreTests(SupersetTestCase):
main_db_uri = (
db.session.query(models.Database)
.filter_by(database_name='main')
.all()
.one()
)
test_file = open(filename, 'rb')
form_data = {
'csv_file': test_file,
'sep': ',',
'name': table_name,
'con': main_db_uri[0].id,
'con': main_db_uri.id,
'if_exists': 'append',
'index_label': 'test_label',
'mangle_dupe_cols': False,