Merge pull request #44 from samansmink/switch-org-credentials

Update DuckDB
duckdb · Nov 22, 2023 · 31aac7e · 31aac7e
2 parents 6e44fb9 + 3c15f2f
commit 31aac7e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/ClientTests.yml b/.github/workflows/ClientTests.yml
@@ -13,6 +13,6 @@ concurrency:
 jobs:
   client-tests:
     name: Client Tests
-    uses: duckdb/duckdb/.github/workflows/[email protected].1
+    uses: duckdb/duckdb/.github/workflows/[email protected].2
     with:
-      duckdb_version: v0.9.1
+      duckdb_version: v0.9.2
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,9 +14,10 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/duckdb/.github/workflows/[email protected].1
+    uses: duckdb/duckdb/.github/workflows/[email protected].2
     with:
-      duckdb_version: v0.9.1
+      vcpkg_commit: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
+      duckdb_version: v0.9.2
       extension_name: quack
 
   duckdb-stable-deploy:
@@ -25,7 +26,7 @@ jobs:
     uses: ./.github/workflows/_extension_deploy.yml
     secrets: inherit
     with:
-      duckdb_version: v0.9.1
+      duckdb_version: v0.9.2
       extension_name: quack
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
-      deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
+      deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/.github/workflows/_extension_deploy.yml b/.github/workflows/_extension_deploy.yml
@@ -101,11 +101,11 @@ jobs:
       - name: Deploy
         shell: bash
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.S3_DEPLOY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DEPLOY_KEY }}
-          AWS_DEFAULT_REGION: ${{ secrets.S3_REGION }}
-          BUCKET_NAME: ${{ secrets.S3_BUCKET }}
-          DUCKDB_EXTENSION_SIGNING_PK: ${{ secrets.DUCKDB_EXTENSION_SIGNING_PK }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.S3_DUCKDB_ORG_DEPLOY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_ORG_DEPLOY_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.S3_DUCKDB_ORG_REGION }}
+          BUCKET_NAME: ${{ secrets.S3_DUCKDB_ORG_BUCKET }}
+          DUCKDB_EXTENSION_SIGNING_PK: ${{ secrets.S3_DUCKDB_ORG_EXTENSION_SIGNING_PK }}
         run: |
           pwd
           python3 -m pip install pip awscli

diff --git a/duckdb b/duckdb
diff --git a/src/quack_extension.cpp b/src/quack_extension.cpp
@@ -56,7 +56,8 @@ std::string QuackExtension::Name() {
 extern "C" {
 
 DUCKDB_EXTENSION_API void quack_init(duckdb::DatabaseInstance &db) {
-	LoadInternal(db);
+    duckdb::DuckDB db_wrapper(db);
+    db_wrapper.LoadExtension<duckdb::QuackExtension>();
 }
 
 DUCKDB_EXTENSION_API const char *quack_version() {