sqlc-dev · kyleconroy · Dec 27, 2025 · Dec 27, 2025
diff --git a/lexer/lexer.go b/lexer/lexer.go
@@ -283,7 +283,9 @@ func (l *Lexer) readLineComment() Item {
 		sb.WriteRune(l.ch)
 		l.readChar()
 	}
-	return Item{Token: token.COMMENT, Value: sb.String(), Pos: pos}
+	// Strip trailing semicolon from comment - it's a statement terminator, not part of comment
+	text := strings.TrimRight(sb.String(), ";")
+	return Item{Token: token.COMMENT, Value: text, Pos: pos}
 }
 
 func (l *Lexer) readHashComment() Item {
@@ -297,7 +299,9 @@ func (l *Lexer) readHashComment() Item {
 		sb.WriteRune(l.ch)
 		l.readChar()
 	}
-	return Item{Token: token.COMMENT, Value: sb.String(), Pos: pos}
+	// Strip trailing semicolon from comment - it's a statement terminator, not part of comment
+	text := strings.TrimRight(sb.String(), ";")
+	return Item{Token: token.COMMENT, Value: text, Pos: pos}
 }
 
 // readUnicodeMinusComment reads from a unicode minus (U+2212) to the end of line or semicolon.

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -24,6 +24,15 @@ func normalizeWhitespace(s string) string {
 	return strings.TrimSpace(whitespaceRegex.ReplaceAllString(s, " "))
 }
 
+// normalizeForFormat normalizes SQL for format comparison by collapsing
+// whitespace and stripping trailing semicolons. This allows comparing
+// formatted output regardless of whether the original had trailing semicolons.
+func normalizeForFormat(s string) string {
+	normalized := normalizeWhitespace(s)
+	// Strip trailing semicolon if present
+	return strings.TrimSuffix(normalized, ";")
+}
+
 // checkSkipped runs skipped todo tests to see which ones now pass.
 // Use with: go test ./parser -check-skipped -v
 var checkSkipped = flag.Bool("check-skipped", false, "Run skipped todo tests to see which ones now pass")
@@ -191,9 +200,9 @@ func TestParser(t *testing.T) {
 			if !metadata.TodoFormat || *checkFormat {
 				formatted := parser.Format(stmts)
 				expected := strings.TrimSpace(query)
-				// Compare with whitespace normalization to ignore formatting differences
-				formattedNorm := normalizeWhitespace(formatted)
-				expectedNorm := normalizeWhitespace(expected)
+				// Compare with format normalization (whitespace + trailing semicolons)
+				formattedNorm := normalizeForFormat(formatted)
+				expectedNorm := normalizeForFormat(expected)
 				if formattedNorm != expectedNorm {
 					if metadata.TodoFormat {
 						if *checkFormat {

diff --git a/parser/testdata/00001_count_hits/metadata.json b/parser/testdata/00001_count_hits/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00001_select_1/metadata.json b/parser/testdata/00001_select_1/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00002_count_visits/metadata.json b/parser/testdata/00002_count_visits/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00003_reinterpret_as_string/metadata.json b/parser/testdata/00003_reinterpret_as_string/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00005_filtering/metadata.json b/parser/testdata/00005_filtering/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00006_agregates/metadata.json b/parser/testdata/00006_agregates/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00008_array_join/metadata.json b/parser/testdata/00008_array_join/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00008_uniq/metadata.json b/parser/testdata/00008_uniq/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00009_uniq_distributed/metadata.json b/parser/testdata/00009_uniq_distributed/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00011_sorting/metadata.json b/parser/testdata/00011_sorting/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00012_sorting_distributed/metadata.json b/parser/testdata/00012_sorting_distributed/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00013_sorting_of_nested/metadata.json b/parser/testdata/00013_sorting_of_nested/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00014_filtering_arrays/metadata.json b/parser/testdata/00014_filtering_arrays/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00015_totals_and_no_aggregate_functions/metadata.json b/parser/testdata/00015_totals_and_no_aggregate_functions/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00015_totals_having_constants/metadata.json b/parser/testdata/00015_totals_having_constants/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00016_any_if_distributed_cond_always_false/metadata.json b/parser/testdata/00016_any_if_distributed_cond_always_false/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00016_totals_having_constants/metadata.json b/parser/testdata/00016_totals_having_constants/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00023_agg_select_agg_subquery/metadata.json b/parser/testdata/00023_agg_select_agg_subquery/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00030_array_enumerate_uniq/metadata.json b/parser/testdata/00030_array_enumerate_uniq/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00032_fixed_string_to_string/metadata.json b/parser/testdata/00032_fixed_string_to_string/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00033_fixed_string_to_string/metadata.json b/parser/testdata/00033_fixed_string_to_string/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00034_fixed_string_to_number/metadata.json b/parser/testdata/00034_fixed_string_to_number/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00041_aggregation_remap/metadata.json b/parser/testdata/00041_aggregation_remap/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00042_set/metadata.json b/parser/testdata/00042_set/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00048_min_max/metadata.json b/parser/testdata/00048_min_max/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00049_max_string_if/metadata.json b/parser/testdata/00049_max_string_if/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00050_min_max/metadata.json b/parser/testdata/00050_min_max/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00051_min_max_array/metadata.json b/parser/testdata/00051_min_max_array/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00059_merge_sorting_empty_array_joined/metadata.json b/parser/testdata/00059_merge_sorting_empty_array_joined/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00060_date_lut/metadata.json b/parser/testdata/00060_date_lut/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00066_sorting_distributed_many_replicas/metadata.json b/parser/testdata/00066_sorting_distributed_many_replicas/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00142_system_columns/metadata.json b/parser/testdata/00142_system_columns/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00154_shard_distributed_with_distinct/metadata.json b/parser/testdata/00154_shard_distributed_with_distinct/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/00292_parser_tuple_element/metadata.json b/parser/testdata/00292_parser_tuple_element/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/01072_select_constant_limit/metadata.json b/parser/testdata/01072_select_constant_limit/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/01097_pre_limit/metadata.json b/parser/testdata/01097_pre_limit/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/01295_aggregation_bug_11413/metadata.json b/parser/testdata/01295_aggregation_bug_11413/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/01514_tid_function/metadata.json b/parser/testdata/01514_tid_function/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/02095_function_get_os_kernel_version/metadata.json b/parser/testdata/02095_function_get_os_kernel_version/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/02233_with_total_empty_chunk/metadata.json b/parser/testdata/02233_with_total_empty_chunk/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/02532_profileevents_server_startup_time/metadata.json b/parser/testdata/02532_profileevents_server_startup_time/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/02921_fuzzbits_with_array_join/metadata.json b/parser/testdata/02921_fuzzbits_with_array_join/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/03032_multi_search_const_low_cardinality/metadata.json b/parser/testdata/03032_multi_search_const_low_cardinality/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/03237_get_subcolumn_low_cardinality_column/metadata.json b/parser/testdata/03237_get_subcolumn_low_cardinality_column/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/03299_map_named_tuple/metadata.json b/parser/testdata/03299_map_named_tuple/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/03525_timezoneof_illegal_type/metadata.json b/parser/testdata/03525_timezoneof_illegal_type/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}
diff --git a/parser/testdata/03549_system_dimensional_metrics/metadata.json b/parser/testdata/03549_system_dimensional_metrics/metadata.json
@@ -1 +1 @@
-{"todo_format":true}
+{}