cleanup, add FIELD_TYPES option as well

Author: Maxxen

spatial/src/spatial/gdal/functions/st_read.cpp

@@ -110,15 +110,27 @@ struct GdalScanLocalState : ArrowScanLocalState {
 
 struct GdalScanGlobalState : ArrowScanGlobalState {};
 
-struct ScopeGuard {
-	std::function<void()> f;
-	ScopeGuard(std::function<void()> f) : f(f) {
+
+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);
 	}
-	~ScopeGuard() {
-		f();
+
+	~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) {
 
@@ -163,20 +175,29 @@ unique_ptr<FunctionData> GdalTableFunction::Bind(ClientContext &context, TableFu
 
 	// HACK: check for XLSX_HEADERS open option
 	// TODO: Remove this once GDAL 3.8 is released
-	auto xlsx_default = string(CPLGetConfigOption("OGR_XLSX_HEADERS", "AUTO"));
+	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;
 		}
-		if (strcmp(option, "HEADERS=FORCE") == 0) {
-			CPLSetThreadLocalConfigOption("OGR_XLSX_HEADERS", "FORCE");
-
+		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");
 		}
-		if (strcmp(option, "HEADERS=DISABLE") == 0) {
-			CPLSetThreadLocalConfigOption("OGR_XLSX_HEADERS", "DISABLE");
+		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 =
@@ -185,11 +206,6 @@ 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()));
 
-	// Reset upon exit
-	ScopeGuard _guard([&] {
-		CPLSetThreadLocalConfigOption("OGR_XLSX_HEADERS", xlsx_default.c_str());
-	});
-
 
 	if (dataset == nullptr) {
 		auto error = string(CPLGetLastErrorMsg());

spatial/src/spatial/gdal/module.cpp

@@ -14,7 +14,6 @@ void GdalModule::Register(ClientContext &context) {
 	// Load GDAL
 	OGRRegisterAll();
 
-
 	// Register functions
 	GdalTableFunction::Register(context);
 	GdalDriversTableFunction::Register(context);