From fe8a951818cc311d300a68083787be02bb63f1b7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 08:06:49 +0000
Subject: [PATCH] feat(frontend): add prerequisite feats for fdw (#15911)
 (#15957)

Co-authored-by: Kexiang Wang <kx.wang@hotmail.com>
---
 e2e_test/batch/transaction/read_only.slt      | 38 +++++++++++++++++++
 .../system_catalog/pg_catalog/pg_attribute.rs |  4 +-
 src/frontend/src/handler/transaction.rs       | 32 +++++++++++-----
 3 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/e2e_test/batch/transaction/read_only.slt b/e2e_test/batch/transaction/read_only.slt
index 004f9d1de6eab..f0738dcd75045 100644
--- a/e2e_test/batch/transaction/read_only.slt
+++ b/e2e_test/batch/transaction/read_only.slt
@@ -56,6 +56,44 @@ select * from t;
 2
 3
 
+# test transaction with ISOLATION LEVEL
+statement ok
+START TRANSACTION READ ONLY, ISOLATION LEVEL REPEATABLE READ;
+
+statement ok
+COMMIT;
+
+# test read-write transaction
+statement ok
+START TRANSACTION READ WRITE;
+
+statement ok
+COMMIT;
+
+# test read-write transaction, with ISOLATION LEVEL
+statement ok
+START TRANSACTION READ WRITE, ISOLATION LEVEL REPEATABLE READ;
+
+query I rowsort
+select * from t;
+----
+1
+2
+3
+
+statement error read-only transaction
+insert into t values (4);
+
+query I rowsort
+select * from t;
+----
+1
+2
+3
+
+statement ok
+COMMIT;
+
 statement ok
 drop table t;
 
diff --git a/src/frontend/src/catalog/system_catalog/pg_catalog/pg_attribute.rs b/src/frontend/src/catalog/system_catalog/pg_catalog/pg_attribute.rs
index e2534a6dbc592..8ff8bbe47e00d 100644
--- a/src/frontend/src/catalog/system_catalog/pg_catalog/pg_attribute.rs
+++ b/src/frontend/src/catalog/system_catalog/pg_catalog/pg_attribute.rs
@@ -35,7 +35,8 @@ use risingwave_frontend_macro::system_catalog;
             false AS attisdropped,
             ''::varchar AS attidentity,
             ''::varchar AS attgenerated,
-            -1 AS atttypmod
+            -1 AS atttypmod,
+            0 AS attcollation
         FROM rw_catalog.rw_columns c
         WHERE c.is_hidden = false"
 )]
@@ -52,4 +53,5 @@ struct PgAttribute {
     attidentity: String,
     attgenerated: String,
     atttypmod: i32,
+    attcollation: i32,
 }
diff --git a/src/frontend/src/handler/transaction.rs b/src/frontend/src/handler/transaction.rs
index 8ab7af36c29ca..7075d0d6b5267 100644
--- a/src/frontend/src/handler/transaction.rs
+++ b/src/frontend/src/handler/transaction.rs
@@ -34,6 +34,7 @@ pub async fn handle_begin(
     modes: Vec<TransactionMode>,
 ) -> Result<RwPgResponse> {
     let HandlerArgs { session, .. } = handler_args;
+    let mut notices = vec![];
 
     let access_mode = {
         let mut access_mode = None;
@@ -42,7 +43,14 @@ pub async fn handle_begin(
                 TransactionMode::AccessMode(mode) => {
                     let _ = access_mode.replace(mode);
                 }
-                TransactionMode::IsolationLevel(_) => not_impl!("ISOLATION LEVEL"),
+                TransactionMode::IsolationLevel(_) => {
+                    // Note: This is for compatibility with some external drivers (like postgres_fdw) that
+                    // always start a transaction with an Isolation Level.
+                    const MESSAGE: &str = "\
+                    Transaction with given Isolation Level is not supported yet.\n\
+                    For compatibility, this statement will still proceed with RepeatableRead.";
+                    notices.push(MESSAGE);
+                }
             }
         }
 
@@ -50,21 +58,27 @@ pub async fn handle_begin(
             Some(TransactionAccessMode::ReadOnly) => AccessMode::ReadOnly,
             Some(TransactionAccessMode::ReadWrite) | None => {
                 // Note: This is for compatibility with some external drivers (like psycopg2) that
-                // issue `BEGIN` implicitly for users. Not actually starting a transaction is okay
-                // since `COMMIT` and `ROLLBACK` are no-ops (except for warnings) when there is no
-                // active transaction.
+                // issue `BEGIN` implicitly for users.
                 const MESSAGE: &str = "\
                     Read-write transaction is not supported yet. Please specify `READ ONLY` to start a read-only transaction.\n\
-                    For compatibility, this statement will still succeed but no transaction is actually started.";
-
-                return Ok(RwPgResponse::builder(stmt_type).notice(MESSAGE).into());
+                    For compatibility, this statement will still succeed and be executed as Read-only transactions.\n\
+                    The write operations in this transaction will be rejected.";
+                notices.push(MESSAGE);
+                AccessMode::ReadOnly
             }
         }
     };
 
     session.txn_begin_explicit(access_mode);
-
-    Ok(RwPgResponse::empty_result(stmt_type))
+    if notices.is_empty() {
+        Ok(RwPgResponse::empty_result(stmt_type))
+    } else {
+        let mut builder = RwPgResponse::builder(stmt_type);
+        for notice in notices {
+            builder = builder.notice(notice);
+        }
+        Ok(builder.into())
+    }
 }
 
 #[expect(clippy::unused_async)]