From 68c81a766fc059d6625d21616cc0715c2c381bb3 Mon Sep 17 00:00:00 2001
From: Dennis Felsing <dennis@felsing.org>
Date: Fri, 17 Apr 2026 05:33:37 +0000
Subject: [PATCH] catalog: Better escaping of names

Follow-up to https://github.com/MaterializeInc/materialize/pull/35819
---
 src/catalog/src/builtin/builtin.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/catalog/src/builtin/builtin.rs b/src/catalog/src/builtin/builtin.rs
index 398db6dfb6fee..6930532672a3f 100644
--- a/src/catalog/src/builtin/builtin.rs
+++ b/src/catalog/src/builtin/builtin.rs
@@ -61,12 +61,15 @@ fn make_builtin_materialized_views<'a>(
             let create_sql = stmt.to_ast_string_stable();
             let create_sql = escaped_string_literal(&create_sql);
 
-            let cluster_name = stmt.in_cluster.expect("builtin MV has cluster");
+            let cluster_name = stmt.in_cluster.expect("builtin MV has cluster").to_string();
+            let cluster_name = escaped_string_literal(&cluster_name);
+            let schema = escaped_string_literal(mv.schema);
+            let name = escaped_string_literal(mv.name);
             let privileges = make_privileges_sql(&mv.access, &owner_priv);
 
             format!(
-                "({}::oid, '{}', '{}', '{}', {}, {}, {})",
-                mv.oid, mv.schema, mv.name, cluster_name, definition, privileges, create_sql
+                "({}::oid, {}, {}, {}, {}, {}, {})",
+                mv.oid, schema, name, cluster_name, definition, privileges, create_sql
             )
         })
         .join(",");