Update duckdb-rs to DuckDB v1.0.0 (#336)

* Update Rust to v1.0.0 * Remove define again * Update crates/libduckdb-sys/build.rs Co-authored-by: Murali S <[email protected]> * Update build.rs * Remove patch again * Disable Windows for now --------- Co-authored-by: Murali S <[email protected]>
duckdb · Jul 10, 2024 · 15ead11 · 15ead11
1 parent 88dd455
commit 15ead11
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 3,122 deletions.
diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
@@ -14,7 +14,6 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - { target: x86_64-pc-windows-msvc, os: windows-latest, duckdb: libduckdb-windows-amd64.zip }
           - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, duckdb: libduckdb-linux-amd64.zip }
           #- { target: x86_64-apple-darwin, os: macos-latest }
           #- {
@@ -38,7 +37,7 @@ jobs:
         name: Download duckdb
         with:
           repository: "duckdb/duckdb"
-          tag: "v0.10.1"
+          tag: "v1.0.0"
           fileName: ${{ matrix.duckdb }}
           out-file-path: .
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.10.2"
+version = "1.0.0"
 authors = ["wangfenjin <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/wangfenjin/duckdb-rs"
@@ -19,8 +19,8 @@ license = "MIT"
 categories = ["database"]
 
 [workspace.dependencies]
-duckdb = { version = "0.10.2", path = "crates/duckdb" }
-libduckdb-sys = { version = "0.10.2", path = "crates/libduckdb-sys" }
+duckdb = { version = "1.0.0", path = "crates/duckdb" }
+libduckdb-sys = { version = "1.0.0", path = "crates/libduckdb-sys" }
 duckdb-loadable-macros = { version = "0.1.1", path = "crates/duckdb-loadable-macros" }
 autocfg = "1.0"
 bindgen = { version = "0.69", default-features = false }

diff --git a/crates/duckdb/Cargo.toml b/crates/duckdb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "duckdb"
-version = "0.10.2"
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true

diff --git a/crates/libduckdb-sys/Cargo.toml b/crates/libduckdb-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libduckdb-sys"
-version = "0.10.2"
+version = "1.0.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

diff --git a/crates/libduckdb-sys/duckdb.tar.gz b/crates/libduckdb-sys/duckdb.tar.gz
diff --git a/crates/libduckdb-sys/src/bindgen_bundled_version.rs b/crates/libduckdb-sys/src/bindgen_bundled_version.rs
diff --git a/crates/libduckdb-sys/update_sources.py b/crates/libduckdb-sys/update_sources.py
@@ -75,7 +75,7 @@ def get_sources(extensions):
 )
 
 subprocess.check_call(
-    'find "' + SCRIPT_DIR + '/../target" -type f -name bindgen.rs -exec rm {} \;',
+    'find "' + SCRIPT_DIR + '/../../target" -type f -name bindgen.rs -exec rm {} \;',
     shell=True,
 )
 
@@ -87,14 +87,14 @@ def get_sources(extensions):
 print(
     'find "'
     + SCRIPT_DIR
-    + '/../target" -type f -name "bindgen.rs" -exec cp {} "'
+    + '/../../target" -type f -name "bindgen.rs" -exec cp {} "'
     + SRC_DIR
     + '/bindgen_bundled_version.rs" \;'
 )
 subprocess.check_call(
     'find "'
     + SCRIPT_DIR
-    + '/../target" -type f -name "bindgen.rs" -exec cp {} "'
+    + '/../../target" -type f -name "bindgen.rs" -exec cp {} "'
     + SRC_DIR
     + '/bindgen_bundled_version.rs" \;',
     shell=True,

diff --git a/crates/libduckdb-sys/upgrade.sh b/crates/libduckdb-sys/upgrade.sh
@@ -5,12 +5,12 @@ CUR_DIR=$(pwd -P)
 echo "$SCRIPT_DIR"
 cd "$SCRIPT_DIR" || { echo "fatal error" >&2; exit 1; }
 cargo clean
-mkdir -p "$SCRIPT_DIR/../target" "$SCRIPT_DIR/duckdb"
+mkdir -p "$SCRIPT_DIR/../../target" "$SCRIPT_DIR/duckdb"
 export DUCKDB_LIB_DIR="$SCRIPT_DIR/duckdb"
 export DU_INCLUDE_DIR="$DUCKDB_LIB_DIR"
 
 # Download and extract amalgamation
-DUCKDB_VERSION=v0.10.2
+DUCKDB_VERSION=v1.0.0
 git submodule update --init --checkout
 cd "$SCRIPT_DIR/duckdb-sources" || { echo "fatal error" >&2; exit 1; }
 git fetch
@@ -22,9 +22,9 @@ python3 "$SCRIPT_DIR/update_sources.py"
 rm -f "$SCRIPT_DIR/src/bindgen_bundled_version.rs"
 cargo update
 # Just to make sure there is only one bindgen.rs file in target dir
-find "$SCRIPT_DIR/../target" -type f -name bindgen.rs -exec rm {} \;
+find "$SCRIPT_DIR/../../target" -type f -name bindgen.rs -exec rm {} \;
 env LIBDUCKDB_SYS_BUNDLING=1 cargo test --features "extensions-full buildtime_bindgen"
-find "$SCRIPT_DIR/../target" -type f -name bindgen.rs -exec cp {} "$SCRIPT_DIR/src/bindgen_bundled_version.rs" \;
+find "$SCRIPT_DIR/../../target" -type f -name bindgen.rs -exec cp {} "$SCRIPT_DIR/src/bindgen_bundled_version.rs" \;
 
 # Sanity checks
 cd "$SCRIPT_DIR/.." || { echo "fatal error" >&2; exit 1; }

diff --git a/upgrade.sh b/upgrade.sh
@@ -22,5 +22,5 @@ fi
 
 echo "Start to upgrade from $duckdb_rs_version to $duckdb_version"
 
-sed -i '' "s/$duckdb_rs_version/$duckdb_version/g" Cargo.toml libduckdb-sys/upgrade.sh libduckdb-sys/Cargo.toml .github/workflows/rust.yaml
-./libduckdb-sys/upgrade.sh
+sed -i '' "s/$duckdb_rs_version/$duckdb_version/g" Cargo.toml crates/libduckdb-sys/upgrade.sh crates/libduckdb-sys/Cargo.toml .github/workflows/rust.yaml
+./crates/libduckdb-sys/upgrade.sh