From 545f002accb3171727c387dfce5c98e7ca45b13c Mon Sep 17 00:00:00 2001
From: Kaveh Karimi-Asli <4112646+ka7eh@users.noreply.github.com>
Date: Tue, 7 May 2024 18:22:33 +0200
Subject: [PATCH] Update to sqlalchemy2 (#73)

* Update to SQLAlchemy2

* Remove gdal from test requirements
---
 requirements-test.txt                      | 4 ++--
 setup.py                                   | 2 +-
 tests/backends/sqlalchemy/test_evaluate.py | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements-test.txt b/requirements-test.txt
index 826ab62..0371298 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,6 +1,6 @@
 django
 geoalchemy2
-sqlalchemy<2.0.0
+sqlalchemy
 geopandas
 fiona
 pyproj
@@ -9,4 +9,4 @@ pygml
 dateparser
 lark
 elasticsearch
-elasticsearch-dsl
+elasticsearch-dsl
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 47ac4ce..b579d43 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@
     else [],
     extras_require={
         "backend-django": ["django"],
-        "backend-sqlalchemy": ["geoalchemy2", "sqlalchemy<2.0.0"],
+        "backend-sqlalchemy": ["geoalchemy2", "sqlalchemy"],
         "backend-native": ["shapely"],
         "backend-elasticsearch": ["elasticsearch", "elasticsearch-dsl"],
         "fes": ["pygml>=0.2"],
diff --git a/tests/backends/sqlalchemy/test_evaluate.py b/tests/backends/sqlalchemy/test_evaluate.py
index b12e019..b302085 100644
--- a/tests/backends/sqlalchemy/test_evaluate.py
+++ b/tests/backends/sqlalchemy/test_evaluate.py
@@ -130,9 +130,9 @@ def seed_database(db_session):
 
 @pytest.fixture(scope="session")
 def setup_database(connection):
-    connection.execute(select([func.InitSpatialMetaData()]))
-    Base.metadata.bind = connection
-    Base.metadata.create_all()
+    connection.execute(select(func.InitSpatialMetaData()))
+    Base.metadata.create_all(connection)
+    connection.commit()
 
     seed_database(
         scoped_session(sessionmaker(autocommit=False, autoflush=False, bind=connection))
@@ -140,7 +140,7 @@ def setup_database(connection):
 
     yield
 
-    Base.metadata.drop_all()
+    Base.metadata.drop_all(connection)
 
 
 @pytest.fixture