eric/duckdb-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from duckdb/jray/remove-md-headers

Browse Source 
remove md headers
This commit is contained in:
Jeff Raymakers
2025-02-25 09:59:40 -08:00
committed by GitHub
parent 4c71dd089e 1c120ebf88
commit b0919a3c4f
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/http_server.cpp
View File

@@ -235,12 +235,12 @@ void HttpServer::HandleGet(const httplib::Request &req,
// Repond with result of forwarded GET // Repond with result of forwarded GET
res = result.value(); res = result.value();
// If this is the config request, set the X-MD-DuckDB-Mode header to HTTP. // If this is the config request, return additional information.
// The UI looks for this to select the appropriate DuckDB mode (HTTP or Wasm).
if (req.path == "/config") { if (req.path == "/config") {
res.set_header("X-MD-DuckDB-Mode", "HTTP");
res.set_header("X-DuckDB-Version", DuckDB::LibraryVersion()); res.set_header("X-DuckDB-Version", DuckDB::LibraryVersion());
res.set_header("X-DuckDB-Platform", DuckDB::Platform()); res.set_header("X-DuckDB-Platform", DuckDB::Platform());
// The UI looks for this to select the appropriate DuckDB mode (HTTP or
// Wasm).
res.set_header("X-DuckDB-UI-Extension-Version", UI_EXTENSION_VERSION); res.set_header("X-DuckDB-UI-Extension-Version", UI_EXTENSION_VERSION);
} }
} }
@@ -248,14 +248,8 @@ void HttpServer::HandleGet(const httplib::Request &req,
void HttpServer::HandleInterrupt(const httplib::Request &req, void HttpServer::HandleInterrupt(const httplib::Request &req,
httplib::Response &res) { httplib::Response &res) {
auto description = req.get_header_value("X-DuckDB-UI-Request-Description"); auto description = req.get_header_value("X-DuckDB-UI-Request-Description");
if (description.empty()) {
description = req.get_header_value("X-MD-Description");
}
auto connection_name = req.get_header_value("X-DuckDB-UI-Connection-Name"); auto connection_name = req.get_header_value("X-DuckDB-UI-Connection-Name");
if (connection_name.empty()) {
connection_name = req.get_header_value("X-MD-Connection-Name");
}
auto db = ddb_instance.lock(); auto db = ddb_instance.lock();
if (!db) { if (!db) {
@@ -288,39 +282,22 @@ void HttpServer::DoHandleRun(const httplib::Request &req,
httplib::Response &res, httplib::Response &res,
const httplib::ContentReader &content_reader) { const httplib::ContentReader &content_reader) {
auto description = req.get_header_value("X-DuckDB-UI-Request-Description"); auto description = req.get_header_value("X-DuckDB-UI-Request-Description");
if (description.empty()) {
description = req.get_header_value("X-MD-Description");
}
auto connection_name = req.get_header_value("X-DuckDB-UI-Connection-Name"); auto connection_name = req.get_header_value("X-DuckDB-UI-Connection-Name");
if (connection_name.empty()) {
connection_name = req.get_header_value("X-MD-Connection-Name");
}
auto database_name = auto database_name =
DecodeBase64(req.get_header_value("X-DuckDB-UI-Database-Name")); DecodeBase64(req.get_header_value("X-DuckDB-UI-Database-Name"));
if (database_name.empty()) {
database_name = req.get_header_value("X-MD-Database-Name");
}
std::vector<std::string> parameter_values; std::vector<std::string> parameter_values;
auto parameter_count_string = auto parameter_count_string =
req.get_header_value("X-DuckDB-UI-Parameter-Count"); req.get_header_value("X-DuckDB-UI-Parameter-Count");
if (!parameter_count_string.empty()) { if (!parameter_count_string.empty()) {
auto parameter_count = std::stoi(parameter_count_string); auto parameter_count = std::stoi(parameter_count_string);
std::cout << "parameter_count " << parameter_count << std::endl;
for (idx_t i = 0; i < parameter_count; ++i) { for (idx_t i = 0; i < parameter_count; ++i) {
auto parameter_value = DecodeBase64(req.get_header_value( auto parameter_value = DecodeBase64(req.get_header_value(
StringUtil::Format("X-DuckDB-UI-Parameter-Value-%d", i))); StringUtil::Format("X-DuckDB-UI-Parameter-Value-%d", i)));
parameter_values.push_back(parameter_value); parameter_values.push_back(parameter_value);
} }
} else {
auto parameter_count = req.get_header_value_count("X-MD-Parameter");
for (idx_t i = 0; i < parameter_count; ++i) {
auto parameter_value =
DecodeBase64(req.get_header_value("X-MD-Parameter", i));
parameter_values.push_back(parameter_value);
}
} }
std::string content = ReadContent(content_reader); std::string content = ReadContent(content_reader);
@@ -421,9 +398,6 @@ void HttpServer::HandleTokenize(const httplib::Request &req,
httplib::Response &res, httplib::Response &res,
const httplib::ContentReader &content_reader) { const httplib::ContentReader &content_reader) {
auto description = req.get_header_value("X-DuckDB-UI-Request-Description"); auto description = req.get_header_value("X-DuckDB-UI-Request-Description");
if (description.empty()) {
description = req.get_header_value("X-MD-Description");
}
std::string content = ReadContent(content_reader); std::string content = ReadContent(content_reader);