Upgrade to SQLAlchemy 2.1 syntax and API

Author: khteh

library.sql

@@ -2,8 +2,10 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.4 (Debian 17.4-1.pgdg120+2)
--- Dumped by pg_dump version 17.0 (Ubuntu 17.0-1.pgdg24.04+1)
+\restrict 6N1gfbETXMlbXbp5vnhqyja28IXXRcJlY8xyIrdicRKNiHx7Nukx5LY6PHCRWxl
+
+-- Dumped from database version 18.0 (Debian 18.0-1.pgdg13+3)
+-- Dumped by pg_dump version 18.1 (Ubuntu 18.1-1.pgdg25.10+2)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -42,8 +44,8 @@ CREATE TABLE public.authors (
     lastname character varying(128) NOT NULL,
     email character varying(255) NOT NULL,
     phone character varying(15),
-    created_at timestamp with time zone NOT NULL,
-    modified_at timestamp with time zone NOT NULL
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    modified_at timestamp with time zone DEFAULT now() NOT NULL
 );
 
 
@@ -53,14 +55,22 @@ ALTER TABLE public.authors OWNER TO guest;
 -- Name: authors_id_seq; Type: SEQUENCE; Schema: public; Owner: guest
 --
 
-ALTER TABLE public.authors ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.authors_id_seq
+CREATE SEQUENCE public.authors_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
-    CACHE 1
-);
+    CACHE 1;
+
+
+ALTER SEQUENCE public.authors_id_seq OWNER TO guest;
+
+--
+-- Name: authors_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: guest
+--
+
+ALTER SEQUENCE public.authors_id_seq OWNED BY public.authors.id;
 
 
 --
@@ -72,9 +82,9 @@ CREATE TABLE public.books (
     title character varying(128) NOT NULL,
     isbn character varying(255) NOT NULL,
     page_count integer NOT NULL,
-    created_at timestamp with time zone NOT NULL,
-    modified_at timestamp with time zone NOT NULL,
-    author_id integer NOT NULL
+    author_id integer NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    modified_at timestamp with time zone DEFAULT now() NOT NULL
 );
 
 
@@ -84,14 +94,22 @@ ALTER TABLE public.books OWNER TO guest;
 -- Name: books_id_seq; Type: SEQUENCE; Schema: public; Owner: guest
 --
 
-ALTER TABLE public.books ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.books_id_seq
+CREATE SEQUENCE public.books_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
-    CACHE 1
-);
+    CACHE 1;
+
+
+ALTER SEQUENCE public.books_id_seq OWNER TO guest;
+
+--
+-- Name: books_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: guest
+--
+
+ALTER SEQUENCE public.books_id_seq OWNED BY public.books.id;
 
 
 --
@@ -106,8 +124,8 @@ CREATE TABLE public.users (
     phone character varying(15),
     password character varying(128),
     lastlogin timestamp with time zone,
-    created_at timestamp with time zone NOT NULL,
-    modified_at timestamp with time zone NOT NULL
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    modified_at timestamp with time zone DEFAULT now() NOT NULL
 );
 
 
@@ -117,22 +135,51 @@ ALTER TABLE public.users OWNER TO guest;
 -- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: guest
 --
 
-ALTER TABLE public.users ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.users_id_seq
+CREATE SEQUENCE public.users_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
-    CACHE 1
-);
+    CACHE 1;
+
+
+ALTER SEQUENCE public.users_id_seq OWNER TO guest;
+
+--
+-- Name: users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: guest
+--
+
+ALTER SEQUENCE public.users_id_seq OWNED BY public.users.id;
+
+
+--
+-- Name: authors id; Type: DEFAULT; Schema: public; Owner: guest
+--
+
+ALTER TABLE ONLY public.authors ALTER COLUMN id SET DEFAULT nextval('public.authors_id_seq'::regclass);
+
+
+--
+-- Name: books id; Type: DEFAULT; Schema: public; Owner: guest
+--
+
+ALTER TABLE ONLY public.books ALTER COLUMN id SET DEFAULT nextval('public.books_id_seq'::regclass);
+
+
+--
+-- Name: users id; Type: DEFAULT; Schema: public; Owner: guest
+--
+
+ALTER TABLE ONLY public.users ALTER COLUMN id SET DEFAULT nextval('public.users_id_seq'::regclass);
 
 
 --
 -- Data for Name: alembic_version; Type: TABLE DATA; Schema: public; Owner: guest
 --
 
 COPY public.alembic_version (version_num) FROM stdin;
-8813faeb5825
+84f8ba08e237
 \.
 
 
@@ -141,14 +188,16 @@ COPY public.alembic_version (version_num) FROM stdin;
 --
 
 COPY public.authors (id, firstname, lastname, email, phone, created_at, modified_at) FROM stdin;
+1	JK	Rowing	jk@rowing.com	+49123456789	2026-01-30 14:45:21.230749+00	2026-01-30 14:45:21.230749+00
 \.
 
 
 --
 -- Data for Name: books; Type: TABLE DATA; Schema: public; Owner: guest
 --
 
-COPY public.books (id, title, isbn, page_count, created_at, modified_at, author_id) FROM stdin;
+COPY public.books (id, title, isbn, page_count, author_id, created_at, modified_at) FROM stdin;
+1	Harry Porter	978-0-596-52068-7	123	1	2026-01-30 14:46:48.081686+00	2026-01-30 14:46:48.081686+00
 \.
 
 
@@ -157,28 +206,29 @@ COPY public.books (id, title, isbn, page_count, created_at, modified_at, author_
 --
 
 COPY public.users (id, firstname, lastname, email, phone, password, lastlogin, created_at, modified_at) FROM stdin;
+1	Kok How	Teh	khteh@email.com	\N	$2b$10$3zixeio4.1.OU.5OgdXLvuCbwk40ZyyWxD7xtlL1Joil04dSC/lHK	\N	2026-01-30 14:44:45.219441+00	2026-01-30 14:44:45.219441+00
 \.
 
 
 --
 -- Name: authors_id_seq; Type: SEQUENCE SET; Schema: public; Owner: guest
 --
 
-SELECT pg_catalog.setval('public.authors_id_seq', 1, false);
+SELECT pg_catalog.setval('public.authors_id_seq', 1, true);
 
 
 --
 -- Name: books_id_seq; Type: SEQUENCE SET; Schema: public; Owner: guest
 --
 
-SELECT pg_catalog.setval('public.books_id_seq', 1, false);
+SELECT pg_catalog.setval('public.books_id_seq', 1, true);
 
 
 --
 -- Name: users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: guest
 --
 
-SELECT pg_catalog.setval('public.users_id_seq', 1, false);
+SELECT pg_catalog.setval('public.users_id_seq', 1, true);
 
 
 --
@@ -253,3 +303,5 @@ ALTER TABLE ONLY public.books
 -- PostgreSQL database dump complete
 --
 
+\unrestrict 6N1gfbETXMlbXbp5vnhqyja28IXXRcJlY8xyIrdicRKNiHx7Nukx5LY6PHCRWxl
+

migrations/env.py

@@ -21,16 +21,13 @@
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-from src.models.base import Base
 from src.models.AuthorModel import AuthorModel
 from src.models.BookModel import BookModel
 from src.models.UserModel import UserModel
+from src.models.base import Base
 
 target_metadata = Base.metadata
 
-#from src.models.Database import LibraryMetadata
-#target_metadata = LibraryMetadata
-
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
 # my_important_option = config.get_main_option("my_important_option")
@@ -41,6 +38,7 @@
 config.set_section_option(section, "DB_PASSWORD", urllib.parse.quote_plus(os.environ.get('DB_PASSWORD')).replace("%", "%%"))
 config.set_section_option(section, "DB_HOST", json_config["DB_HOST"])
 config.set_section_option(section, "DB_DATABASE", json_config["DB_DATABASE"])
+
 def run_migrations_offline() -> None:
     """Run migrations in 'offline' mode.
 
@@ -51,7 +49,6 @@ def run_migrations_offline() -> None:
 
     Calls to context.execute() here emit the given string to the
     script output.
-
     """
     url = config.get_main_option("sqlalchemy.url")
     context.configure(
@@ -60,17 +57,14 @@ def run_migrations_offline() -> None:
         literal_binds=True,
         dialect_opts={"paramstyle": "named"},
     )
-
     with context.begin_transaction():
         context.run_migrations()
 
-
 def run_migrations_online() -> None:
     """Run migrations in 'online' mode.
 
     In this scenario we need to create an Engine
     and associate a connection with the context.
-
     """
     connectable = engine_from_config(
         config.get_section(config.config_ini_section, {}),
@@ -82,11 +76,9 @@ def run_migrations_online() -> None:
         context.configure(
             connection=connection, target_metadata=target_metadata
         )
-
         with context.begin_transaction():
             context.run_migrations()
 
-
 if context.is_offline_mode():
     run_migrations_offline()
 else:

migrations/script.py.mako

@@ -13,7 +13,7 @@ ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.
 revision: str = ${repr(up_revision)}
-down_revision: Union[str, None] = ${repr(down_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
 branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
 depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
 

…rsions/8813faeb5825_initial_migration.py …rsions/84f8ba08e237_initial_migration.pymigrations/versions/8813faeb5825_initial_migration.py renamed to migrations/versions/84f8ba08e237_initial_migration.py migrations/versions/8813faeb5825_initial_migration.py renamed to migrations/versions/84f8ba08e237_initial_migration.py

@@ -1,19 +1,19 @@
 """Initial migration
 
-Revision ID: 8813faeb5825
+Revision ID: 84f8ba08e237
 Revises: 
-Create Date: 2025-03-27 11:45:48.556713
+Create Date: 2026-01-30 22:43:03.290447
 
 """
 from typing import Sequence, Union
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy import FetchedValue
+
 
 # revision identifiers, used by Alembic.
-revision: str = '8813faeb5825'
-down_revision: Union[str, None] = None
+revision: str = '84f8ba08e237'
+down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
@@ -22,39 +22,39 @@ def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('authors',
-    sa.Column('id', sa.Integer(), sa.Identity(always=False), autoincrement=True, nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('firstname', sa.String(length=128), nullable=False),
     sa.Column('lastname', sa.String(length=128), nullable=False),
     sa.Column('email', sa.String(length=255), nullable=False),
     sa.Column('phone', sa.String(length=15), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=False),
-    sa.Column('modified_at', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.Column('modified_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_authors_email'), 'authors', ['email'], unique=True)
     op.create_index(op.f('ix_authors_phone'), 'authors', ['phone'], unique=True)
     op.create_table('users',
-    sa.Column('id', sa.Integer(), sa.Identity(always=False), autoincrement=True, nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('firstname', sa.String(length=128), nullable=False),
     sa.Column('lastname', sa.String(length=128), nullable=False),
     sa.Column('email', sa.String(length=255), nullable=False),
     sa.Column('phone', sa.String(length=15), nullable=True),
     sa.Column('password', sa.String(length=128), nullable=True),
-    sa.Column('lastlogin', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=False),
-    sa.Column('modified_at', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=False),
+    sa.Column('lastlogin', sa.DateTime(timezone=True), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.Column('modified_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True)
     op.create_index(op.f('ix_users_phone'), 'users', ['phone'], unique=True)
     op.create_table('books',
-    sa.Column('id', sa.Integer(), sa.Identity(always=False), autoincrement=True, nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('title', sa.String(length=128), nullable=False),
     sa.Column('isbn', sa.String(length=255), nullable=False),
     sa.Column('page_count', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=False),
-    sa.Column('modified_at', sa.DateTime(timezone=True), server_default=FetchedValue(), nullable=False),
     sa.Column('author_id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.Column('modified_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
     sa.ForeignKeyConstraint(['author_id'], ['authors.id'], ),
     sa.PrimaryKeyConstraint('id')
     )

pyproject.toml

@@ -25,6 +25,7 @@ dependencies = [
     "flask-sqlalchemy",
     "quart-flask-patch",
     "psycopg[binary,pool]",
+    "marshmallow-sqlalchemy>=1.4.2",
 ]
 
 [dependency-groups]