fix: properly quote compression queries

Author: towner-10

src/Eftdb/Generators/HypertableOperationGenerator.cs

@@ -65,13 +65,13 @@ public List<string> Generate(CreateHypertableOperation operation)
 
             if (hasSegmentBy)
             {
-                string segmentList = string.Join(", ", operation.CompressionSegmentBy!);
+                string segmentList = string.Join(", ", operation.CompressionSegmentBy!.Select(QuoteIdentifier));
                 compressionSettings.Add($"timescaledb.compress_segmentby = '{segmentList}'");
             }
 
             if (hasOrderBy)
             {
-                string orderList = string.Join(", ", operation.CompressionOrderBy!);
+                string orderList = QuoteOrderByList(operation.CompressionOrderBy!);
                 compressionSettings.Add($"timescaledb.compress_orderby = '{orderList}'");
             }
 
@@ -176,17 +176,16 @@ static bool ListsChanged(IReadOnlyList<string>? oldList, IReadOnlyList<string>?
 
             if (ListsChanged(operation.OldCompressionSegmentBy, operation.CompressionSegmentBy))
             {
-                // If list is null/empty, set to '' to clear setting in DB
                 string val = (operation.CompressionSegmentBy?.Count > 0)
-                    ? $"'{string.Join(", ", operation.CompressionSegmentBy)}'"
+                    ? $"'{string.Join(", ", operation.CompressionSegmentBy.Select(QuoteIdentifier))}'"
                     : "''";
                 compressionSettings.Add($"timescaledb.compress_segmentby = {val}");
             }
 
             if (ListsChanged(operation.OldCompressionOrderBy, operation.CompressionOrderBy))
             {
                 string val = (operation.CompressionOrderBy?.Count > 0)
-                    ? $"'{string.Join(", ", operation.CompressionOrderBy)}'"
+                    ? $"'{QuoteOrderByList(operation.CompressionOrderBy)}'"
                     : "''";
                 compressionSettings.Add($"timescaledb.compress_orderby = {val}");
             }
@@ -304,5 +303,31 @@ private static string WrapCommunityFeatures(List<string> sqlStatements)
 
             return sb.ToString();
         }
+
+        /// <summary>
+        /// Wraps an identifier in double quotes to preserve case-sensitivity in Postgres.
+        /// Escapes existing double quotes.
+        /// Example: TenantId -> "TenantId"
+        /// </summary>
+        private static string QuoteIdentifier(string identifier)
+        {
+            return $"\"{identifier.Replace("\"", "\"\"")}\"";
+        }
+
+        /// <summary>
+        /// Quotes the column name within an ORDER BY clause while preserving direction/nulls.
+        /// Example: Timestamp DESC -> "Timestamp" DESC
+        /// </summary>
+        private static string QuoteOrderByList(IEnumerable<string> orderByClauses)
+        {
+            return string.Join(", ", orderByClauses.Select(clause =>
+            {
+                var parts = clause.Split(' ', 2);
+                string col = parts[0];
+                string suffix = parts.Length > 1 ? " " + parts[1] : "";
+
+                return QuoteIdentifier(col) + suffix;
+            }));
+        }
     }
 }

tests/Eftdb.Tests/Generators/HypertableOperationGeneratorComprehensiveTests.cs

@@ -374,7 +374,6 @@ public void DesignTime_Create_WithCompressionSegmentBy_GeneratesCorrectCode()
                 CompressionSegmentBy = ["tenant_id", "device_id"]
             };
 
-            // Expected: compress=true AND compress_segmentby='tenant_id, device_id'
             string expected = @".Sql(@""
                 SELECT create_hypertable('public.""""segmented_data""""', 'time');
                 DO $$
@@ -384,7 +383,7 @@ public void DesignTime_Create_WithCompressionSegmentBy_GeneratesCorrectCode()
                     license := current_setting('timescaledb.license', true);
 
                     IF license IS NULL OR license != 'apache' THEN
-                        EXECUTE 'ALTER TABLE """"public"""".""""segmented_data"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''tenant_id, device_id'')';
+                        EXECUTE 'ALTER TABLE """"public"""".""""segmented_data"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''""tenant_id"", ""device_id""'')';
                     ELSE
                         RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Apache Edition';
                     END IF;
@@ -419,7 +418,7 @@ public void DesignTime_Create_WithCompressionOrderBy_GeneratesCorrectCode()
                     license := current_setting('timescaledb.license', true);
 
                     IF license IS NULL OR license != 'apache' THEN
-                        EXECUTE 'ALTER TABLE """"public"""".""""ordered_data"""" SET (timescaledb.compress = true, timescaledb.compress_orderby = ''time DESC, value ASC NULLS LAST'')';
+                        EXECUTE 'ALTER TABLE """"public"""".""""ordered_data"""" SET (timescaledb.compress = true, timescaledb.compress_orderby = ''""time"" DESC, ""value"" ASC NULLS LAST'')';
                     ELSE
                         RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Apache Edition';
                     END IF;
@@ -453,10 +452,9 @@ public void Runtime_Create_WithFullCompressionSettings_GeneratesUnifiedAlter()
 
             // Assert
             Assert.Contains("ALTER TABLE \"public\".\"full_compression\" SET", result);
-            // Must contain all settings in one statement
             Assert.Contains("timescaledb.compress = true", result);
-            Assert.Contains("timescaledb.compress_segmentby = ''tenant_id''", result);
-            Assert.Contains("timescaledb.compress_orderby = ''time DESC''", result);
+            Assert.Contains("timescaledb.compress_segmentby = ''\"tenant_id\"''", result);
+            Assert.Contains("timescaledb.compress_orderby = ''\"time\" DESC''", result);
         }
 
         #endregion
@@ -864,7 +862,7 @@ public void DesignTime_Alter_AddingCompressionSegmentBy_GeneratesCorrectCode()
                     license := current_setting('timescaledb.license', true);
 
                     IF license IS NULL OR license != 'apache' THEN
-                        EXECUTE 'ALTER TABLE """"public"""".""""metrics"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''device_id'')';
+                        EXECUTE 'ALTER TABLE """"public"""".""""metrics"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''""device_id""'')';
                     ELSE
                         RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Apache Edition';
                     END IF;
@@ -897,7 +895,7 @@ public void Runtime_Alter_ChangingCompressionOrderBy_GeneratesCorrectSQL()
             // Assert
             // Note: EnableCompression=true is NOT generated if it hasn't changed state (implicit false->false or true->true)
             // But we do expect the update to the specific setting.
-            Assert.Contains("timescaledb.compress_orderby = ''time DESC''", result);
+            Assert.Contains("timescaledb.compress_orderby = ''\"time\" DESC''", result);
         }
 
         [Fact]
@@ -970,7 +968,7 @@ public void Runtime_Alter_ComplexCompressionUpdate_GeneratesUnifiedAlter()
             // Assert
             // Should be a single ALTER TABLE statement with 3 settings
             Assert.Contains("ALTER TABLE \"public\".\"metrics\" SET", result);
-            Assert.Contains("timescaledb.compress_segmentby = ''new_col''", result);
+            Assert.Contains("timescaledb.compress_segmentby = ''\"new_col\"''", result);
             Assert.Contains("timescaledb.compress_orderby = ''''", result);
         }
 

tests/Eftdb.Tests/Generators/HypertableOperationGeneratorTests.cs

@@ -187,7 +187,7 @@ public void Generate_Create_With_Compression_Segment_And_OrderBy_Generates_Corre
                     license := current_setting('timescaledb.license', true);
 
                     IF license IS NULL OR license != 'apache' THEN
-                        EXECUTE 'ALTER TABLE """"public"""".""""CompressedTable"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''TenantId, DeviceId'', timescaledb.compress_orderby = ''Timestamp DESC, Value ASC NULLS LAST'')';
+                        EXECUTE 'ALTER TABLE """"public"""".""""CompressedTable"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''""TenantId"", ""DeviceId""'', timescaledb.compress_orderby = ''""Timestamp"" DESC, ""Value"" ASC NULLS LAST'')';
                     ELSE
                         RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Apache Edition';
                     END IF;
@@ -222,7 +222,7 @@ public void Generate_Alter_Adding_Compression_SegmentBy_Generates_Correct_Sql()
                     license := current_setting('timescaledb.license', true);
 
                     IF license IS NULL OR license != 'apache' THEN
-                        EXECUTE 'ALTER TABLE """"public"""".""""Metrics"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''DeviceId'')';
+                        EXECUTE 'ALTER TABLE """"public"""".""""Metrics"""" SET (timescaledb.compress = true, timescaledb.compress_segmentby = ''""DeviceId""'')';
                     ELSE
                         RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Apache Edition';
                     END IF;
@@ -257,7 +257,7 @@ public void Generate_Alter_Modifying_Compression_OrderBy_Generates_Correct_Sql()
                     license := current_setting('timescaledb.license', true);
 
                     IF license IS NULL OR license != 'apache' THEN
-                        EXECUTE 'ALTER TABLE """"public"""".""""Metrics"""" SET (timescaledb.compress_orderby = ''Timestamp DESC'')';
+                        EXECUTE 'ALTER TABLE """"public"""".""""Metrics"""" SET (timescaledb.compress_orderby = ''""Timestamp"" DESC'')';
                     ELSE
                         RAISE WARNING 'Skipping Community Edition features (compression, chunk skipping) - not available in Apache Edition';
                     END IF;