Merge #145221 #145354

145221: parser,scanner: fix bugs with parsing and scanning sql comments r=kyle-a-wong a=kyle-a-wong

Fixes a bug in the parser where retained comments are mistakenly added to multiple statements. This when parsing a multi-statement sql containing strings with the "retainComments" bool set to true. In this case, comments in a statement are propogated to subsequent statements in the same parse.

Fixes a bug where `\n` characters are included in scanned singe- line comments. Now, these wont be included in comments and will instead be stripped out via the skipWhitespace function.

Epic: None
Release note: None

145354: logictest: enable local-mixed-25.2 config r=miraradeva a=miraradeva

**bootstrap: add 25.2 bootstrap data**

Obtained by running (on release-25.2 branch):
```
./dev build sql-bootstrap-data && bin/sql-bootstrap-data
```

Epic: None
Release note: None

----

**logictest: enable local-mixed-25.2 config**

Added `local-mixed-25.2` logictests.

Epic: None
Release note: None

Co-authored-by: Kyle Wong <[email protected]>
Co-authored-by: Mira Radeva <[email protected]>

Author: 3 people

pkg/BUILD.bazel

@@ -61,6 +61,7 @@ ALL_TESTS = [
     "//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
     "//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
     "//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
@@ -508,6 +509,7 @@ ALL_TESTS = [
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/sql/logictest/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -526,6 +528,7 @@ ALL_TESTS = [
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder_test",
@@ -631,6 +634,7 @@ ALL_TESTS = [
     "//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
@@ -961,6 +965,7 @@ GO_TARGETS = [
     "//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
     "//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
     "//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
@@ -2032,6 +2037,7 @@ GO_TARGETS = [
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/sql/logictest/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -2059,6 +2065,7 @@ GO_TARGETS = [
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder",
@@ -2312,6 +2319,7 @@ GO_TARGETS = [
     "//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-24.3:local-mixed-24_3_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-25.1:local-mixed-25_1_test",
+    "//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",

pkg/ccl/logictestccl/tests/local-mixed-25.2/BUILD.bazel

@@ -0,0 +1,28 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "local-mixed-25_2_test",
+    size = "enormous",
+    srcs = ["generated_test.go"],
+    data = [
+        "//c-deps:libgeos",  # keep
+        "//pkg/ccl/logictestccl:testdata",  # keep
+    ],
+    exec_properties = {"test.Pool": "large"},
+    shard_count = 33,
+    tags = ["cpu:1"],
+    deps = [
+        "//pkg/base",
+        "//pkg/build/bazel",
+        "//pkg/ccl",
+        "//pkg/security/securityassets",
+        "//pkg/security/securitytest",
+        "//pkg/server",
+        "//pkg/sql/logictest",
+        "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
+        "//pkg/testutils/testcluster",
+        "//pkg/util/leaktest",
+        "//pkg/util/randutil",
+    ],
+)