From 663167359693331941a0a510a17a88c70185a310 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Thu, 30 Mar 2023 21:26:07 +0200
Subject: Migrate to SQLAlchemy 2.0

This needs very few changes:
 - Use declarative_base from sqlalchemy.orm instead of ext [1]
 - Enable the future flag on both engine and session

[1] https://docs.sqlalchemy.org/en/20/errors.html#error-b8d9
---
 quarg/database/tables.py | 3 +--
 quarg/main.py            | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'quarg')

diff --git a/quarg/database/tables.py b/quarg/database/tables.py
index 0b14eca..c71cedd 100644
--- a/quarg/database/tables.py
+++ b/quarg/database/tables.py
@@ -1,7 +1,6 @@
 import datetime
 
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import declarative_base, relationship
 from sqlalchemy.schema import Column, ForeignKey
 from sqlalchemy.types import (
     BigInteger,
diff --git a/quarg/main.py b/quarg/main.py
index 7deb900..a182578 100644
--- a/quarg/main.py
+++ b/quarg/main.py
@@ -126,8 +126,8 @@ def main():
     if not config.has_option('Database', 'url'):
         errx('No database URL set in config file.')
 
-    engine = create_engine(config.get('Database', 'url'), echo=args.debug)
-    session = Session(bind=engine)
+    engine = create_engine(config.get('Database', 'url'), echo=args.debug, future=True)
+    session = Session(bind=engine, future=True)
 
     predicates = list(collect_predicates(args))
 
-- 
cgit v1.2.3-2-gb3c3