Skip to content

Allow passing HEADERS=[AUTO/FORCE/DISABLE] st_read() to control xlsx behavior. #114

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
merged 3 commits into from
Aug 11, 2023
Merged

Allow passing HEADERS=[AUTO/FORCE/DISABLE] st_read() to control xlsx behavior. #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f210a26
add excel headers config option
Maxxen Aug 11, 2023
d1a1d1c
remove option, pass on open instead
Maxxen Aug 11, 2023
9d8787e
cleanup, add FIELD_TYPES option as well
Maxxen Aug 11, 2023
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
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 116 files
47 changes: 47 additions & 0 deletions spatial/src/spatial/gdal/functions/st_read.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,27 @@ struct GdalScanLocalState : ArrowScanLocalState {

struct GdalScanGlobalState : ArrowScanGlobalState {};


struct ScopedOption {
string option;
string original_value;

ScopedOption(string option_p, const char* default_value) : option(option_p) {
// Save current value
original_value = CPLGetConfigOption(option.c_str(), default_value);
}

void Set(const char* new_value) {
CPLSetThreadLocalConfigOption(option.c_str(), new_value);
}

~ScopedOption() {
// Reset
CPLSetThreadLocalConfigOption(option.c_str(), original_value.c_str());
}
};


unique_ptr<FunctionData> GdalTableFunction::Bind(ClientContext &context, TableFunctionBindInput &input,
vector<LogicalType> &return_types, vector<string> &names) {

Expand Down Expand Up @@ -152,6 +173,31 @@ unique_ptr<FunctionData> GdalTableFunction::Bind(ClientContext &context, TableFu
gdal_sibling_files.push_back(nullptr);
}

// HACK: check for XLSX_HEADERS open option
// TODO: Remove this once GDAL 3.8 is released
ScopedOption xlsx_headers("OGR_XLSX_HEADERS", "AUTO");
ScopedOption xlsx_field_types("OGR_XLSX_FIELD_TYPES", "AUTO");
for (auto &option : gdal_open_options) {
if (option == nullptr) {
break;
}
else if (strcmp(option, "HEADERS=FORCE") == 0) {
xlsx_headers.Set("FORCE");
}
else if (strcmp(option, "HEADERS=DISABLE") == 0) {
xlsx_headers.Set("DISABLE");
}
else if (strcmp(option, "HEADERS=AUTO") == 0) {
xlsx_headers.Set("AUTO");
}
else if (strcmp(option, "FIELD_TYPES=STRING") == 0) {
xlsx_field_types.Set("STRING");
}
else if (strcmp(option, "FIELD_TYPES=AUTO") == 0) {
xlsx_field_types.Set("AUTO");
}
}

// Now we can open the dataset
auto file_name = input.inputs[0].GetValue<string>();
auto dataset =
Expand All @@ -160,6 +206,7 @@ unique_ptr<FunctionData> GdalTableFunction::Bind(ClientContext &context, TableFu
gdal_open_options.empty() ? nullptr : gdal_open_options.data(),
gdal_sibling_files.empty() ? nullptr : gdal_sibling_files.data()));


if (dataset == nullptr) {
auto error = string(CPLGetLastErrorMsg());
throw IOException("Could not open file: " + file_name + " (" + error + ")");
Expand Down