logictest: Add and plumb ParsingPreset CLI flag

Follow-up to 9714 to allow running certain tests
with the ParsingPreset CLI/env var.

Change-Id: I3896f2ee53e594b0955b5056fa67eeb7a2ed95f7
Reviewed-on: https://gerrit.readyset.name/c/readyset/+/9729
Tested-by: Buildkite CI
Reviewed-by: Michael Zink <michael.z@readyset.io>

Author: MohamedAbdeen-rs

.buildkite/pipeline.public-common.yml

@@ -224,8 +224,7 @@ steps:
       - 'cargo --locked run --bin readyset-logictest -- verify logictests/replicated/psql --database-type postgresql --replication-url postgresql://postgres:noria@postgres/noria'
       - 'cargo --locked run --bin readyset-logictest -- verify logictests/replicated/postgis --database-type postgresql --replication-url postgresql://postgres:noria@postgres/noria'
       - 'cargo --locked run --bin readyset-logictest -- verify logictests/replicated/mysql --database-type mysql --replication-url mysql://root:noria@mysql/noria'
-      # TODO: Re-enable once --parsing-preset flag is implemented for logictests
-      # - 'cargo --locked run --bin readyset-logictest --features readyset-sql-parsing/sqlparser -- verify logictests/sqlparser'
+      - 'cargo --locked run --bin readyset-logictest -- verify logictests/sqlparser --parsing-preset=only-sqlparser'
     timeout_in_minutes: 60
     plugins:
       - docker-compose#${DOCKER_COMPOSE_PLUGIN_VERSION}:

readyset-logictest/src/main.rs

@@ -21,6 +21,7 @@ use proptest::strategy::Strategy;
 use proptest::test_runner::{self, TestCaseError, TestError, TestRng, TestRunner};
 use query_generator::{QueryOperationArgs, QuerySeed};
 use readyset_client::consensus::AuthorityType;
+use readyset_sql_parsing::ParsingPreset;
 use readyset_tracing::init_test_logging;
 use serde_json::json;
 use tokio::sync::Mutex;
@@ -262,6 +263,15 @@ struct Verify {
     #[arg(long)]
     replication_url: Option<String>,
 
+    #[arg(
+        long,
+        env = "PARSING_PRESET",
+        value_enum,
+        default_value = "both-prefer-nom",
+        hide = true
+    )]
+    parsing_preset: ParsingPreset,
+
     /// Type of database to use for the adapter.
     ///
     /// Ignored if --database-url is passed, must match the database type of --replication-url if
@@ -540,6 +550,7 @@ impl From<&Verify> for RunOptions {
             database_type: verify.database_type,
             enable_reuse: verify.enable_reuse,
             upstream_database_url: verify.database_url().cloned(),
+            parsing_preset: verify.parsing_preset,
             replication_url: verify.replication_url.clone(),
             time: verify.time,
             verbose: verify.verbose,

readyset-logictest/src/runner.rs

@@ -30,6 +30,7 @@ use readyset_psql::{PostgreSqlQueryHandler, PostgreSqlUpstream};
 use readyset_server::{Builder, LocalAuthority, ReuseConfigType};
 use readyset_sql::ast::Relation;
 use readyset_sql::Dialect;
+use readyset_sql_parsing::ParsingPreset;
 use readyset_util::retry_with_exponential_backoff;
 use readyset_util::shared_cache::SharedCache;
 use readyset_util::shutdown::ShutdownSender;
@@ -90,6 +91,7 @@ pub struct RunOptions {
     pub database_type: DatabaseType,
     pub upstream_database_url: Option<DatabaseURL>,
     pub replication_url: Option<String>,
+    pub parsing_preset: ParsingPreset,
     pub enable_reuse: bool,
     pub time: bool,
     pub verbose: bool,
@@ -103,6 +105,7 @@ impl Default for RunOptions {
             time: false,
             replication_url: None,
             database_type: DatabaseType::MySQL,
+            parsing_preset: ParsingPreset::for_tests(),
             verbose: false,
         }
     }
@@ -540,6 +543,7 @@ impl TestScript {
             builder.set_straddled_joins(true);
             builder.set_post_lookup(true);
             builder.set_topk(false); // TODO: fails on generated tests
+            builder.set_parsing_preset(run_opts.parsing_preset);
 
             if run_opts.enable_reuse {
                 builder.set_reuse(Some(ReuseConfigType::Finkelstein))
@@ -603,6 +607,7 @@ impl TestScript {
 
         let adapter_rewrite_params = rh.adapter_rewrite_params().await.unwrap();
         let adapter_start_time = SystemTime::now();
+        let parsing_preset = run_opts.parsing_preset;
 
         let task = tokio::spawn(async move {
             let (s, _) = listener.accept().await.unwrap();
@@ -661,6 +666,7 @@ impl TestScript {
                     BackendBuilder::new()
                         .require_authentication(false)
                         .dialect($dialect)
+                        .parsing_preset(parsing_preset)
                         .build::<_, $handler>(
                             noria,
                             upstream,