Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(data-warehouse): tie edited status to query updates (#121291)

Jovan Sakovic09fb57b63686
diff --git a/posthog/api/test/__snapshots__/test_element.ambr b/posthog/api/test/__snapshots__/test_element.ambr
index 5cc0d101cd33..5bd4fb8a0ccc 100644
--- a/posthog/api/test/__snapshots__/test_element.ambr
+++ b/posthog/api/test/__snapshots__/test_element.ambr
@@ -501,6 +501,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
diff --git a/posthog/hogql/database/test/__snapshots__/test_database.ambr b/posthog/hogql/database/test/__snapshots__/test_database.ambr
index 52063abeebf7..2ba4757c8995 100644
--- a/posthog/hogql/database/test/__snapshots__/test_database.ambr
+++ b/posthog/hogql/database/test/__snapshots__/test_database.ambr
@@ -195,6 +195,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -396,6 +397,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
diff --git a/posthog/session_recordings/test/__snapshots__/test_session_recording_playlist.ambr b/posthog/session_recordings/test/__snapshots__/test_session_recording_playlist.ambr
index fde5bfc2b857..960bd70f2091 100644
--- a/posthog/session_recordings/test/__snapshots__/test_session_recording_playlist.ambr
+++ b/posthog/session_recordings/test/__snapshots__/test_session_recording_playlist.ambr
@@ -1032,6 +1032,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
diff --git a/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr b/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
index 1eb44a9a07d5..db8e451d4801 100644
--- a/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
+++ b/posthog/session_recordings/test/__snapshots__/test_session_recordings.ambr
@@ -610,6 +610,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -1271,6 +1272,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -1929,6 +1931,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -2587,6 +2590,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -3248,6 +3252,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -3909,6 +3914,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -4570,6 +4576,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -5156,6 +5163,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -5868,6 +5876,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -6623,6 +6632,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -7348,6 +7358,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -8223,6 +8234,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -8761,6 +8773,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -9474,6 +9487,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -10211,6 +10225,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -10939,6 +10954,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -11155,6 +11171,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
@@ -11683,6 +11700,7 @@
"posthog_datawarehousesavedquery"."external_tables",
"posthog_datawarehousesavedquery"."query",
"posthog_datawarehousesavedquery"."query_revision",
+ "posthog_datawarehousesavedquery"."query_updated_at",
"posthog_datawarehousesavedquery"."status",
"posthog_datawarehousesavedquery"."last_run_at",
"posthog_datawarehousesavedquery"."sync_frequency_interval",
diff --git a/products/data_modeling/backend/migrations/0054_datawarehousesavedquery_query_updated_at.py b/products/data_modeling/backend/migrations/0054_datawarehousesavedquery_query_updated_at.py
new file mode 100644
index 000000000000..a34f28e242a6
--- /dev/null
+++ b/products/data_modeling/backend/migrations/0054_datawarehousesavedquery_query_updated_at.py
@@ -0,0 +1,15 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("data_modeling", "0053_job_team_created_index"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="datawarehousesavedquery",
+ name="query_updated_at",
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]
diff --git a/products/data_modeling/backend/migrations/0055_backfill_datawarehousesavedquery_query_updated_at.py b/products/data_modeling/backend/migrations/0055_backfill_datawarehousesavedquery_query_updated_at.py
new file mode 100644
index 000000000000..ad2e2b255b25
--- /dev/null
+++ b/products/data_modeling/backend/migrations/0055_backfill_datawarehousesavedquery_query_updated_at.py
@@ -0,0 +1,25 @@
+from django.db import migrations, models
+
+BATCH_SIZE = 5000
+
+
+def backfill_query_updated_at(apps, schema_editor):
+ SavedQuery = apps.get_model("data_modeling", "DataWarehouseSavedQuery")
+ manager = SavedQuery.objects.using(schema_editor.connection.alias)
+ # Only `Modified` rows can currently read as edited, so only they need the query timestamp.
+ pending = manager.filter(status="Modified", query_updated_at__isnull=True)
+ while True:
+ ids = list(pending.values_list("pk", flat=True)[:BATCH_SIZE])
+ if not ids:
+ break
+ manager.filter(pk__in=ids).update(query_updated_at=models.F("updated_at"))
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("data_modeling", "0054_datawarehousesavedquery_query_updated_at"),
+ ]
+
+ operations = [
+ migrations.RunPython(backfill_query_updated_at, migrations.RunPython.noop),
+ ]
diff --git a/products/data_modeling/backend/migrations/max_migration.txt b/products/data_modeling/backend/migrations/max_migration.txt
index 499f17469a6c..73cbbf372b42 100644
--- a/products/data_modeling/backend/migrations/max_migration.txt
+++ b/products/data_modeling/backend/migrations/max_migration.txt
@@ -1 +1 @@
-0053_job_team_created_index
+0055_backfill_datawarehousesavedquery_query_updated_at
diff --git a/products/data_modeling/backend/models/datawarehouse_saved_query.py b/products/data_modeling/backend/models/datawarehouse_saved_query.py
index 68535b6a438c..3fc9e3d42f54 100644
--- a/products/data_modeling/backend/models/datawarehouse_saved_query.py
+++ b/products/data_modeling/backend/models/datawarehouse_saved_query.py
@@ -155,6 +155,7 @@ class DataWarehouseSavedQuery(CreatedMetaFields, UUIDTModel, UpdatedMetaFields,
query = models.JSONField(default=dict, null=True, blank=True, help_text="HogQL query")
# Null on rows that predate the column; the write path accepts any token for those until their first edit.
query_revision = models.UUIDField(default=uuid.uuid4, null=True, blank=True)
+ query_updated_at = models.DateTimeField(null=True, blank=True)
status = models.CharField(
null=True, choices=Status, max_length=64, help_text="The status of when this SavedQuery last ran."
)
diff --git a/products/data_warehouse/backend/presentation/views/saved_query/editing.py b/products/data_warehouse/backend/presentation/views/saved_query/editing.py
index 4fb449f7b412..0b1c1546240e 100644
--- a/products/data_warehouse/backend/presentation/views/saved_query/editing.py
+++ b/products/data_warehouse/backend/presentation/views/saved_query/editing.py
@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Any, cast
from django.conf import settings
from django.db import transaction
+from django.utils import timezone
import structlog
from drf_spectacular.utils import extend_schema_field
@@ -528,6 +529,7 @@ class DataWarehouseSavedQuerySerializer(
if query_changed:
validated_data["query_revision"] = uuid.uuid4()
+ validated_data["query_updated_at"] = timezone.now()
if frequency_changed:
# The node target is the only store of frequency intent. The interval column
diff --git a/products/data_warehouse/backend/presentation/views/saved_query/view_state.py b/products/data_warehouse/backend/presentation/views/saved_query/view_state.py
index 4ceff0855573..96aadcdb8899 100644
--- a/products/data_warehouse/backend/presentation/views/saved_query/view_state.py
+++ b/products/data_warehouse/backend/presentation/views/saved_query/view_state.py
@@ -65,10 +65,11 @@ class DataWarehouseSavedQuerySerializerMixin:
return view.status if view.status in STATUSES_STILL_WRITTEN else None
# Modified means "edited and not materialized since", which no run can express. A run that
# happened after the edit answers it, so the column only wins while the edit is the newer fact.
+ query_updated_at = view.query_updated_at or view.updated_at
edited_since_the_run = (
view.status == DataWarehouseSavedQuery.Status.MODIFIED
- and view.updated_at is not None
- and view.updated_at > run.last_run_at
+ and query_updated_at is not None
+ and query_updated_at > run.last_run_at
)
return view.status if edited_since_the_run else run.status