Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add commit option to upsert_multi #174

Merged
merged 2 commits into from
Oct 20, 2024
Merged

Add commit option to upsert_multi #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb6b4cb
Add commit option to upsert_multi
feluelle Oct 18, 2024
35e7572
Merge branch 'main' into feature/upsert-multi-commit
igorbenav Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fastcrud/crud/fast_crud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ async def upsert_multi(
self,
db: AsyncSession,
instances: list[Union[UpdateSchemaType, CreateSchemaType]],
commit: bool = False,
return_columns: Optional[list[str]] = None,
schema_to_select: Optional[type[BaseModel]] = None,
return_as_model: bool = False,
Expand All @@ -843,6 +844,7 @@ async def upsert_multi(
Args:
db: The database session to use for the operation.
instances: A list of Pydantic schemas representing the instances to upsert.
commit: If True, commits the transaction immediately. Default is False.
return_columns: Optional list of column names to return after the upsert operation.
schema_to_select: Optional Pydantic schema for selecting specific columns. Required if return_as_model is True.
return_as_model: If True, returns data as instances of the specified Pydantic model.
Expand Down Expand Up @@ -891,13 +893,17 @@ async def upsert_multi(
if return_columns:
statement = statement.returning(*[column(name) for name in return_columns])
db_row = await db.execute(statement, params)
if commit:
await db.commit()
return self._as_multi_response(
db_row,
schema_to_select=schema_to_select,
return_as_model=return_as_model,
)

await db.execute(statement, params)
if commit:
await db.commit()
return None

async def _upsert_multi_postgresql(
Expand Down
8 changes: 4 additions & 4 deletions tests/sqlalchemy/crud/test_upsert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,16 +299,16 @@ async def test_upsert_multi_successful(
crud = FastCRUD(test_model)
new_data = read_schema(id=1, name="New Record", tier_id=1, category_id=1)
fetched_records = await crud.upsert_multi(
async_session, [new_data], **insert["kwargs"]
async_session, [new_data], commit=True, **insert["kwargs"]
)

assert not async_session.in_transaction()
assert fetched_records == insert["expected_result"]

updated_new_data = new_data.model_copy(update={"name": "New name"})
updated_fetched_records = await crud.upsert_multi(
async_session, [updated_new_data], **update["kwargs"]
async_session, [updated_new_data], commit=True, **update["kwargs"]
)

assert not async_session.in_transaction()
assert updated_fetched_records == update["expected_result"]


Expand Down
Loading