anton-schieber · anton-schieber · Nov 14, 2025 · Nov 14, 2025
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -37,8 +37,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     env:
-      CORE_PROJECT_PATH: "CmdScale.EntityFrameworkCore.TimescaleDB/CmdScale.EntityFrameworkCore.TimescaleDB.csproj"
-      DESIGN_PROJECT_PATH: "CmdScale.EntityFrameworkCore.TimescaleDB.Design/CmdScale.EntityFrameworkCore.TimescaleDB.Design.csproj"
+      CORE_PROJECT_PATH: "src/TimescaleDB/TimescaleDB.csproj"
+      DESIGN_PROJECT_PATH: "src/TimescaleDB.Design/TimescaleDB.Design.csproj"
 
     steps:
       - name: Checkout repository

diff --git a/CmdScale.EntityFrameworkCore.TimescaleDB.sln b/CmdScale.EntityFrameworkCore.TimescaleDB.sln
diff --git a/...TimescaleDB.Benchmarks/InProcessConfig.cs → ...TimescaleDB.Benchmarks/InProcessConfig.cs b/...TimescaleDB.Benchmarks/InProcessConfig.cs → ...TimescaleDB.Benchmarks/InProcessConfig.cs
diff --git a/...orkCore.TimescaleDB.Benchmarks/Program.cs → benchmarks/TimescaleDB.Benchmarks/Program.cs b/...orkCore.TimescaleDB.Benchmarks/Program.cs → benchmarks/TimescaleDB.Benchmarks/Program.cs
diff --git a/...workCore.TimescaleDB.Benchmarks/README.md → benchmarks/TimescaleDB.Benchmarks/README.md b/...workCore.TimescaleDB.Benchmarks/README.md → benchmarks/TimescaleDB.Benchmarks/README.md
diff --git a/...ameworkCore.TimescaleDB.Benchmarks.csproj → ....Benchmarks/TimescaleDB.Benchmarks.csproj b/...ameworkCore.TimescaleDB.Benchmarks.csproj → ....Benchmarks/TimescaleDB.Benchmarks.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess\CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.csproj" />
+    <ProjectReference Include="..\..\samples\Context\Context.Example.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...B.Benchmarks/WriteRecordsBenchmarkBase.cs → ...B.Benchmarks/WriteRecordsBenchmarkBase.cs b/...B.Benchmarks/WriteRecordsBenchmarkBase.cs → ...B.Benchmarks/WriteRecordsBenchmarkBase.cs
diff --git a/...nchmarks/WriteRecordsKeylessBenchmarks.cs → ...nchmarks/WriteRecordsKeylessBenchmarks.cs b/...nchmarks/WriteRecordsKeylessBenchmarks.cs → ...nchmarks/WriteRecordsKeylessBenchmarks.cs
diff --git a/...nchmarks/WriteRecordsWithKeyBenchmarks.cs → ...nchmarks/WriteRecordsWithKeyBenchmarks.cs b/...nchmarks/WriteRecordsWithKeyBenchmarks.cs → ...nchmarks/WriteRecordsWithKeyBenchmarks.cs
diff --git a/...urations/OrderStatusEventConfiguration.cs → ...urations/OrderStatusEventConfiguration.cs b/...urations/OrderStatusEventConfiguration.cs → ...urations/OrderStatusEventConfiguration.cs
diff --git a/...igurations/TradeAggregateConfiguration.cs → ...igurations/TradeAggregateConfiguration.cs b/...igurations/TradeAggregateConfiguration.cs → ...igurations/TradeAggregateConfiguration.cs
diff --git a/...cess/Configurations/TradeConfiguration.cs → ...text/Configurations/TradeConfiguration.cs b/...cess/Configurations/TradeConfiguration.cs → ...text/Configurations/TradeConfiguration.cs
diff --git a/...onfigurations/TradeWithIdConfiguration.cs → ...onfigurations/TradeWithIdConfiguration.cs b/...onfigurations/TradeWithIdConfiguration.cs → ...onfigurations/TradeWithIdConfiguration.cs
diff --git a/...onfigurations/WeatherDataConfiguration.cs → ...onfigurations/WeatherDataConfiguration.cs b/...onfigurations/WeatherDataConfiguration.cs → ...onfigurations/WeatherDataConfiguration.cs
diff --git a/...ore.TimescaleDB.Example.DataAccess.csproj → samples/Context/Context.Example.csproj b/...ore.TimescaleDB.Example.DataAccess.csproj → samples/Context/Context.Example.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB\CmdScale.EntityFrameworkCore.TimescaleDB.csproj" />
+    <ProjectReference Include="..\..\src\TimescaleDB\TimescaleDB.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/...xample.DataAccess/Models/DeviceReading.cs → samples/Context/Models/DeviceReading.cs b/...xample.DataAccess/Models/DeviceReading.cs → samples/Context/Models/DeviceReading.cs
diff --git a/...ple.DataAccess/Models/OrderStatusEvent.cs → samples/Context/Models/OrderStatusEvent.cs b/...ple.DataAccess/Models/OrderStatusEvent.cs → samples/Context/Models/OrderStatusEvent.cs
diff --git a/...caleDB.Example.DataAccess/Models/Trade.cs → samples/Context/Models/Trade.cs b/...caleDB.Example.DataAccess/Models/Trade.cs → samples/Context/Models/Trade.cs
diff --git a/...ample.DataAccess/Models/TradeAggregate.cs → samples/Context/Models/TradeAggregate.cs b/...ample.DataAccess/Models/TradeAggregate.cs → samples/Context/Models/TradeAggregate.cs
diff --git a/....Example.DataAccess/Models/TradeWithId.cs → samples/Context/Models/TradeWithId.cs b/....Example.DataAccess/Models/TradeWithId.cs → samples/Context/Models/TradeWithId.cs
diff --git a/...ple.DataAccess/Models/WeatherAggregate.cs → samples/Context/Models/WeatherAggregate.cs b/...ple.DataAccess/Models/WeatherAggregate.cs → samples/Context/Models/WeatherAggregate.cs
diff --git a/....Example.DataAccess/Models/WeatherData.cs → samples/Context/Models/WeatherData.cs b/....Example.DataAccess/Models/WeatherData.cs → samples/Context/Models/WeatherData.cs
diff --git a/...ataAccess/Repositories/TradeRepository.cs → ...s/Context/Repositories/TradeRepository.cs b/...ataAccess/Repositories/TradeRepository.cs → ...s/Context/Repositories/TradeRepository.cs
diff --git a/...DB.Example.DataAccess/TimescaleContext.cs → samples/Context/TimescaleContext.cs b/...DB.Example.DataAccess/TimescaleContext.cs → samples/Context/TimescaleContext.cs
diff --git a/...yFrameworkCore.TimescaleDB.Example.csproj → samples/Migration/Migration.Example.csproj b/...yFrameworkCore.TimescaleDB.Example.csproj → samples/Migration/Migration.Example.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess\CmdScale.EntityFrameworkCore.TimescaleDB.Example.DataAccess.csproj" />
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB.Design\CmdScale.EntityFrameworkCore.TimescaleDB.Design.csproj" />
+    <ProjectReference Include="..\Context\Context.Example.csproj" />
+    <ProjectReference Include="..\..\src\TimescaleDB.Design\TimescaleDB.Design.csproj" />
   </ItemGroup>
 
 	<ItemGroup>

diff --git a/...meworkCore.TimescaleDB.Example/Program.cs → samples/Migration/Program.cs b/...meworkCore.TimescaleDB.Example/Program.cs → samples/Migration/Program.cs
diff --git a/...DB.Example/Properties/launchSettings.json → .../Migration/Properties/launchSettings.json b/...DB.Example/Properties/launchSettings.json → .../Migration/Properties/launchSettings.json
diff --git a/...ameworkCore.TimescaleDB.Example/README.md → samples/Migration/README.md b/...ameworkCore.TimescaleDB.Example/README.md → samples/Migration/README.md
diff --git a/...B.Example/TimescaleDBDesignTimeService.cs → ...Migration/TimescaleDBDesignTimeService.cs b/...B.Example/TimescaleDBDesignTimeService.cs → ...Migration/TimescaleDBDesignTimeService.cs
diff --git a/...Core.TimescaleDB.Example/appsettings.json → samples/Migration/appsettings.json b/...Core.TimescaleDB.Example/appsettings.json → samples/Migration/appsettings.json
diff --git a/...leDB.Example.DataAccess.DbFirst/README.md → samples/Scaffold/README.md b/...leDB.Example.DataAccess.DbFirst/README.md → samples/Scaffold/README.md
diff --git a/...scaleDB.Example.DataAccess.DbFirst.csproj → samples/Scaffold/Scaffold.Example.csproj b/...scaleDB.Example.DataAccess.DbFirst.csproj → samples/Scaffold/Scaffold.Example.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB.Design\CmdScale.EntityFrameworkCore.TimescaleDB.Design.csproj" />
+    <ProjectReference Include="..\..\src\TimescaleDB.Design\TimescaleDB.Design.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/...g/ContinuousAggregateAnnotationApplier.cs → ...g/ContinuousAggregateAnnotationApplier.cs b/...g/ContinuousAggregateAnnotationApplier.cs → ...g/ContinuousAggregateAnnotationApplier.cs
diff --git a/...ontinuousAggregateScaffoldingExtractor.cs → ...ontinuousAggregateScaffoldingExtractor.cs b/...ontinuousAggregateScaffoldingExtractor.cs → ...ontinuousAggregateScaffoldingExtractor.cs
diff --git a/...caffolding/HypertableAnnotationApplier.cs → ...caffolding/HypertableAnnotationApplier.cs b/...caffolding/HypertableAnnotationApplier.cs → ...caffolding/HypertableAnnotationApplier.cs
diff --git a/...folding/HypertableScaffoldingExtractor.cs → ...folding/HypertableScaffoldingExtractor.cs b/...folding/HypertableScaffoldingExtractor.cs → ...folding/HypertableScaffoldingExtractor.cs
diff --git a/....Design/Scaffolding/IAnnotationApplier.cs → ....Design/Scaffolding/IAnnotationApplier.cs b/....Design/Scaffolding/IAnnotationApplier.cs → ....Design/Scaffolding/IAnnotationApplier.cs
diff --git a/...Scaffolding/ITimescaleFeatureExtractor.cs → ...Scaffolding/ITimescaleFeatureExtractor.cs b/...Scaffolding/ITimescaleFeatureExtractor.cs → ...Scaffolding/ITimescaleFeatureExtractor.cs
diff --git a/...folding/ReorderPolicyAnnotationApplier.cs → ...folding/ReorderPolicyAnnotationApplier.cs b/...folding/ReorderPolicyAnnotationApplier.cs → ...folding/ReorderPolicyAnnotationApplier.cs
diff --git a/...ding/ReorderPolicyScaffoldingExtractor.cs → ...ding/ReorderPolicyScaffoldingExtractor.cs b/...ding/ReorderPolicyScaffoldingExtractor.cs → ...ding/ReorderPolicyScaffoldingExtractor.cs
diff --git a/...scaleCSharpMigrationOperationGenerator.cs → ...scaleCSharpMigrationOperationGenerator.cs b/...scaleCSharpMigrationOperationGenerator.cs → ...scaleCSharpMigrationOperationGenerator.cs
diff --git a/...tyFrameworkCore.TimescaleDB.Design.csproj → ...escaleDB.Design/TimescaleDB.Design.csproj b/...tyFrameworkCore.TimescaleDB.Design.csproj → ...escaleDB.Design/TimescaleDB.Design.csproj
@@ -25,22 +25,22 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\assets\cmd-nuget-logo.jpg">
+    <None Include="..\..\assets\cmd-nuget-logo.jpg">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\LICENSE">
+    <None Include="..\..\LICENSE">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\README.md">
+    <None Include="..\..\README.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
 	<Content Include="build\**\*" Pack="true" PackagePath="build\" />
 	<Content Include="build\**\*" Pack="true" PackagePath="buildTransitive\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB\CmdScale.EntityFrameworkCore.TimescaleDB.csproj" />
+    <ProjectReference Include="..\TimescaleDB\TimescaleDB.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...B.Design/TimescaleDBDesignTimeServices.cs → ...B.Design/TimescaleDBDesignTimeServices.cs b/...B.Design/TimescaleDBDesignTimeServices.cs → ...B.Design/TimescaleDBDesignTimeServices.cs
diff --git a/...B.Design/TimescaleDatabaseModelFactory.cs → ...B.Design/TimescaleDatabaseModelFactory.cs b/...B.Design/TimescaleDatabaseModelFactory.cs → ...B.Design/TimescaleDatabaseModelFactory.cs
diff --git a/...yFrameworkCore.TimescaleDB.Design.targets → ...yFrameworkCore.TimescaleDB.Design.targets b/...yFrameworkCore.TimescaleDB.Design.targets → ...yFrameworkCore.TimescaleDB.Design.targets
diff --git a/...ore.TimescaleDB/Abstractions/Dimension.cs → src/TimescaleDB/Abstractions/Dimension.cs b/...ore.TimescaleDB/Abstractions/Dimension.cs → src/TimescaleDB/Abstractions/Dimension.cs
diff --git a/...caleDB/Abstractions/EAggregateFunction.cs → ...caleDB/Abstractions/EAggregateFunction.cs b/...caleDB/Abstractions/EAggregateFunction.cs → ...caleDB/Abstractions/EAggregateFunction.cs
diff --git a/...imescaleDB/Abstractions/EDimensionType.cs → ...imescaleDB/Abstractions/EDimensionType.cs b/...imescaleDB/Abstractions/EDimensionType.cs → ...imescaleDB/Abstractions/EDimensionType.cs
diff --git a/...aleDB/Abstractions/TimescaleCopyConfig.cs → ...aleDB/Abstractions/TimescaleCopyConfig.cs b/...aleDB/Abstractions/TimescaleCopyConfig.cs → ...aleDB/Abstractions/TimescaleCopyConfig.cs
diff --git a/...ContinuousAggregate/AggregateAttribute.cs → ...ContinuousAggregate/AggregateAttribute.cs b/...ContinuousAggregate/AggregateAttribute.cs → ...ContinuousAggregate/AggregateAttribute.cs
diff --git a/...gregate/ContinuousAggregateAnnotations.cs → ...gregate/ContinuousAggregateAnnotations.cs b/...gregate/ContinuousAggregateAnnotations.cs → ...gregate/ContinuousAggregateAnnotations.cs
diff --git a/...Aggregate/ContinuousAggregateAttribute.cs → ...Aggregate/ContinuousAggregateAttribute.cs b/...Aggregate/ContinuousAggregateAttribute.cs → ...Aggregate/ContinuousAggregateAttribute.cs
diff --git a/...usAggregate/ContinuousAggregateBuilder.cs → ...usAggregate/ContinuousAggregateBuilder.cs b/...usAggregate/ContinuousAggregateBuilder.cs → ...usAggregate/ContinuousAggregateBuilder.cs
diff --git a/...ggregate/ContinuousAggregateConvention.cs → ...ggregate/ContinuousAggregateConvention.cs b/...ggregate/ContinuousAggregateConvention.cs → ...ggregate/ContinuousAggregateConvention.cs
diff --git a/...gregate/ContinuousAggregateTypeBuilder.cs → ...gregate/ContinuousAggregateTypeBuilder.cs b/...gregate/ContinuousAggregateTypeBuilder.cs → ...gregate/ContinuousAggregateTypeBuilder.cs
diff --git a/...ontinuousAggregate/TimeBucketAttribute.cs → ...ontinuousAggregate/TimeBucketAttribute.cs b/...ontinuousAggregate/TimeBucketAttribute.cs → ...ontinuousAggregate/TimeBucketAttribute.cs
diff --git a/...ation/Hypertable/HypertableAnnotations.cs → ...ation/Hypertable/HypertableAnnotations.cs b/...ation/Hypertable/HypertableAnnotations.cs → ...ation/Hypertable/HypertableAnnotations.cs
diff --git a/...uration/Hypertable/HypertableAttribute.cs → ...uration/Hypertable/HypertableAttribute.cs b/...uration/Hypertable/HypertableAttribute.cs → ...uration/Hypertable/HypertableAttribute.cs
diff --git a/...ration/Hypertable/HypertableConvention.cs → ...ration/Hypertable/HypertableConvention.cs b/...ration/Hypertable/HypertableConvention.cs → ...ration/Hypertable/HypertableConvention.cs
diff --git a/...ation/Hypertable/HypertableTypeBuilder.cs → ...ation/Hypertable/HypertableTypeBuilder.cs b/...ation/Hypertable/HypertableTypeBuilder.cs → ...ation/Hypertable/HypertableTypeBuilder.cs
diff --git a/...ReorderPolicy/ReorderPolicyAnnotations.cs → ...ReorderPolicy/ReorderPolicyAnnotations.cs b/...ReorderPolicy/ReorderPolicyAnnotations.cs → ...ReorderPolicy/ReorderPolicyAnnotations.cs
diff --git a/...n/ReorderPolicy/ReorderPolicyAttribute.cs → ...n/ReorderPolicy/ReorderPolicyAttribute.cs b/...n/ReorderPolicy/ReorderPolicyAttribute.cs → ...n/ReorderPolicy/ReorderPolicyAttribute.cs
diff --git a/.../ReorderPolicy/ReorderPolicyConvention.cs → .../ReorderPolicy/ReorderPolicyConvention.cs b/.../ReorderPolicy/ReorderPolicyConvention.cs → .../ReorderPolicy/ReorderPolicyConvention.cs
diff --git a/...ReorderPolicy/ReorderPolicyTypeBuilder.cs → ...ReorderPolicy/ReorderPolicyTypeBuilder.cs b/...ReorderPolicy/ReorderPolicyTypeBuilder.cs → ...ReorderPolicy/ReorderPolicyTypeBuilder.cs
diff --git a/...rameworkCore.TimescaleDB/DefaultValues.cs → src/TimescaleDB/DefaultValues.cs b/...rameworkCore.TimescaleDB/DefaultValues.cs → src/TimescaleDB/DefaultValues.cs
diff --git a/.../ContinuousAggregateOperationGenerator.cs → .../ContinuousAggregateOperationGenerator.cs b/.../ContinuousAggregateOperationGenerator.cs → .../ContinuousAggregateOperationGenerator.cs
diff --git a/...enerators/HypertableOperationGenerator.cs → ...enerators/HypertableOperationGenerator.cs b/...enerators/HypertableOperationGenerator.cs → ...enerators/HypertableOperationGenerator.cs
@@ -1,5 +1,6 @@
 using CmdScale.EntityFrameworkCore.TimescaleDB.Abstractions;
 using CmdScale.EntityFrameworkCore.TimescaleDB.Operations;
+using System.Text;
 
 namespace CmdScale.EntityFrameworkCore.TimescaleDB.Generators
 {
@@ -16,54 +17,63 @@ public HypertableOperationGenerator(bool isDesignTime = false)
             }
 
             sqlHelper = new SqlBuilderHelper(quoteString);
-
         }
 
         public List<string> Generate(CreateHypertableOperation operation)
         {
             string qualifiedTableName = sqlHelper.Regclass(operation.TableName, operation.Schema);
             string qualifiedIdentifier = sqlHelper.QualifiedIdentifier(operation.TableName, operation.Schema);
 
-            List<string> statements =
-            [
-                $"SELECT create_hypertable({qualifiedTableName}, '{operation.TimeColumnName}');"
-            ];
+            List<string> statements = [];
+            List<string> communityStatements = [];
 
-            // ChunkTimeInterval
+            // Build create_hypertable with chunk_time_interval if provided
+            var createHypertableCall = new StringBuilder();
+            createHypertableCall.Append($"SELECT create_hypertable({qualifiedTableName}, '{operation.TimeColumnName}'");
+
             if (!string.IsNullOrEmpty(operation.ChunkTimeInterval))
             {
                 // Check if the interval is a plain number (e.g., for microseconds).
                 if (long.TryParse(operation.ChunkTimeInterval, out _))
                 {
                     // If it's a number, don't wrap it in quotes.
-                    statements.Add($"SELECT set_chunk_time_interval({qualifiedTableName}, {operation.ChunkTimeInterval}::bigint);");
+                    createHypertableCall.Append($", chunk_time_interval => {operation.ChunkTimeInterval}::bigint");
                 }
                 else
                 {
                     // If it's a string like '7 days', wrap it in quotes.
-                    statements.Add($"SELECT set_chunk_time_interval({qualifiedTableName}, INTERVAL '{operation.ChunkTimeInterval}');");
+                    createHypertableCall.Append($", chunk_time_interval => INTERVAL '{operation.ChunkTimeInterval}'");
                 }
             }
+
+            createHypertableCall.Append(");");
+            statements.Add(createHypertableCall.ToString());
 
-            // EnableCompression
+            // EnableCompression (Community Edition only)
             if (operation.EnableCompression || operation.ChunkSkipColumns?.Count > 0)
             {
                 bool enableCompression = operation.EnableCompression || operation.ChunkSkipColumns != null && operation.ChunkSkipColumns.Count > 0;
-                statements.Add($"ALTER TABLE {qualifiedIdentifier} SET (timescaledb.compress = {enableCompression.ToString().ToLower()});");
+                communityStatements.Add($"ALTER TABLE {qualifiedIdentifier} SET (timescaledb.compress = {enableCompression.ToString().ToLower()});");
             }
 
-            // ChunkSkipColumns
+            // ChunkSkipColumns (Community Edition only)
             if (operation.ChunkSkipColumns != null && operation.ChunkSkipColumns.Count > 0)
             {
-                statements.Add("SET timescaledb.enable_chunk_skipping = 'ON';");
+                communityStatements.Add("SET timescaledb.enable_chunk_skipping = 'ON';");
 
                 foreach (string column in operation.ChunkSkipColumns)
                 {
-                    statements.Add($"SELECT enable_chunk_skipping({qualifiedTableName}, '{column}');");
+                    communityStatements.Add($"SELECT enable_chunk_skipping({qualifiedTableName}, '{column}');");
                 }
             }
 
-            // AdditionalDimensions
+            // Add wrapped community statements if any exist
+            if (communityStatements.Count > 0)
+            {
+                statements.Add(WrapCommunityFeatures(communityStatements));
+            }
+
+            // AdditionalDimensions (Available in both editions)
             if (operation.AdditionalDimensions != null && operation.AdditionalDimensions.Count > 0)
             {
                 foreach (Dimension dimension in operation.AdditionalDimensions)
@@ -88,45 +98,52 @@ public List<string> Generate(AlterHypertableOperation operation)
             string qualifiedIdentifier = sqlHelper.QualifiedIdentifier(operation.TableName, operation.Schema);
 
             List<string> statements = [];
+            List<string> communityStatements = [];
 
-            // Check for ChunkTimeInterval change
+            // Check for ChunkTimeInterval change (Available in both editions)
             if (operation.ChunkTimeInterval != operation.OldChunkTimeInterval)
             {
+                var setChunkTimeInterval = new StringBuilder();
+                setChunkTimeInterval.Append($"SELECT set_chunk_time_interval({qualifiedTableName}, ");
+
                 // Check if the interval is a plain number (e.g., for microseconds).
                 if (long.TryParse(operation.ChunkTimeInterval, out _))
                 {
                     // If it's a number, don't wrap it in quotes.
-                    statements.Add($"SELECT set_chunk_time_interval({qualifiedTableName}, {operation.ChunkTimeInterval}::bigint);");
+                    setChunkTimeInterval.Append($"{operation.ChunkTimeInterval}::bigint");
                 }
                 else
                 {
                     // If it's a string like '7 days', wrap it in quotes.
-                    statements.Add($"SELECT set_chunk_time_interval({qualifiedTableName}, INTERVAL '{operation.ChunkTimeInterval}');");
+                    setChunkTimeInterval.Append($"INTERVAL '{operation.ChunkTimeInterval}'");
                 }
+
+                setChunkTimeInterval.Append(");");
+                statements.Add(setChunkTimeInterval.ToString());
             }
 
-            // Check for EnableCompression change
+            // Check for EnableCompression change (Community Edition only)
             bool newCompressionState = operation.EnableCompression || operation.ChunkSkipColumns != null && operation.ChunkSkipColumns.Any();
             bool oldCompressionState = operation.OldEnableCompression || operation.OldChunkSkipColumns != null && operation.OldChunkSkipColumns.Any();
 
             if (newCompressionState != oldCompressionState)
             {
                 string compressionValue = newCompressionState.ToString().ToLower();
-                statements.Add($"ALTER TABLE {qualifiedIdentifier} SET (timescaledb.compress = {compressionValue});");
+                communityStatements.Add($"ALTER TABLE {qualifiedIdentifier} SET (timescaledb.compress = {compressionValue});");
             }
 
-            // Handle ChunkSkipColumns
+            // Handle ChunkSkipColumns (Community Edition only)
             IReadOnlyList<string> newColumns = operation.ChunkSkipColumns ?? [];
             IReadOnlyList<string> oldColumns = operation.OldChunkSkipColumns ?? [];
             List<string> addedColumns = [.. newColumns.Except(oldColumns)];
 
             if (addedColumns.Count != 0)
             {
-                statements.Add("SET timescaledb.enable_chunk_skipping = 'ON';");
+                communityStatements.Add("SET timescaledb.enable_chunk_skipping = 'ON';");
 
                 foreach (string column in addedColumns)
                 {
-                    statements.Add($"SELECT enable_chunk_skipping({qualifiedTableName}, '{column}');");
+                    communityStatements.Add($"SELECT enable_chunk_skipping({qualifiedTableName}, '{column}');");
                 }
             }
 
@@ -135,12 +152,44 @@ public List<string> Generate(AlterHypertableOperation operation)
             {
                 foreach (string column in removedColumns)
                 {
-                    statements.Add($"SELECT disable_chunk_skipping({qualifiedTableName}, '{column}');");
+                    communityStatements.Add($"SELECT disable_chunk_skipping({qualifiedTableName}, '{column}');");
                 }
             }
 
+            // Add wrapped community statements if any exist
+            if (communityStatements.Count > 0)
+            {
+                statements.Add(WrapCommunityFeatures(communityStatements));
+            }
+
             return statements;
         }
-    }
-}
 
+        /// <summary>
+        /// Wraps multiple SQL statements in a single license check block to ensure they only run on Community Edition
+        /// </summary>
+        private string WrapCommunityFeatures(List<string> sqlStatements)
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("DO $");
+            sb.AppendLine("DECLARE");
+            sb.AppendLine("    license TEXT;");
+            sb.AppendLine("BEGIN");
+            sb.AppendLine("    license := current_setting('timescaledb.license', true);");
+            sb.AppendLine("    ");
+            sb.AppendLine("    IF license IS NULL OR license != 'apache' THEN");
+
+            foreach (string sql in sqlStatements)
+            {
+                sb.AppendLine($"        {sql}");
+            }
+
+            sb.AppendLine("    ELSE");
+            sb.AppendLine("        RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Enterprise Edition';");
+            sb.AppendLine("    END IF;");
+            sb.AppendLine("END $;");
+
+            return sb.ToString();
+        }
+    }
+}
diff --git a/...rators/ReorderPolicyOperationGenerator.cs → ...rators/ReorderPolicyOperationGenerator.cs b/...rators/ReorderPolicyOperationGenerator.cs → ...rators/ReorderPolicyOperationGenerator.cs
diff --git a/...imescaleDB/Generators/SqlBuilderHelper.cs → ...imescaleDB/Generators/SqlBuilderHelper.cs b/...imescaleDB/Generators/SqlBuilderHelper.cs → ...imescaleDB/Generators/SqlBuilderHelper.cs
diff --git a/...usAggregates/ContinuousAggregateDiffer.cs → ...usAggregates/ContinuousAggregateDiffer.cs b/...usAggregates/ContinuousAggregateDiffer.cs → ...usAggregates/ContinuousAggregateDiffer.cs
diff --git a/...ates/ContinuousAggregateModelExtractor.cs → ...ates/ContinuousAggregateModelExtractor.cs b/...ates/ContinuousAggregateModelExtractor.cs → ...ates/ContinuousAggregateModelExtractor.cs
diff --git a/.../Features/Hypertables/HypertableDiffer.cs → .../Features/Hypertables/HypertableDiffer.cs b/.../Features/Hypertables/HypertableDiffer.cs → .../Features/Hypertables/HypertableDiffer.cs
diff --git a/...s/Hypertables/HypertableModelExtractor.cs → ...s/Hypertables/HypertableModelExtractor.cs b/...s/Hypertables/HypertableModelExtractor.cs → ...s/Hypertables/HypertableModelExtractor.cs
diff --git a/...leDB/Internals/Features/IFeatureDiffer.cs → ...leDB/Internals/Features/IFeatureDiffer.cs b/...leDB/Internals/Features/IFeatureDiffer.cs → ...leDB/Internals/Features/IFeatureDiffer.cs
diff --git a/...es/ReorderPolicies/ReorderPolicyDiffer.cs → ...es/ReorderPolicies/ReorderPolicyDiffer.cs b/...es/ReorderPolicies/ReorderPolicyDiffer.cs → ...es/ReorderPolicies/ReorderPolicyDiffer.cs
diff --git a/...erPolicies/ReorderPolicyModelExtractor.cs → ...erPolicies/ReorderPolicyModelExtractor.cs b/...erPolicies/ReorderPolicyModelExtractor.cs → ...erPolicies/ReorderPolicyModelExtractor.cs
diff --git a/...ternals/TimescaleMigrationsModelDiffer.cs → ...ternals/TimescaleMigrationsModelDiffer.cs b/...ternals/TimescaleMigrationsModelDiffer.cs → ...ternals/TimescaleMigrationsModelDiffer.cs
diff --git a/.../Internals/WhereClauseEpressionVisitor.cs → .../Internals/WhereClauseEpressionVisitor.cs b/.../Internals/WhereClauseEpressionVisitor.cs → .../Internals/WhereClauseEpressionVisitor.cs
diff --git a/...B/Operations/AddReorderPolicyOperation.cs → ...B/Operations/AddReorderPolicyOperation.cs b/...B/Operations/AddReorderPolicyOperation.cs → ...B/Operations/AddReorderPolicyOperation.cs
diff --git a/...ions/AlterContinuousAggregateOperation.cs → ...ions/AlterContinuousAggregateOperation.cs b/...ions/AlterContinuousAggregateOperation.cs → ...ions/AlterContinuousAggregateOperation.cs
diff --git a/...DB/Operations/AlterHypertableOperation.cs → ...DB/Operations/AlterHypertableOperation.cs b/...DB/Operations/AlterHypertableOperation.cs → ...DB/Operations/AlterHypertableOperation.cs
diff --git a/...Operations/AlterReorderPolicyOperation.cs → ...Operations/AlterReorderPolicyOperation.cs b/...Operations/AlterReorderPolicyOperation.cs → ...Operations/AlterReorderPolicyOperation.cs
diff --git a/...ons/CreateContinuousAggregateOperation.cs → ...ons/CreateContinuousAggregateOperation.cs b/...ons/CreateContinuousAggregateOperation.cs → ...ons/CreateContinuousAggregateOperation.cs
diff --git a/...B/Operations/CreateHypertableOperation.cs → ...B/Operations/CreateHypertableOperation.cs b/...B/Operations/CreateHypertableOperation.cs → ...B/Operations/CreateHypertableOperation.cs
diff --git a/...tions/DropContinuousAggregateOperation.cs → ...tions/DropContinuousAggregateOperation.cs b/...tions/DropContinuousAggregateOperation.cs → ...tions/DropContinuousAggregateOperation.cs
diff --git a/.../Operations/DropReorderPolicyOperation.cs → .../Operations/DropReorderPolicyOperation.cs b/.../Operations/DropReorderPolicyOperation.cs → .../Operations/DropReorderPolicyOperation.cs
diff --git a/...imescaleDB/Properties/launchSettings.json → ...imescaleDB/Properties/launchSettings.json b/...imescaleDB/Properties/launchSettings.json → ...imescaleDB/Properties/launchSettings.json
diff --git a/...le.EntityFrameworkCore.TimescaleDB.csproj → src/TimescaleDB/TimescaleDB.csproj b/...le.EntityFrameworkCore.TimescaleDB.csproj → src/TimescaleDB/TimescaleDB.csproj
@@ -22,15 +22,15 @@
     <PackageTags>timescaledb;timescale;efcore;ef-core;entityframeworkcore;postgresql;postgres;time-series;timeseries;data;database;efcore-provider;</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\assets\cmd-nuget-logo.jpg">
+    <None Include="..\..\assets\cmd-nuget-logo.jpg">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\LICENSE">
+    <None Include="..\..\LICENSE">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\README.md">
+    <None Include="..\..\README.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>

diff --git a/...scaleDbContextOptionsBuilderExtensions.cs → ...scaleDbContextOptionsBuilderExtensions.cs b/...scaleDbContextOptionsBuilderExtensions.cs → ...scaleDbContextOptionsBuilderExtensions.cs
diff --git a/....TimescaleDB/TimescaleDbCopyExtensions.cs → src/TimescaleDB/TimescaleDbCopyExtensions.cs b/....TimescaleDB/TimescaleDbCopyExtensions.cs → src/TimescaleDB/TimescaleDbCopyExtensions.cs
diff --git a/...leDB/TimescaleDbMigrationsSqlGenerator.cs → ...leDB/TimescaleDbMigrationsSqlGenerator.cs b/...leDB/TimescaleDbMigrationsSqlGenerator.cs → ...leDB/TimescaleDbMigrationsSqlGenerator.cs
diff --git a/...TimescaleDbServiceCollectionExtensions.cs → ...TimescaleDbServiceCollectionExtensions.cs b/...TimescaleDbServiceCollectionExtensions.cs → ...TimescaleDbServiceCollectionExtensions.cs
diff --git a/...napshots/AspNetIdentity21ModelSnapshot.cs → ...napshots/AspNetIdentity21ModelSnapshot.cs b/...napshots/AspNetIdentity21ModelSnapshot.cs → ...napshots/AspNetIdentity21ModelSnapshot.cs
diff --git a/...napshots/AspNetIdentity22ModelSnapshot.cs → ...napshots/AspNetIdentity22ModelSnapshot.cs b/...napshots/AspNetIdentity22ModelSnapshot.cs → ...napshots/AspNetIdentity22ModelSnapshot.cs
diff --git a/...napshots/AspNetIdentity30ModelSnapshot.cs → ...napshots/AspNetIdentity30ModelSnapshot.cs b/...napshots/AspNetIdentity30ModelSnapshot.cs → ...napshots/AspNetIdentity30ModelSnapshot.cs
diff --git a/...lTests/Snapshots/EfCore22ModelSnapshot.cs → ....Tests/Snapshots/EfCore22ModelSnapshot.cs b/...lTests/Snapshots/EfCore22ModelSnapshot.cs → ....Tests/Snapshots/EfCore22ModelSnapshot.cs
diff --git a/...rkCore.TimescaleDB.FunctionalTests.csproj → ...ign.Tests/TimescaleDB.Design.Tests.csproj b/...rkCore.TimescaleDB.FunctionalTests.csproj → ...ign.Tests/TimescaleDB.Design.Tests.csproj
@@ -29,8 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB.Design\CmdScale.EntityFrameworkCore.TimescaleDB.Design.csproj" />
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB\CmdScale.EntityFrameworkCore.TimescaleDB.csproj" />
+    <ProjectReference Include="..\..\src\TimescaleDB.Design\TimescaleDB.Design.csproj" />
+    <ProjectReference Include="..\..\src\TimescaleDB\TimescaleDB.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...mescaleDbMigrationsInfrastructureTests.cs → ...mescaleDbMigrationsInfrastructureTests.cs b/...mescaleDbMigrationsInfrastructureTests.cs → ...mescaleDbMigrationsInfrastructureTests.cs
diff --git a/...nalTests/TimescaleDbSqlGenerationTests.cs → ...gn.Tests/TimescaleDbSqlGenerationTests.cs b/...nalTests/TimescaleDbSqlGenerationTests.cs → ...gn.Tests/TimescaleDbSqlGenerationTests.cs
diff --git a/...lTests/Utils/TimescaleConnectionHelper.cs → ....Tests/Utils/TimescaleConnectionHelper.cs b/...lTests/Utils/TimescaleConnectionHelper.cs → ....Tests/Utils/TimescaleConnectionHelper.cs
diff --git a/...alTests/Utils/TimescaleDatabaseCleaner.cs → ...n.Tests/Utils/TimescaleDatabaseCleaner.cs b/...alTests/Utils/TimescaleDatabaseCleaner.cs → ...n.Tests/Utils/TimescaleDatabaseCleaner.cs
diff --git a/...Tests/Utils/TimescaleMigrationsFixture.cs → ...Tests/Utils/TimescaleMigrationsFixture.cs b/...Tests/Utils/TimescaleMigrationsFixture.cs → ...Tests/Utils/TimescaleMigrationsFixture.cs
diff --git a/...ils/TimescaleMigrationsTestInterceptor.cs → ...ils/TimescaleMigrationsTestInterceptor.cs b/...ils/TimescaleMigrationsTestInterceptor.cs → ...ils/TimescaleMigrationsTestInterceptor.cs
diff --git a/...tionalTests/Utils/TimescaleTestHelpers.cs → ...esign.Tests/Utils/TimescaleTestHelpers.cs b/...tionalTests/Utils/TimescaleTestHelpers.cs → ...esign.Tests/Utils/TimescaleTestHelpers.cs
diff --git a/...nctionalTests/Utils/TimescaleTestStore.cs → ....Design.Tests/Utils/TimescaleTestStore.cs b/...nctionalTests/Utils/TimescaleTestStore.cs → ....Design.Tests/Utils/TimescaleTestStore.cs
diff --git a/...lTests/Utils/TimescaleTestStoreFactory.cs → ....Tests/Utils/TimescaleTestStoreFactory.cs b/...lTests/Utils/TimescaleTestStoreFactory.cs → ....Tests/Utils/TimescaleTestStoreFactory.cs
diff --git a/...tors/HypertableOperationGeneratorTests.cs → ...tors/HypertableOperationGeneratorTests.cs b/...tors/HypertableOperationGeneratorTests.cs → ...tors/HypertableOperationGeneratorTests.cs
diff --git a/...s/ReorderPolicyOperationGeneratorTests.cs → ...s/ReorderPolicyOperationGeneratorTests.cs b/...s/ReorderPolicyOperationGeneratorTests.cs → ...s/ReorderPolicyOperationGeneratorTests.cs
diff --git a/...Tests/Generators/SqlBuilderHelperTests.cs → ...Tests/Generators/SqlBuilderHelperTests.cs b/...Tests/Generators/SqlBuilderHelperTests.cs → ...Tests/Generators/SqlBuilderHelperTests.cs
diff --git a/...on/ContinuousAggregateIntegrationTests.cs → ...on/ContinuousAggregateIntegrationTests.cs b/...on/ContinuousAggregateIntegrationTests.cs → ...on/ContinuousAggregateIntegrationTests.cs
diff --git a/...ityFrameworkCore.TimescaleDB.Tests.csproj → ...imescaleDB.Tests/TimescaleDB.Tests.csproj b/...ityFrameworkCore.TimescaleDB.Tests.csproj → ...imescaleDB.Tests/TimescaleDB.Tests.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CmdScale.EntityFrameworkCore.TimescaleDB\CmdScale.EntityFrameworkCore.TimescaleDB.csproj" />
+    <ProjectReference Include="..\..\src\TimescaleDB\TimescaleDB.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Core.TimescaleDB.Tests/Utils/SqlHelper.cs → tests/TimescaleDB.Tests/Utils/SqlHelper.cs b/...Core.TimescaleDB.Tests/Utils/SqlHelper.cs → tests/TimescaleDB.Tests/Utils/SqlHelper.cs