hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-15 22:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

move large_prefix_check to previous mysql if

Browse Source
This commit is contained in:
Chico Venancio
2018-05-06 04:29:37 +00:00
parent c553f82580
commit 1549af6f56
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jupyterhub/orm.py
View File

@@ -651,6 +651,8 @@ def new_session_factory(url="sqlite:///:memory:",
elif url.startswith('mysql'): elif url.startswith('mysql'):
kwargs.setdefault('pool_recycle', 60) kwargs.setdefault('pool_recycle', 60)
if mysql_large_prefix_check(engine): # if mysql is allows large indexes
add_row_format(Base) # set format on the tables
if url.endswith(':memory:'): if url.endswith(':memory:'):
# If we're using an in-memory database, ensure that only one connection # If we're using an in-memory database, ensure that only one connection
@@ -664,8 +666,6 @@ def new_session_factory(url="sqlite:///:memory:",
# check the db revision (will raise, pointing to `upgrade-db` if version doesn't match) # check the db revision (will raise, pointing to `upgrade-db` if version doesn't match)
check_db_revision(engine) check_db_revision(engine)
if mysql_large_prefix_check(engine): # if mysql is allows large indexes
add_row_format(Base) # set format on the tables
Base.metadata.create_all(engine) Base.metadata.create_all(engine)
# We set expire_on_commit=False, since we don't actually need # We set expire_on_commit=False, since we don't actually need