Skip to content

Update pg-clickhouse-c 4 pgch_parse_encoding_check #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theory merged 1 commit into from
Sep 28, 2026
Merged

Update pg-clickhouse-c 4 pgch_parse_encoding_check #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions src/option.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ static bool
is_ch_option(const char* keyword);
static bool
parse_min_tls_version(const char* val, tls_version* out);
static bool
parse_encoding_check(const char* val, pgch_encoding_check* out);

/*
* Validate the generic options given to a FOREIGN DATA WRAPPER, SERVER,
Expand Down Expand Up @@ -172,7 +170,7 @@ clickhouse_fdw_validator(PG_FUNCTION_ARGS) {
const char* val = defGetString(def);
pgch_encoding_check v;

if (!parse_encoding_check(val, &v)) {
if (!pgch_parse_encoding_check(val, &v)) {
ereport(
ERROR,
errcode(ERRCODE_FDW_INVALID_STRING_FORMAT),
Expand Down Expand Up @@ -278,23 +276,6 @@ parse_min_tls_version(const char* val, tls_version* out) {
return true;
}

/* Map an encoding_check option value to pgch_encoding_check. */
static bool
parse_encoding_check(const char* val, pgch_encoding_check* out) {
if (pg_strcasecmp(val, "replace") == 0) {
*out = CHC_ENC_REPLACE;
} else if (pg_strcasecmp(val, "remove") == 0) {
*out = CHC_ENC_REMOVE;
} else if (pg_strcasecmp(val, "truncate") == 0) {
*out = CHC_ENC_TRUNCATE;
} else if (pg_strcasecmp(val, "fail") == 0) {
*out = CHC_ENC_FAIL;
} else {
return false;
}
return true;
}

/*
* Check whether the given option is one of the valid clickhouse_fdw options.
* context is the Oid of the catalog holding the object the option is for.
Expand Down Expand Up @@ -363,7 +344,7 @@ chfdw_extract_options(
*driver = defGetString(def);
} else if (encoding_check && strcmp(def->defname, "encoding_check") == 0) {
/* invalid values rejected by the validator; ignore here */
parse_encoding_check(defGetString(def), encoding_check);
pgch_parse_encoding_check(defGetString(def), encoding_check);
}

if (is_ch_option(def->defname)) {
Expand Down
2 changes: 1 addition & 1 deletion vendor/pg-clickhouse-c
Open in desktop
Submodule pg-clickhouse-c updated 10 files
+1 −1 .github/workflows/test.yml
+1 −1 clickhouse-c
+3 −1 doc/pg-clickhouse-decode.md
+25 −0 pg-clickhouse-decode.h
+20 −0 test/expected/encoding.out
+20 −0 test/expected/encoding_1.out
+20 −0 test/expected/encoding_2.out
+3 −0 test/pgch_test--1.0.sql
+13 −0 test/pgch_test.c
+7 −0 test/sql/encoding.sql
Loading