Fix SQLAlchemy version compatibility to support both 1.4.x and 2.x

Co-authored-by: nomeguy <85475922+nomeguy@users.noreply.github.com>

Author: Copilot

casbin_databases_adapter.egg-info/requires.txt

@@ -1,3 +1,3 @@
-SQLAlchemy==1.4.42
+SQLAlchemy>=1.4.42
 asynccasbin==1.1.7
-databases==0.7.0
+databases>=0.7.0

casbin_databases_adapter/adapter.py

@@ -29,7 +29,7 @@ async def load_policy(self, model: Model):
         for row in rows:
             # convert row from tuple to csv format and removing the first column (id)
             line = [
-                v for k, v in row._mapping.items() if k in self.cols and v is not None
+                v for k, v in dict(row._mapping).items() if k in self.cols and v is not None
             ]
             persist.load_policy_line(", ".join(line), model)
 
@@ -84,7 +84,7 @@ async def load_filtered_policy(self, model: Model, filter_: Filter) -> None:
         for row in rows:
             # convert row from tuple to csv format and removing the first column (id)
             line = [
-                v for k, v in row._mapping.items() if k in self.cols and v is not None
+                v for k, v in dict(row._mapping).items() if k in self.cols and v is not None
             ]
             persist.load_policy_line(", ".join(line), model)
 

requirements-test.txt

@@ -1,6 +1,6 @@
 asynccasbin==1.1.7
-databases==0.7.0
-SQLAlchemy==1.4.42
+databases>=0.7.0
+SQLAlchemy>=1.4.42
 pytest>=7.3.0
 pytest-asyncio>=1.1.0
 aiosqlite>=0.19.0

requirements.txt

@@ -1,3 +1,3 @@
 asynccasbin==1.1.7
-databases==0.7.0
-SQLAlchemy==1.4.42
+databases>=0.7.0
+SQLAlchemy>=1.4.42