Enable create table writable rest catalog

Signed-off-by: Onder KALACI <[email protected]>

Author: sfc-gh-okalaci

pg_lake_table/src/ddl/create_table.c

@@ -656,18 +656,19 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 
 	bool		hasRestCatalogOption = HasRestCatalogTableOption(createStmt->options);
 	bool		hasObjectStoreCatalogOption = HasObjectStoreCatalogTableOption(createStmt->options);
-	bool		hasExternalCatalogReadOnlyOption = HasReadOnlyOption(createStmt->options);
 
-	/*
-	 * Read-only external catalog tables are a special case of Iceberg tables.
-	 * They are recognized as Iceberg tables, but are not registered in any
-	 * internal catalogs (e.g., lake_iceberg.tables). Instead, the table is
-	 * created only in PostgreSQL’s system catalogs. When the table is
-	 * queried, its metadata is fetched on demand from the external catalog.
-	 */
-	if ((hasObjectStoreCatalogOption ||
-		 (hasRestCatalogOption && hasExternalCatalogReadOnlyOption)))
+	if (hasObjectStoreCatalogOption || hasRestCatalogOption)
 	{
+		/*
+		 * Read-only external catalog tables are a special case of Iceberg
+		 * tables. They are recognized as Iceberg tables, but are not
+		 * registered in any internal catalogs (e.g., lake_iceberg.tables).
+		 * Instead, the table is created only in PostgreSQL’s system
+		 * catalogs. When the table is queried, its metadata is fetched on
+		 * demand from the external catalog.
+		 */
+		bool		hasExternalCatalogReadOnlyOption = HasReadOnlyOption(createStmt->options);
+
 		char	   *metadataLocation = NULL;
 		char	   *catalogNamespace = NULL;
 		char	   *catalogTableName = NULL;
@@ -725,7 +726,7 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 			catalogName = catalogNameProvided;
 		}
 
-		if (hasRestCatalogOption)
+		if (hasRestCatalogOption && hasExternalCatalogReadOnlyOption)
 		{
 			ErrorIfRestNamespaceDoesNotExist(catalogName, catalogNamespace);
 
@@ -742,7 +743,7 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 																	   catalogTableName);
 		}
 
-		if (hasObjectStoreCatalogOption && !hasExternalCatalogReadOnlyOption)
+		if (!hasExternalCatalogReadOnlyOption)
 		{
 			/*
 			 * For writable object store catalog tables, we need to continue
@@ -757,11 +758,11 @@ ProcessCreateIcebergTableFromForeignTableStmt(ProcessUtilityParams * params)
 				catalogNameProvided != NULL)
 			{
 				ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-								errmsg("writable object store catalog iceberg tables do not "
-									   "allow explicit catalog options")));
+								errmsg("writable %s catalog iceberg tables do not "
+									   "allow explicit catalog options", hasObjectStoreCatalogOption ? "object store" : "REST")));
 			}
 		}
-		else if (createStmt->base.tableElts == NIL)
+		else if (createStmt->base.tableElts == NIL && hasExternalCatalogReadOnlyOption)
 		{
 			List	   *dataFileColumns =
 				DescribeColumnsFromIcebergMetadataURI(metadataLocation, false);

pg_lake_table/src/fdw/option.c

@@ -835,12 +835,6 @@ pg_lake_iceberg_validator(PG_FUNCTION_ARGS)
 		!readOnlyExternalCatalogTable)
 		icebergCatalogType = OBJECT_STORE_READ_WRITE;
 
-	if (catalog == ForeignTableRelationId &&
-		icebergCatalogType == REST_CATALOG_READ_WRITE)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("rest catalog iceberg tables are read only, use CREATE TABLE ... WITH (catalog = 'rest', read_only=true) to create a read-only table")));
-
 	if (catalog == ForeignTableRelationId && locationProvided == false &&
 		(icebergCatalogType == POSTGRES_CATALOG || icebergCatalogType == OBJECT_STORE_READ_WRITE))
 		ereport(ERROR,
@@ -857,8 +851,7 @@ pg_lake_iceberg_validator(PG_FUNCTION_ARGS)
 
 	if (catalog == ForeignTableRelationId)
 	{
-		if (icebergCatalogType == REST_CATALOG_READ_ONLY || icebergCatalogType == REST_CATALOG_READ_WRITE ||
-			icebergCatalogType == OBJECT_STORE_READ_ONLY)
+		if (icebergCatalogType == REST_CATALOG_READ_ONLY || icebergCatalogType == OBJECT_STORE_READ_ONLY)
 		{
 			/*
 			 * catalog_namespace, catalog_table_name and catalog_name is
@@ -887,17 +880,17 @@ pg_lake_iceberg_validator(PG_FUNCTION_ARGS)
 			if (catalogNamespace)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("\"catalog_namespace\" option is only valid for catalog=\"rest\"")));
+						 errmsg("\"catalog_namespace\" option is only valid for writable catalog=\"rest\"")));
 
 			if (catalogTableName)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("\"catalog_table_name\" option is only valid for catalog=\"rest\"")));
+						 errmsg("\"catalog_table_name\" option is only valid for writable catalog=\"rest\"")));
 
 			if (catalogName)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("\"catalog_name\" option is only valid for catalog=\"rest\"")));
+						 errmsg("\"catalog_name\" option is only valid for writable catalog=\"rest\"")));
 
 		}
 	}

pg_lake_table/tests/pytests/test_polaris_catalog.py

@@ -98,15 +98,15 @@ def test_create_namespace(
         pg_conn,
         raise_error=False,
     )
-    assert "rest catalog iceberg tables are read only" in str(res)
+    assert "writable REST catalog iceberg tables do not" in str(res)
     pg_conn.rollback()
 
     res = run_command(
         f"""CREATE TABLE "{namespace}".tbl_err(a int) USING iceberg WITH (catalog='rest', catalog_name='none')""",
         pg_conn,
         raise_error=False,
     )
-    assert "rest catalog iceberg tables are read only" in str(res)
+    assert "writable REST catalog iceberg tables do not" in str(res)
     pg_conn.rollback()
 
     run_command(f"""DROP SCHEMA "{namespace}" CASCADE""", pg_conn)