Skip to content

index: fix chaining order #875

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

Merged
merged 2 commits into from
Sep 18, 2025
Merged

index: fix chaining order #875

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
e57ff9c
index: fix chaining order
pjonsson Sep 9, 2025
1d2a029
tests: add type signature
pjonsson Sep 9, 2025
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
2 changes: 1 addition & 1 deletion cubedash/index/postgis/_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ def put_summary(
with self.index._active_connection() as conn:
return conn.execute(
insert(TimeOverview)
.returning(TimeOverview.generation_time)
.on_conflict_do_update(
index_elements=["product_ref", "start_day", "period_type"],
set_=summary_row,
Expand All @@ -242,6 +241,7 @@ def put_summary(
TimeOverview.period_type == period,
),
)
.returning(TimeOverview.generation_time)
.values(
product_ref=product_id,
start_day=start_day,
Expand Down
2 changes: 1 addition & 1 deletion cubedash/index/postgres/_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ def put_summary(
with self.index._active_connection() as conn:
return conn.execute(
insert(TIME_OVERVIEW)
.returning(TIME_OVERVIEW.c.generation_time)
.on_conflict_do_update(
index_elements=["product_ref", "start_day", "period_type"],
set_=summary_row,
Expand All @@ -288,6 +287,7 @@ def put_summary(
TIME_OVERVIEW.c.period_type == period,
),
)
.returning(TIME_OVERVIEW.c.generation_time)
.values(
product_ref=product_id,
start_day=start_day,
Expand Down
5 changes: 4 additions & 1 deletion integration_tests/dumpdatasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import random
from datetime import datetime
from pathlib import Path
from typing import Any

import click
import yaml
Expand Down Expand Up @@ -65,7 +66,9 @@ def dump_datasets(
)


def _get_dumpable_doc(dc: Datacube, d: Dataset, include_sources=True):
def _get_dumpable_doc(
dc: Datacube, d: Dataset, include_sources: bool = True
) -> dict[str, Any]:
if include_sources:
dataset = dc.index.datasets.get(d.id, include_sources=include_sources)
assert dataset is not None
Expand Down