From: Sandro Tosi <sandrotosi@users.noreply.github.com>
Date: Mon, 23 Oct 2023 11:22:10 +0000 (-0400)
Subject: ⬆️ Upgrade support for SQLAlchemy 1.4.49, update tests (#519)
X-Git-Tag: 0.0.9~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1cf6134617cc374fa3aee2b374dc1387c9bc868;p=thirdparty%2Ffastapi%2Fsqlmodel.git

⬆️ Upgrade support for SQLAlchemy 1.4.49, update tests (#519)

Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---

diff --git a/pyproject.toml b/pyproject.toml
index cd59bd4c..94fe55d2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,7 +31,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-SQLAlchemy = ">=1.4.29,<=1.4.41"
+SQLAlchemy = ">=1.4.29,<2.0.0"
 pydantic = "^1.8.2"
 sqlalchemy2-stubs = {version = "*", allow-prereleases = true}
 
diff --git a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py
index 8ad038f9..8d99cf9f 100644
--- a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py
+++ b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py
@@ -172,8 +172,18 @@ def test_tutorial(clear_sqlmodel):
     insp: Inspector = inspect(mod.engine)
     indexes = insp.get_indexes(str(mod.Hero.__tablename__))
     expected_indexes = [
-        {"name": "ix_hero_name", "column_names": ["name"], "unique": 0},
-        {"name": "ix_hero_age", "column_names": ["age"], "unique": 0},
+        {
+            "name": "ix_hero_name",
+            "dialect_options": {},
+            "column_names": ["name"],
+            "unique": 0,
+        },
+        {
+            "name": "ix_hero_age",
+            "dialect_options": {},
+            "column_names": ["age"],
+            "unique": 0,
+        },
     ]
     for index in expected_indexes:
         assert index in indexes, "This expected index should be in the indexes in DB"
diff --git a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py
index 9fd32823..94a41b30 100644
--- a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py
+++ b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py
@@ -172,8 +172,18 @@ def test_tutorial(clear_sqlmodel):
     insp: Inspector = inspect(mod.engine)
     indexes = insp.get_indexes(str(mod.Hero.__tablename__))
     expected_indexes = [
-        {"name": "ix_hero_age", "column_names": ["age"], "unique": 0},
-        {"name": "ix_hero_name", "column_names": ["name"], "unique": 0},
+        {
+            "name": "ix_hero_age",
+            "dialect_options": {},
+            "column_names": ["age"],
+            "unique": 0,
+        },
+        {
+            "name": "ix_hero_name",
+            "dialect_options": {},
+            "column_names": ["name"],
+            "unique": 0,
+        },
     ]
     for index in expected_indexes:
         assert index in indexes, "This expected index should be in the indexes in DB"
diff --git a/tests/test_tutorial/test_indexes/test_tutorial001.py b/tests/test_tutorial/test_indexes/test_tutorial001.py
index 59620773..f33db5bc 100644
--- a/tests/test_tutorial/test_indexes/test_tutorial001.py
+++ b/tests/test_tutorial/test_indexes/test_tutorial001.py
@@ -25,8 +25,18 @@ def test_tutorial(clear_sqlmodel):
     insp: Inspector = inspect(mod.engine)
     indexes = insp.get_indexes(str(mod.Hero.__tablename__))
     expected_indexes = [
-        {"name": "ix_hero_name", "column_names": ["name"], "unique": 0},
-        {"name": "ix_hero_age", "column_names": ["age"], "unique": 0},
+        {
+            "name": "ix_hero_name",
+            "dialect_options": {},
+            "column_names": ["name"],
+            "unique": 0,
+        },
+        {
+            "name": "ix_hero_age",
+            "dialect_options": {},
+            "column_names": ["age"],
+            "unique": 0,
+        },
     ]
     for index in expected_indexes:
         assert index in indexes, "This expected index should be in the indexes in DB"
diff --git a/tests/test_tutorial/test_indexes/test_tutorial006.py b/tests/test_tutorial/test_indexes/test_tutorial006.py
index e26f8b2e..893043da 100644
--- a/tests/test_tutorial/test_indexes/test_tutorial006.py
+++ b/tests/test_tutorial/test_indexes/test_tutorial006.py
@@ -26,8 +26,18 @@ def test_tutorial(clear_sqlmodel):
     insp: Inspector = inspect(mod.engine)
     indexes = insp.get_indexes(str(mod.Hero.__tablename__))
     expected_indexes = [
-        {"name": "ix_hero_name", "column_names": ["name"], "unique": 0},
-        {"name": "ix_hero_age", "column_names": ["age"], "unique": 0},
+        {
+            "name": "ix_hero_name",
+            "dialect_options": {},
+            "column_names": ["name"],
+            "unique": 0,
+        },
+        {
+            "name": "ix_hero_age",
+            "dialect_options": {},
+            "column_names": ["age"],
+            "unique": 0,
+        },
     ]
     for index in expected_indexes:
         assert index in indexes, "This expected index should be in the indexes in DB"