diff --git a/roles/badges/backend/files/datanommer.models__init__.py b/roles/badges/backend/files/datanommer.models__init__.py index 1d9953ec42..3c5f1b2348 100644 --- a/roles/badges/backend/files/datanommer.models__init__.py +++ b/roles/badges/backend/files/datanommer.models__init__.py @@ -39,13 +39,8 @@ from sqlalchemy import ( ) from sqlalchemy.dialects import postgresql from sqlalchemy.exc import IntegrityError -from sqlalchemy.orm import ( - declarative_base, - relationship, - scoped_session, - sessionmaker, - validates, -) +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import relationship, scoped_session, sessionmaker, validates try: @@ -477,7 +472,7 @@ def _setup_hypertable(table_class): event.listen( table_class.__table__, "after_create", - DDL(f"SELECT create_hypertable('{table_class.__tablename__}', 'timestamp');"), + DDL("SELECT create_hypertable('%s', 'timestamp');" % table_class.__tablename__), ) diff --git a/roles/badges/backend/templates/datanommer.py b/roles/badges/backend/templates/datanommer.py index 855f9ab0cb..daf635a159 100644 --- a/roles/badges/backend/templates/datanommer.py +++ b/roles/badges/backend/templates/datanommer.py @@ -1,6 +1,6 @@ config = { {% if env == "staging" %} - 'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer.stg.iad2.fedoraproject.org/datanommer', + 'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer.stg.iad2.fedoraproject.org/datanommer2', {% else %} 'datanommer.sqlalchemy.url': 'postgresql://{{datanommerDBUser}}:{{datanommerDBPassword}}@db-datanommer/datanommer', {% endif %}