IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update SQLAlchemy, Flask, Flask-SQLAlchemy, and other packages to current versions. #5901

Browse Source 
- Update Flask, Flask-SQLAlchemy, Flask-Babel, Flask-Security-Too, Flask-SocketIO, pytz, psutil, SQLAlchemy, bcrypt, cryptography, eventlet, Authlib, requests python packages
- Remove pinned dnspython, Werkzeug packages from requirements.txt
This commit is contained in:
Aditya Toshniwal
2023-03-15 11:57:16 +05:30
committed by GitHub
parent 294282c7ca
commit 292d76b39e
21 changed files with 176 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
web/pgadmin/__init__.py
View File

@@ -299,9 +299,6 @@ def create_app(app_name=None):
# Initialise i18n
babel = Babel(app)
app.logger.debug('Available translations: %s' % babel.list_translations())
@babel.localeselector
def get_locale():
"""Get the language for the user."""
language = 'en'
@@ -335,6 +332,7 @@ def create_app(app_name=None):
return language
babel.init_app(app, locale_selector=get_locale)
##########################################################################
# Setup authentication
##########################################################################
@@ -456,21 +454,18 @@ def create_app(app_name=None):
# Run migration for the first time i.e. create database
# If version not available, user must have aborted. Tables are not
# created and so its an empty db
try:
if get_version() == -1:
db_upgrade(app)
else:
schema_version = get_version()
if get_version() == -1:
db_upgrade(app)
else:
schema_version = get_version()
# Run migration if current schema version is greater than
# the schema version stored in version table.
if CURRENT_SCHEMA_VERSION > schema_version:
db_upgrade(app)
# Update schema version to the latest
set_version(CURRENT_SCHEMA_VERSION)
db.session.commit()
except Exception as e:
app.logger.error(e)
# Run migration if current schema version is greater than
# the schema version stored in version table.
if CURRENT_SCHEMA_VERSION > schema_version:
db_upgrade(app)
# Update schema version to the latest
set_version(CURRENT_SCHEMA_VERSION)
db.session.commit()
# Run the migration as per specified by the user.
if config.CONFIG_DATABASE_URI is not None and \
@@ -719,7 +714,9 @@ def create_app(app_name=None):
svr_superuser, svr_port, svr_discovery_id,
svr_comment)
except Exception:
except Exception as e:
print(str(e))
db.session.rollback()
pass
@user_logged_in.connect_via(app)