run INIT_SQL in a txn per statement (#38756)

GitOrigin-RevId: f6ba7d6936f038e7e904c046069100d627e00764

Author: gautamg795

crates/postgres/src/lib.rs

@@ -241,8 +241,9 @@ impl PostgresPersistence {
             }
             client
                 .with_retry(async |client| {
-                    client.batch_execute(INIT_SQL).await?;
-                    client.batch_execute(INIT_LEASE_SQL).await?;
+                    for stmt in INIT_SQL {
+                        client.batch_execute(stmt).await?;
+                    }
                     Ok(())
                 })
                 .await?;
@@ -1552,7 +1553,8 @@ const CREATE_SCHEMA_SQL: &str = r"CREATE SCHEMA IF NOT EXISTS @db_name;";
 // This runs (currently) every time a PostgresPersistence is created, so it
 // needs to not only be idempotent but not to affect any already-resident data.
 // IF NOT EXISTS and ON CONFLICT are helpful.
-const INIT_SQL: &str = r#"
+const INIT_SQL: &[&str] = &[
+    r#"
         CREATE TABLE IF NOT EXISTS @db_name.documents (
             id BYTEA NOT NULL,
             ts BIGINT NOT NULL,
@@ -1566,18 +1568,20 @@ const INIT_SQL: &str = r#"
 
             PRIMARY KEY (ts, table_id, id)
         );
+"#,
+    r#"
         CREATE INDEX IF NOT EXISTS documents_by_table_and_id ON @db_name.documents (
             table_id, id, ts
         );
         CREATE INDEX IF NOT EXISTS documents_by_table_ts_and_id ON @db_name.documents (
             table_id, ts, id
         );
-
+"#,
+    r#"
         CREATE TABLE IF NOT EXISTS @db_name.indexes (
             /* ids should be serialized as bytes but we keep it compatible with documents */
             index_id BYTEA NOT NULL,
             ts BIGINT NOT NULL,
-
             /*
             Postgres maximum primary key length is 2730 bytes, which
             is why we split up the key. The first 2500 bytes are stored in key_prefix,
@@ -1600,6 +1604,8 @@ const INIT_SQL: &str = r#"
             document_id BYTEA NULL,
             PRIMARY KEY (index_id, key_prefix, key_sha256, ts)
         );
+"#,
+    r#"
         /* This index with `ts DESC` enables our "loose index scan" queries
          * (i.e. `DISTINCT ON`) to run in both directions, complementing the
          * primary key's ts ASC ordering */
@@ -1609,27 +1615,33 @@ const INIT_SQL: &str = r#"
             key_sha256,
             ts DESC
         );
-
+"#,
+    r#"
         CREATE TABLE IF NOT EXISTS @db_name.leases (
             id BIGINT NOT NULL,
             ts BIGINT NOT NULL,
 
             PRIMARY KEY (id)
         );
+"#,
+    r#"
         CREATE TABLE IF NOT EXISTS @db_name.read_only (
             id BIGINT NOT NULL,
 
             PRIMARY KEY (id)
         );
+"#,
+    r#"
         CREATE TABLE IF NOT EXISTS @db_name.persistence_globals (
             key TEXT NOT NULL,
             json_value BYTEA NOT NULL,
             PRIMARY KEY (key)
-        );"#;
-// We also run this on every initialization, but separate it from INIT_SQL to
-// keep DDL and DML separate.
-const INIT_LEASE_SQL: &str =
-    "INSERT INTO @db_name.leases (id, ts) VALUES (1, 0) ON CONFLICT DO NOTHING;";
+            );
+        "#,
+    r#"
+        INSERT INTO @db_name.leases (id, ts) VALUES (1, 0) ON CONFLICT DO NOTHING;
+    "#,
+];
 const TABLES: &[&str] = &[
     "documents",
     "indexes",