From 9111656f887264a41414f8cd89c2c5cb6a7c6734 Mon Sep 17 00:00:00 2001 From: Andrey Sokolov Date: Tue, 30 Dec 2025 16:02:28 +0300 Subject: [PATCH] Fix and run gp_exttable_fdw tests Replace "format" with "format_type", because the format option is not supported --- .github/workflows/build-cloudberry.yml | 3 ++- gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source | 2 +- gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-cloudberry.yml b/.github/workflows/build-cloudberry.yml index 1d529e21b11..cfc1ca617fe 100644 --- a/.github/workflows/build-cloudberry.yml +++ b/.github/workflows/build-cloudberry.yml @@ -307,7 +307,8 @@ jobs: "gpcontrib/pxf_fdw:installcheck", "gpcontrib/zstd:installcheck", "gpcontrib/gp_sparse_vector:installcheck", - "gpcontrib/gp_toolkit:installcheck"] + "gpcontrib/gp_toolkit:installcheck", + "gpcontrib/gp_exttable_fdw:installcheck"] }, {"test":"ic-fixme", "make_configs":["src/test/regress:installcheck-fixme"], diff --git a/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source b/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source index 033dddd5215..41012e73c81 100644 --- a/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source +++ b/gpcontrib/gp_exttable_fdw/input/gp_exttable_fdw.source @@ -72,7 +72,7 @@ SELECT * FROM tableless_ext_fdw; -- When using CREATE FOREIGN TABLE syntax, '|' and '\' need to be escaped as '|' --> '\|' and '|' --> '\\'. CREATE FOREIGN TABLE ext_special_uri(a int, b int) SERVER gp_exttable_server -OPTIONS (format 'csv', delimiter ',', +OPTIONS (format_type 'c', delimiter ',', location_uris 'file://@hostname@@abs_srcdir@/data/spe\\cial1\||file://@hostname@@abs_srcdir@/data/\|special2\\'); \a SELECT urilocation FROM pg_exttable WHERE reloid = 'public.ext_special_uri'::regclass; diff --git a/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source b/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source index 337d21a99e8..a3191eb0853 100644 --- a/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source +++ b/gpcontrib/gp_exttable_fdw/output/gp_exttable_fdw.source @@ -76,7 +76,7 @@ SELECT * FROM tableless_ext_fdw; -- When using CREATE FOREIGN TABLE syntax, '|' and '\' need to be escaped as '|' --> '\|' and '|' --> '\\'. CREATE FOREIGN TABLE ext_special_uri(a int, b int) SERVER gp_exttable_server -OPTIONS (format 'csv', delimiter ',', +OPTIONS (format_type 'c', delimiter ',', location_uris 'file://@hostname@@abs_srcdir@/data/spe\\cial1\||file://@hostname@@abs_srcdir@/data/\|special2\\'); \a SELECT urilocation FROM pg_exttable WHERE reloid = 'public.ext_special_uri'::regclass; @@ -85,7 +85,7 @@ urilocation (1 row) SELECT ftoptions FROM pg_foreign_table WHERE ftrelid='public.ext_special_uri'::regclass; ftoptions -{format=csv,"delimiter=,","location_uris=file://@hostname@@abs_srcdir@/data/spe\\\\cial1\\||file://@hostname@@abs_srcdir@/data/\\|special2\\\\"} +{format_type=c,"delimiter=,","location_uris=file://@hostname@@abs_srcdir@/data/spe\\\\cial1\\||file://@hostname@@abs_srcdir@/data/\\|special2\\\\"} (1 row) \a SELECT * FROM ext_special_uri ORDER BY a;