diff --git a/CHANGES.md b/CHANGES.md index 868dc6bb..30a8bc4c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +# 2023-12-08 (5.19.2) + +* Bugfix: Used pyscopg.sql instead of psycopg2.sql for compatability + # 2023-12-05 (5.19.1) * Updated Django version > 4.2 diff --git a/setup.cfg b/setup.cfg index 382dae41..f604dd52 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = amsterdam-schema-tools -version = 5.19.1 +version = 5.19.2 url = https://github.com/amsterdam/schema-tools license = Mozilla Public 2.0 author = Team Data Diensten, van het Dataplatform onder de Directie Digitale Voorzieningen (Gemeente Amsterdam) @@ -29,6 +29,7 @@ install_requires = sqlalchemy >= 1.4, < 2.0 geoalchemy2 psycopg2 + psycopg pg-grant click deepdiff diff --git a/src/schematools/contrib/django/management/commands/create_views.py b/src/schematools/contrib/django/management/commands/create_views.py index c5bb26bf..f641812b 100644 --- a/src/schematools/contrib/django/management/commands/create_views.py +++ b/src/schematools/contrib/django/management/commands/create_views.py @@ -2,7 +2,7 @@ from django.core.management import BaseCommand, CommandError from django.db import DatabaseError, connection, transaction -from psycopg2 import sql +from psycopg import sql from schematools.contrib.django.models import Dataset, DatasetTableSchema from schematools.naming import to_snake_case @@ -96,18 +96,18 @@ def _clean_sql(sql) -> str: return sql -def _create_role_if_not_exists(cursor, role_name): - # Create the role if it doesn't exist +def _create_role_if_not_exists(cursor, user_role_name): + """ Create the role if it doesn't exist """ cursor.execute( sql.SQL("SELECT 1 FROM pg_roles WHERE rolname={role_name}").format( - role_name=sql.Literal(role_name) + role_name=sql.Literal(user_role_name) ) ) role_exists = cursor.fetchone() if not role_exists: cursor.execute( - sql.SQL("CREATE ROLE {role_name}").format(role_name=sql.Identifier(role_name)) + sql.SQL("CREATE ROLE {role_name}").format(role_name=sql.Identifier(user_role_name)) ) diff --git a/src/schematools/contrib/django/management/commands/remove_schemas.py b/src/schematools/contrib/django/management/commands/remove_schemas.py index 3da4b40c..b8a725d1 100644 --- a/src/schematools/contrib/django/management/commands/remove_schemas.py +++ b/src/schematools/contrib/django/management/commands/remove_schemas.py @@ -3,7 +3,7 @@ from django.core.management import BaseCommand, CommandError from django.db import connection from django.db.utils import ProgrammingError -from psycopg2 import sql +from psycopg import sql from schematools.contrib.django.models import Dataset, DatasetTable from schematools.naming import to_snake_case