implements example for the continuous aggregate policies

sebastian-ederer · sebastian-ederer · commit ffb5c6528f8e · 2026-01-13T17:31:05.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -436,6 +436,7 @@ samples/Eftdb.Samples.DatabaseFirst/**/*.cs
 # AI
 CLAUDE.md
 .claude
+tmpclaude-*
 
 # Code coverage report
 coverage
diff --git a/samples/Eftdb.Samples.DatabaseFirst/README.md b/samples/Eftdb.Samples.DatabaseFirst/README.md
@@ -1,30 +1,30 @@
-﻿# EF Core Database-First Example with TimescaleDB
+# EF Core Database-First Example with TimescaleDB
 
 This project demonstrates how to use the **Database-First** approach with [TimescaleDB](https://www.timescale.com/) using the `CmdScale.EntityFrameworkCore.TimescaleDB` package.
 
 ---
 
-## 📦 Required NuGet Packages
+## Required NuGet Packages
 
 Ensure the following package is installed in your project:
 
 - `CmdScale.EntityFrameworkCore.TimescaleDB.Design`
 
 ---
 
-## 🛠️ Scaffold DbContext and Models
+## Scaffold DbContext and Models
 
 Use the following command to scaffold the `DbContext` and entity classes from an existing TimescaleDB database:
 
 ```bash
-dotnet ef dbcontext scaffold
-  "Host=localhost;Database=cmdscale-ef-timescaledb;Username=timescale_admin;Password=R#!kro#GP43ra8Ae"
-  CmdScale.EntityFrameworkCore.TimescaleDB.Design
-  --output-dir Models
-  --schema public
-  --context-dir .
-  --context MyTimescaleDbContext
-  --project CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.DbFirst
+dotnet ef dbcontext scaffold \
+  "Host=localhost;Database=cmdscale-ef-timescaledb;Username=timescale_admin;Password=R#!kro#GP43ra8Ae" \
+  CmdScale.EntityFrameworkCore.TimescaleDB.Design \
+  --output-dir Models \
+  --schema public \
+  --context-dir . \
+  --context MyTimescaleDbContext \
+  --project samples/Eftdb.Samples.DatabaseFirst
 ```
 
 This command will:
@@ -37,20 +37,20 @@ This command will:
 
 ---
 
-## 📁 Project Structure
+## Project Structure
 
 ```text
-CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.DbFirst/
-│
-├── Models/                     # Auto-generated entity models
-└── MyTimescaleDbContext.cs     # Auto-generated DbContext
+samples/Eftdb.Samples.DatabaseFirst/
+|
++-- Models/                     # Auto-generated entity models
++-- MyTimescaleDbContext.cs     # Auto-generated DbContext
 ```
 
 ---
 
-## 🐳 Docker
+## Docker
 
-- A `docker-compose.yml` file is available in the **Solution Items** to spin up a TimescaleDB container for local development:
+- A `docker-compose.yml` file is available at the repository root to spin up a TimescaleDB container for local development:
 
   ```bash
   docker-compose up -d
@@ -60,7 +60,7 @@ CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.DbFirst/
 
 ---
 
-## 📚 Resources
+## Resources
 
 - [Entity Framework Core Documentation](https://learn.microsoft.com/en-us/ef/core/)
 - [TimescaleDB Documentation](https://docs.timescale.com/)
diff --git a/samples/Eftdb.Samples.Shared/Configurations/TradeAggregateConfiguration.cs b/samples/Eftdb.Samples.Shared/Configurations/TradeAggregateConfiguration.cs
@@ -1,5 +1,6 @@
 ﻿using CmdScale.EntityFrameworkCore.TimescaleDB.Abstractions;
 using CmdScale.EntityFrameworkCore.TimescaleDB.Configuration.ContinuousAggregate;
+using CmdScale.EntityFrameworkCore.TimescaleDB.Configuration.ContinuousAggregatePolicy;
 using CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -18,7 +19,10 @@ public void Configure(EntityTypeBuilder<TradeAggregate> builder)
                 .AddGroupByColumn(x => x.Exchange)
                 .AddGroupByColumn("1, 2")
                 .Where("\"ticker\" = 'MCRS'")
-                .MaterializedOnly();
+                .MaterializedOnly()
+                .WithRefreshPolicy(startOffset: "7 days", endOffset: "1 hour", scheduleInterval: "1 hour")
+                .WithTimezone("UTC")
+                .WithRefreshNewestFirst(true);
         }
     }
 }
diff --git a/samples/Eftdb.Samples.Shared/Models/WeatherAggregate.cs b/samples/Eftdb.Samples.Shared/Models/WeatherAggregate.cs
@@ -1,5 +1,6 @@
 ﻿using CmdScale.EntityFrameworkCore.TimescaleDB.Abstractions;
 using CmdScale.EntityFrameworkCore.TimescaleDB.Configuration.ContinuousAggregate;
+using CmdScale.EntityFrameworkCore.TimescaleDB.Configuration.ContinuousAggregatePolicy;
 using Microsoft.EntityFrameworkCore;
 
 namespace CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.Models
@@ -18,6 +19,12 @@ namespace CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.Models
         MaterializedOnly = false,
         Where = "\"temperature\" > -50 AND \"humidity\" >= 0")]
     [TimeBucket("1 day", nameof(WeatherData.Time), GroupBy = true)]
+    [ContinuousAggregatePolicy(
+        StartOffset = "30 days",
+        EndOffset = "1 day",
+        ScheduleInterval = "1 hour",
+        Timezone = "UTC",
+        RefreshNewestFirst = true)]
     public class WeatherAggregate
     {
         // Avg aggregate function
diff --git a/src/Eftdb.Design/Scaffolding/ContinuousAggregatePolicyScaffoldingExtractor.cs b/src/Eftdb.Design/Scaffolding/ContinuousAggregatePolicyScaffoldingExtractor.cs
@@ -36,19 +36,17 @@ public sealed record ContinuousAggregatePolicyInfo(
                 using (DbCommand command = connection.CreateCommand())
                 {
                     // Query continuous aggregate policies from TimescaleDB jobs table
-                    // The config column contains JSONB with start_offset, end_offset, and other policy parameters
+                    // The config column contains JSONB with start_offset, end_offset, timezone, mat_hypertable_id and other policy parameters
                     command.CommandText = @"
                         SELECT
-                            ca.view_schema,
-                            ca.view_name,
+                            ca.user_view_schema,
+                            ca.user_view_name,
                             j.config,
                             j.schedule_interval::text,
-                            j.initial_start,
-                            j.timezone
+                            j.initial_start
                         FROM timescaledb_information.jobs j
-                        INNER JOIN timescaledb_information.continuous_aggregates ca
-                            ON j.hypertable_schema = ca.materialization_hypertable_schema
-                            AND j.hypertable_name = ca.materialization_hypertable_name
+                        INNER JOIN _timescaledb_catalog.continuous_agg ca
+                            ON (j.config->>'mat_hypertable_id')::integer = ca.mat_hypertable_id
                         WHERE j.proc_name = 'policy_refresh_continuous_aggregate';";
 
                     using DbDataReader reader = command.ExecuteReader();
@@ -59,11 +57,11 @@ INNER JOIN timescaledb_information.continuous_aggregates ca
                         string? configJson = reader.IsDBNull(2) ? null : reader.GetString(2);
                         string? scheduleInterval = reader.IsDBNull(3) ? null : reader.GetString(3);
                         DateTime? initialStart = reader.IsDBNull(4) ? null : reader.GetDateTime(4);
-                        string? timezone = reader.IsDBNull(5) ? null : reader.GetString(5);
 
                         // Parse the JSONB config to extract policy parameters
                         string? startOffset = null;
                         string? endOffset = null;
+                        string? timezone = null;
                         bool? includeTieredData = null;
                         int? bucketsPerBatch = null;
                         int? maxBatchesPerExecution = null;
@@ -86,6 +84,13 @@ INNER JOIN timescaledb_information.continuous_aggregates ca
                                 endOffset = ParseIntervalOrInteger(endOffsetElement);
                             }
 
+                            // Extract timezone
+                            if (root.TryGetProperty("timezone", out JsonElement timezoneElement)
+                                && timezoneElement.ValueKind == JsonValueKind.String)
+                            {
+                                timezone = timezoneElement.GetString();
+                            }
+
                             // Extract include_tiered_data (optional)
                             if (root.TryGetProperty("include_tiered_data", out JsonElement includeTieredDataElement)
                                 && (includeTieredDataElement.ValueKind == JsonValueKind.True || includeTieredDataElement.ValueKind == JsonValueKind.False))
diff --git a/src/Eftdb/Internals/Features/ContinuousAggregatePolicies/ContinuousAggregatePolicyModelExtractor.cs b/src/Eftdb/Internals/Features/ContinuousAggregatePolicies/ContinuousAggregatePolicyModelExtractor.cs
@@ -39,8 +39,17 @@ public static IEnumerable<AddContinuousAggregatePolicyOperation> GetContinuousAg
                     continue;
                 }
 
-                // Get the schema (use the entity's schema or default)
-                string schema = entityType.GetSchema() ?? DefaultValues.DefaultSchema;
+                // Get the parent (source) entity to determine the schema
+                string? parentModelName = entityType.FindAnnotation(ContinuousAggregateAnnotations.ParentName)?.Value as string;
+                IEntityType? parentEntityType = null;
+                if (!string.IsNullOrWhiteSpace(parentModelName))
+                {
+                    parentEntityType = relationalModel.Model.GetEntityTypes()
+                        .FirstOrDefault(e => e.ClrType?.Name == parentModelName || e.ShortName() == parentModelName);
+                }
+
+                // Use parent table's schema for the continuous aggregate (matching ContinuousAggregateModelExtractor behavior)
+                string schema = parentEntityType?.GetSchema() ?? entityType.GetSchema() ?? DefaultValues.DefaultSchema;
 
                 // Extract policy configuration from annotations
                 string? startOffset = entityType.FindAnnotation(ContinuousAggregatePolicyAnnotations.StartOffset)?.Value as string;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using CmdScale.EntityFrameworkCore.TimescaleDB.Abstractions;`
`2`	`2`	`using CmdScale.EntityFrameworkCore.TimescaleDB.Configuration.ContinuousAggregate;`
	`3`	`+using CmdScale.EntityFrameworkCore.TimescaleDB.Configuration.ContinuousAggregatePolicy;`
`3`	`4`	`using CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.Models;`
`4`	`5`	`using Microsoft.EntityFrameworkCore;`
`5`	`6`	`using Microsoft.EntityFrameworkCore.Metadata.Builders;`
`@@ -18,7 +19,10 @@ public void Configure(EntityTypeBuilder<TradeAggregate> builder)`
`18`	`19`	`.AddGroupByColumn(x => x.Exchange)`
`19`	`20`	`.AddGroupByColumn("1, 2")`
`20`	`21`	`.Where("\"ticker\" = 'MCRS'")`
`21`		`- .MaterializedOnly();`
	`22`	`+ .MaterializedOnly()`
	`23`	`+ .WithRefreshPolicy(startOffset: "7 days", endOffset: "1 hour", scheduleInterval: "1 hour")`
	`24`	`+ .WithTimezone("UTC")`
	`25`	`+ .WithRefreshNewestFirst(true);`
`22`	`26`	`}`
`23`	`27`	`}`
`24`	`28`	`}`