Skip to content
This repository has been archived by the owner on Aug 13, 2024. It is now read-only.

Commit

Permalink
bump duckdb & extension
Browse files Browse the repository at this point in the history
  • Loading branch information
Kayrnt committed Jul 9, 2024
1 parent 45fc64f commit 8902d2d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ testext
test/python/__pycache__/
.Rhistory
vcpkg_installed/
vcpkg/
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 135 files
2 changes: 1 addition & 1 deletion extension-ci-tools
2 changes: 1 addition & 1 deletion extension_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Extension from this repo
duckdb_extension_load(duckdb_bigquery
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
LINKED_LIBS "${VCPKG_INSTALLED_DIR}/wasm32-emscripten/lib/*_static.a"
LOAD_TESTS
DONT_LINK
)

# Any extra extensions that should be built
Expand Down
5 changes: 4 additions & 1 deletion src/bigquery_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using namespace concurrency::streams;
namespace duckdb {

std::string GetAccessToken(const string &service_account_json) {
google::cloud::v2_25::StatusOr<std::__1::shared_ptr<google::cloud::storage::v2_25::oauth2::Credentials>> credentials;
google::cloud::StatusOr<std::__1::shared_ptr<google::cloud::storage::oauth2::Credentials>> credentials;
if(service_account_json.empty()) {
credentials = gcpoauth2::GoogleDefaultCredentials();
} else {
Expand Down Expand Up @@ -391,6 +391,9 @@ LogicalType BigQueryUtils::TypeToLogicalType(const std::string &bq_type) {
return LogicalType::VARCHAR;
} else if(bq_type == "BOOLEAN") {
return LogicalType::BOOLEAN;
} else if(bq_type == "RECORD") {
throw NotImplementedException("RECORD type not supported yet");
//return LogicalType::STRUCT();
}
Printer::Print("Unknown type: " + bq_type);
// fallback for unknown types
Expand Down

0 comments on commit 8902d2d

Please sign in to comment.