Remove use_prepared_statements from MySqlOptions (#41409)

This parameter was not used because use_prepared_statements is decided by the MySqlPool, not the MySqlPersistence.

GitOrigin-RevId: 04eeaf99aabf7ff2b1653a36866493de8db6175d

Author: goffrie

crates/db_connection/src/lib.rs

@@ -103,15 +103,14 @@ pub async fn connect_persistence<RT: Runtime>(
                     let options = MySqlOptions {
                         allow_read_only: flags.allow_read_only,
                         version,
-                        use_prepared_statements: *DATABASE_USE_PREPARED_STATEMENTS,
                         multitenant,
                         instance_name: instance_name.into(),
                     };
                     let persistence = Arc::new(
                         MySqlPersistence::new(
                             Arc::new(ConvexMySqlPool::new(
                                 &url,
-                                options.use_prepared_statements,
+                                *DATABASE_USE_PREPARED_STATEMENTS,
                                 Some(runtime),
                             )?),
                             db_name.clone(),

crates/mysql/src/lib.rs

@@ -177,7 +177,6 @@ pub enum ConnectError {
 pub struct MySqlOptions {
     pub allow_read_only: bool,
     pub version: PersistenceVersion,
-    pub use_prepared_statements: bool,
     pub instance_name: MySqlInstanceName,
     pub multitenant: bool,
 }

crates/mysql/src/tests.rs

@@ -58,7 +58,6 @@ run_persistence_test_suite!(
         MySqlOptions {
             allow_read_only: false,
             version: PersistenceVersion::V5,
-            use_prepared_statements: true,
             instance_name: "test".into(),
             multitenant: false,
         },
@@ -75,7 +74,6 @@ run_persistence_test_suite!(
         MySqlOptions {
             allow_read_only: true,
             version: PersistenceVersion::V5,
-            use_prepared_statements: true,
             instance_name: "test".into(),
             multitenant: false,
         },
@@ -99,7 +97,6 @@ mod multitenant {
             MySqlOptions {
                 allow_read_only: false,
                 version: PersistenceVersion::V5,
-                use_prepared_statements: true,
                 instance_name: "test".into(),
                 multitenant: true,
             },
@@ -116,7 +113,6 @@ mod multitenant {
             MySqlOptions {
                 allow_read_only: true,
                 version: PersistenceVersion::V5,
-                use_prepared_statements: true,
                 instance_name: "test".into(),
                 multitenant: true,
             },
@@ -143,7 +139,6 @@ mod raw_statements {
             MySqlOptions {
                 allow_read_only: false,
                 version: PersistenceVersion::V5,
-                use_prepared_statements: false,
                 instance_name: "test".into(),
                 multitenant: false
             },
@@ -160,7 +155,6 @@ mod raw_statements {
             MySqlOptions {
                 allow_read_only: true,
                 version: PersistenceVersion::V5,
-                use_prepared_statements: false,
                 instance_name: "test".into(),
                 multitenant: false
             },
@@ -175,15 +169,14 @@ async fn test_loading_locally() -> anyhow::Result<()> {
     let options = MySqlOptions {
         allow_read_only: false,
         version: PersistenceVersion::V5,
-        use_prepared_statements: false,
         instance_name: "test".into(),
         multitenant: false,
     };
     let opts = crate::itest::new_db_opts().await?;
     let persistence = MySqlPersistence::new(
         Arc::new(ConvexMySqlPool::new(
             &opts.url.clone(),
-            options.use_prepared_statements,
+            false, /* use_prepared_statements */
             Option::<ProdRuntime>::None,
         )?),
         opts.db_name,
@@ -225,15 +218,14 @@ async fn test_writing_locally() -> anyhow::Result<()> {
     let options = MySqlOptions {
         allow_read_only: false,
         version: PersistenceVersion::V5,
-        use_prepared_statements: false,
         instance_name: "test".into(),
         multitenant: false,
     };
     let opts = crate::itest::new_db_opts().await?;
     let persistence = MySqlPersistence::new(
         Arc::new(ConvexMySqlPool::new(
             &opts.url.clone(),
-            options.use_prepared_statements,
+            false, /* use_prepared_statements */
             Option::<ProdRuntime>::None,
         )?),
         opts.db_name,
@@ -290,15 +282,14 @@ async fn test_lease_preempt() -> anyhow::Result<()> {
     let options = MySqlOptions {
         allow_read_only: false,
         version: PersistenceVersion::V5,
-        use_prepared_statements: false,
         instance_name: "test".into(),
         multitenant: false,
     };
     let p1 = Arc::new(
         MySqlPersistence::new(
             Arc::new(ConvexMySqlPool::new(
                 &opts.url.clone(),
-                options.use_prepared_statements,
+                false, /* use_prepared_statements */
                 Option::<ProdRuntime>::None,
             )?),
             opts.db_name.clone(),
@@ -332,15 +323,14 @@ async fn test_lease_preempt() -> anyhow::Result<()> {
     let options = MySqlOptions {
         allow_read_only: false,
         version: PersistenceVersion::V5,
-        use_prepared_statements: false,
         instance_name: "test".into(),
         multitenant: false,
     };
     let p2 = Arc::new(
         MySqlPersistence::new(
             Arc::new(ConvexMySqlPool::new(
                 &opts.url.clone(),
-                options.use_prepared_statements,
+                false, /* use_prepared_statements */
                 Option::<ProdRuntime>::None,
             )?),
             opts.db_name,
@@ -391,15 +381,14 @@ async fn test_table_count() -> anyhow::Result<()> {
     let options = MySqlOptions {
         allow_read_only: false,
         version: PersistenceVersion::V5,
-        use_prepared_statements: false,
         instance_name: "test".into(),
         multitenant: false,
     };
     let opts = crate::itest::new_db_opts().await?;
     let persistence = MySqlPersistence::new(
         Arc::new(ConvexMySqlPool::new(
             &opts.url.clone(),
-            options.use_prepared_statements,
+            false, /* use_prepared_statements */
             Option::<ProdRuntime>::None,
         )?),
         opts.db_name,
@@ -422,15 +411,14 @@ async fn test_max_system_size_value() -> anyhow::Result<()> {
     let options = MySqlOptions {
         allow_read_only: false,
         version: PersistenceVersion::V5,
-        use_prepared_statements: false,
         instance_name: "test".into(),
         multitenant: false,
     };
     let opts = crate::itest::new_db_opts().await?;
     let persistence = MySqlPersistence::new(
         Arc::new(ConvexMySqlPool::new(
             &opts.url.clone(),
-            options.use_prepared_statements,
+            false, /* use_prepared_statements */
             Option::<ProdRuntime>::None,
         )?),
         opts.db_name,