fix(sql-alchemy): update deprecated functions (#25)

* fix(sql-alchemy): update deprecated functions

* fix: version and lint

---------

Co-authored-by: Guillaume Fregosi <[email protected]>
Co-authored-by: Maxime Leroy <[email protected]>

Author: fregogui

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v4.3.3 (2023-07-13)
+### Fixes
+  - sql-alchemy: update deprecated functions
+
 ## v4.3.2 (2023-05-11)
 ### Fixes
   - Do not log almbic migrations log in clear

README.md

@@ -75,7 +75,7 @@ The state diagram of your application while upgrading using Helm and using Chart
           ...
           with context.begin_transaction():
             if patroni_postgresql:
-              context.execute("SET ROLE wiremind_owner")
+              context.execute(text("SET ROLE wiremind_owner"))
             context.run_migrations()
        ...
       ```

VERSION

@@ -1 +1 @@
-4.3.2
+4.3.3

example/alembic/env.py

@@ -1,6 +1,6 @@
 from logging.config import fileConfig
 
-from sqlalchemy import engine_from_config, pool
+from sqlalchemy import engine_from_config, pool, text
 
 from alembic import context
 
@@ -69,7 +69,7 @@ def run_migrations_online() -> None:
             # The default privileges are set according to this user
             # See: https://github.com/zalando/postgres-operator/issues/1170
             if patroni_postgresql:
-                context.execute("SET ROLE wiremind_owner")
+                context.execute(text("SET ROLE wiremind_owner"))
             context.run_migrations()
 
 

pyproject.toml

@@ -1,3 +1,6 @@
 [tool.black]
 line-length = 120
 target-version = ['py37']
+
+[tool.isort]
+line_length = 120

src/chartreuse/tests/e2e_tests/conftest.py

@@ -4,14 +4,16 @@
 import time
 from typing import Generator
 
-import chartreuse
 import pytest
 import sqlalchemy
+from sqlalchemy import inspect
 from wiremind_kubernetes.kube_config import load_kubernetes_config
 from wiremind_kubernetes.kubernetes_helper import KubernetesDeploymentManager
 from wiremind_kubernetes.tests.e2e_tests.conftest import create_namespace, setUpE2E  # noqa: F401
 from wiremind_kubernetes.utils import run_command
 
+import chartreuse
+
 TEST_NAMESPACE = "chartreuse-e2e-test"
 TEST_RELEASE = "e2e-test-release"
 
@@ -107,11 +109,11 @@ def populate_cluster_with_chartreuse_pre_upgrade() -> Generator:
 
 
 def assert_sql_upgraded() -> None:
-    assert sqlalchemy.create_engine(POSTGRESQL_URL).table_names() == ["alembic_version", "upgraded"]
+    assert inspect(sqlalchemy.create_engine(POSTGRESQL_URL)).get_table_names() == ["alembic_version", "upgraded"]
 
 
 def assert_sql_not_upgraded() -> None:
-    assert not sqlalchemy.create_engine(POSTGRESQL_URL).table_names() == ["alembic_version", "upgraded"]
+    assert not inspect(sqlalchemy.create_engine(POSTGRESQL_URL)).get_table_names() == ["alembic_version", "upgraded"]
 
 
 def are_pods_scaled_down() -> bool:

src/chartreuse/tests/unit_tests/test_alembic.py

@@ -1,6 +1,7 @@
-import chartreuse.utils
 from pytest_mock.plugin import MockerFixture
 
+import chartreuse.utils
+
 
 def test_respect_empty_database(mocker: MockerFixture) -> None:
     """

src/chartreuse/tests/unit_tests/test_chartreuse_upgrade.py

@@ -1,10 +1,11 @@
 from typing import Optional
 
-import chartreuse.chartreuse_upgrade
 import pytest
-from chartreuse import get_version
 from pytest_mock.plugin import MockerFixture
 
+import chartreuse.chartreuse_upgrade
+from chartreuse import get_version
+
 from ..conftest import configure_os_environ_mock
 from .conftest import configure_chartreuse_mock
 

src/chartreuse/utils/alembic_migration_helper.py

@@ -6,6 +6,7 @@
 from typing import List
 
 import sqlalchemy
+from sqlalchemy import inspect, text
 from sqlalchemy.pool import NullPool
 from wiremind_kubernetes.utils import run_command
 
@@ -46,7 +47,9 @@ def __init__(
     def _configure(self) -> None:
         with open("%s/%s" % (self.alembic_directory_path, self.alembic_config_file_path), "r") as f:
             content = f.read()
-            content_new = re.sub("(sqlalchemy.url.*=.*){1}", r"sqlalchemy.url=%s" % self.database_url, content, flags=re.M)
+            content_new = re.sub(
+                "(sqlalchemy.url.*=.*){1}", r"sqlalchemy.url=%s" % self.database_url, content, flags=re.M
+            )
         if content != content_new:
             with open("%s/%s" % (self.alembic_directory_path, self.alembic_config_file_path), "w") as f:
                 f.write(content_new)
@@ -79,7 +82,7 @@ def _wait_postgres_is_configured(self) -> None:
                 with engine.connect() as connection:
                     transac = connection.begin()
                     # TODO: Use scalar_one() once sqlachemly >= 1.4
-                    _id = connection.execute(";".join(default_privileges_checks)).scalar()
+                    _id = connection.execute(text(";".join(default_privileges_checks))).scalar()
                     assert _id == 1
                     transac.rollback()
                 logger.info(
@@ -101,7 +104,7 @@ def _wait_postgres_is_configured(self) -> None:
         )
 
     def _get_table_list(self) -> List[str]:
-        return sqlalchemy.create_engine(self.database_url).table_names()
+        return inspect(sqlalchemy.create_engine(self.database_url)).get_table_names()
 
     def is_postgres_empty(self) -> bool:
         table_list = self._get_table_list()