feat(devex): revert - squash migrations (#34313)

bin/migrate

@@ -37,7 +37,7 @@ echo "0" > $CLICKHOUSE_STATUS
         echo "1" > $CLICKHOUSE_STATUS
         exit $SYNC_STATUS
     fi
-) & # ClickHouse migrations can run in parallel to most Postgres ones
+) & # ClickHouse migrations can run in parallel to Postgres ones
 CLICKHOUSE_PID=$!
 
 # Run postgres migrations

posthog/api/test/test_event.py

@@ -125,7 +125,7 @@ class TestEvents(ClickhouseTestMixin, APIBaseTest):
         # Django session, PostHog user, PostHog team, PostHog org membership,
         # look up if rate limit is enabled (cached after first lookup), instance
         # setting (poe, rate limit), person and distinct id
-        expected_queries = 9
+        expected_queries = 10
 
         with self.assertNumQueries(expected_queries):
             response = self.client.get(

posthog/clickhouse/materialized_columns.py

@@ -2,7 +2,7 @@ from typing import Protocol
 
 from posthog.models.instance_setting import get_instance_setting
 from posthog.models.property import PropertyName, TableColumn, TableWithProperties
-from posthog.settings import EE_AVAILABLE, TEST, E2E_TESTING
+from posthog.settings import EE_AVAILABLE
 
 
 ColumnName = str
@@ -20,7 +20,7 @@ if EE_AVAILABLE:
     def get_materialized_column_for_property(
         table: TablesWithMaterializedColumns, table_column: TableColumn, property_name: PropertyName
     ) -> MaterializedColumn | None:
-        if not (TEST or E2E_TESTING) and not get_instance_setting("MATERIALIZED_COLUMNS_ENABLED"):
+        if not get_instance_setting("MATERIALIZED_COLUMNS_ENABLED"):
             return None
 
         return get_enabled_materialized_columns(table).get((property_name, table_column))