From 40be3fb664b62fe9e939830a74fde19bf0bc4034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 10 Apr 2023 19:56:16 +0800 Subject: [PATCH] Replaced SQLAlchemy 1.x-style bulk_insert_mappings(model, data) with SQLAlchemy 2.x-style execute(insert(model), data). --- src/accounting/base_account/commands.py | 5 +++-- src/accounting/currency/commands.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/accounting/base_account/commands.py b/src/accounting/base_account/commands.py index b91e6be..c4a822e 100644 --- a/src/accounting/base_account/commands.py +++ b/src/accounting/base_account/commands.py @@ -20,6 +20,7 @@ import csv import click +import sqlalchemy as sa from flask.cli import with_appcontext from accounting import data_dir @@ -45,7 +46,7 @@ def init_base_accounts_command() -> None: "locale": y, "title": x[f"l10n-{y}"]} for x in data for y in locales] - db.session.bulk_insert_mappings(BaseAccount, account_data) - db.session.bulk_insert_mappings(BaseAccountL10n, l10n_data) + db.session.execute(sa.insert(BaseAccount), account_data) + db.session.execute(sa.insert(BaseAccountL10n), l10n_data) db.session.commit() click.echo("Base accounts initialized.") diff --git a/src/accounting/currency/commands.py b/src/accounting/currency/commands.py index e633334..3836b6b 100644 --- a/src/accounting/currency/commands.py +++ b/src/accounting/currency/commands.py @@ -22,6 +22,7 @@ import os import typing as t import click +import sqlalchemy as sa from flask.cli import with_appcontext from accounting import db, data_dir @@ -77,8 +78,8 @@ def init_currencies_command(username: str) -> None: "locale": y, "name": x[f"l10n-{y}"]} for x in to_add for y in locales] - db.session.bulk_insert_mappings(Currency, currency_data) - db.session.bulk_insert_mappings(CurrencyL10n, l10n_data) + db.session.execute(sa.insert(Currency), currency_data) + db.session.execute(sa.insert(CurrencyL10n), l10n_data) db.session.commit() click.echo(F"{len(to_add)} added. Currencies initialized.")