Migrate to v2 api

Author: jkimbo

fastapi-sqlalchemy/alembic/versions/bea5e58f3328_add_data.py

@@ -9,7 +9,8 @@
 from pathlib import Path
 
 from alembic import op
-from sqlalchemy import orm
+from sqlalchemy import orm, select
+from sqlalchemy.exc import NoResultFound
 
 from main.models import Director, Movie
 
@@ -33,12 +34,11 @@ def upgrade():
         json_data = json.load(f)
 
     for movie_data in json_data:
-        director = (
-            session.query(Director)
-            .filter_by(name=movie_data["director"]["name"])
-            .first()
-        )
-        if not director:
+        try:
+            director = session.execute(
+                select(Director).filter_by(name=movie_data["director"]["name"])
+            ).scalar_one()
+        except NoResultFound:
             director = Director(name=movie_data["director"]["name"])
             session.add(director)
             session.commit()
@@ -57,4 +57,10 @@ def upgrade():
 
 
 def downgrade():
-    pass
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    session.execute("DELETE FROM movies")
+    session.execute("DELETE FROM directors")
+    session.commit()
+    session.close()

fastapi-sqlalchemy/main/database.py

@@ -6,8 +6,8 @@
 SQLALCHEMY_DATABASE_URL = "sqlite:///./db.sqlite3"
 
 engine = create_engine(
-    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
+    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}, future=True
 )
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine, future=True)
 
 Base = declarative_base()

fastapi-sqlalchemy/main/models.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, String, Float, ForeignKey
+from sqlalchemy import Column, Integer, String, Float, ForeignKey, select
 from sqlalchemy.orm import relationship, joinedload
 from sqlalchemy.orm import Session
 
@@ -28,10 +28,12 @@ class Movie(Base):
 
 
 def get_movies(db: Session, limit: int = 250):
-    return (
-        db.query(Movie)
+    query = (
+        select(Movie)
         .options(joinedload(Movie.director))
         .order_by(Movie.imdb_rating.desc())
         .limit(limit)
-        .all()
     )
+
+    result = db.execute(query).unique()
+    return result.scalars()