Fix GetRestCatalogName dead code

Signed-off-by: sfc-gh-npuka <naisila.puka@snowflake.com>

Author: sfc-gh-npuka

pg_lake_iceberg/src/rest_catalog/rest_catalog.c

@@ -1549,8 +1549,9 @@ GetRestCatalogNamespace(Oid relationId)
  * subsequent ALTER SERVER ? ADD/SET catalog_name cannot silently
  * re-route an existing table to a different REST namespace.
  *
- * Read-only tables resolve from table option > server option, and
- * must have catalog_name set on one of them.
+ * Read-only tables always have catalog_name baked into their table
+ * options at CREATE TABLE time (inherited from the server option or
+ * defaulted to the database name).
  */
 char *
 GetRestCatalogName(Oid relationId)
@@ -1569,15 +1570,7 @@ GetRestCatalogName(Oid relationId)
 	if (catalogName != NULL)
 		return catalogName;
 
-	RestCatalogOptions *opts = GetRestCatalogOptionsForRelation(relationId);
-
-	if (opts->catalogName != NULL)
-		return opts->catalogName;
-
-	ereport(ERROR,
-			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			 errmsg("catalog_name is required for read-only REST catalog tables"),
-			 errhint("Set catalog_name on the table or the server.")));
+	elog(ERROR, "catalog_name missing on read-only REST catalog table %u", relationId);
 }
 
 

pg_lake_table/src/ddl/create_table.c

@@ -817,7 +817,19 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 
 		if (catalogNameProvided == NULL && hasExternalCatalogReadOnlyOption)
 		{
-			catalogName = get_database_name(MyDatabaseId);
+			if (hasRestCatalogOption)
+			{
+				char	   *catalogOptionValue =
+					GetStringOption(createStmt->options, "catalog", false);
+				RestCatalogOptions *opts =
+					ResolveRestCatalogOptions(catalogOptionValue);
+
+				catalogName = opts->catalogName ? pstrdup(opts->catalogName)
+					: get_database_name(MyDatabaseId);
+			}
+			else
+				catalogName = get_database_name(MyDatabaseId);
+
 			createStmt->options =
 				lappend(createStmt->options,
 						makeDefElem("catalog_name", (Node *) makeString(catalogName), -1));