Merge branch 'main' into spatial_start

Author: teunbrand

.github/workflows/build.yaml

@@ -32,9 +32,6 @@ jobs:
       - name: Install LLVM
         run: sudo apt-get install -y llvm
 
-      - name: Install ODBC
-        run: sudo apt-get install -y unixodbc-dev
-
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 

.github/workflows/release-jupyter.yml

@@ -55,21 +55,10 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --auditwheel=repair
+          args: --release --out dist --auditwheel=skip
           working-directory: ggsql-jupyter
           manylinux: 2_28
           docker-options: -e GGSQL_SKIP_GENERATE=1
-          before-script-linux: |
-            if command -v yum >/dev/null 2>&1; then
-              yum install -y unixODBC-devel
-            elif command -v apt-get >/dev/null 2>&1; then
-              apt-get update && apt-get install -y unixodbc-dev
-            fi
-
-      - name: Fix wheel library load paths
-        uses: ./.github/workflows/actions/fix-wheel-libs
-        with:
-          dist-dir: ggsql-jupyter/dist
 
       - uses: actions/upload-artifact@v4
         with:
@@ -96,21 +85,13 @@ jobs:
           name: tree-sitter-generated
           path: tree-sitter-ggsql/src/
 
-      - name: Install ODBC
-        run: brew install unixodbc
-
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --auditwheel=repair
+          args: --release --out dist --auditwheel=skip
           working-directory: ggsql-jupyter
 
-      - name: Fix wheel library load paths
-        uses: ./.github/workflows/actions/fix-wheel-libs
-        with:
-          dist-dir: ggsql-jupyter/dist
-
       - uses: actions/upload-artifact@v4
         with:
           name: jupyter-wheels-macos-${{ matrix.target }}

.github/workflows/release-packages.yml

@@ -102,12 +102,6 @@ jobs:
       - name: Install tree-sitter-cli
         run: npm install -g tree-sitter-cli
 
-      - name: Install ODBC
-        run: brew install unixodbc
-
-      - name: Install dylibbundler
-        run: brew install dylibbundler
-
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -148,19 +142,10 @@ jobs:
       - name: Build ggsql binary (x86_64)
         run: cargo build --release --bin ggsql --bin ggsql-jupyter
 
-      - name: Bundle dynamic library dependencies
-        run: |
-          dylibbundler -cd -of -b -x target/release/ggsql         -d ./libs/ -p "@executable_path/../lib/ggsql$VERSION/"
-          dylibbundler -cd -of -b -x target/release/ggsql-jupyter -d ./libs/ -p "@executable_path/../lib/ggsql$VERSION/"
-
-      - name: Sign binaries and dylibs (Developer ID Application)
+      - name: Sign binaries (Developer ID Application)
         env:
           SIGN_ID: "Developer ID Application: ${{ secrets.GWS_APPLE_SIGN_IDENTITY }}"
         run: |
-          # Sign bundled dylibs first (inside-out), replacing dylibbundler's ad-hoc sigs
-          find ./libs -type f \( -name "*.dylib" -o -name "*.so" \) -print0 | \
-            xargs -0 -I{} codesign --force --options runtime --timestamp --sign "$SIGN_ID" "{}"
-          # Then sign the executables with hardened runtime + entitlements
           codesign --force --options runtime --timestamp \
             --entitlements entitlements.plist \
             --sign "$SIGN_ID" target/release/ggsql
@@ -177,14 +162,13 @@ jobs:
           APPLE_API_ISSUER: ${{ secrets.GWS_APPLE_API_ISSUER }}
         run: |
           PKG_NAME="ggsql_${VERSION}_x86_64.pkg"
-          mkdir -p pkg-payload/usr/local/bin "pkg-payload/usr/local/lib/ggsql$VERSION"
+          mkdir -p pkg-payload/usr/local/bin
           cp target/release/ggsql          pkg-payload/usr/local/bin/
           cp target/release/ggsql-jupyter  pkg-payload/usr/local/bin/
-          cp -R ./libs/. "pkg-payload/usr/local/lib/ggsql$VERSION/"
           mkdir -p pkg-scripts
           cat > pkg-scripts/postinstall <<EOF
           #!/bin/sh
-          mkdir -p /usr/local/bin /usr/local/lib/ggsql$VERSION
+          mkdir -p /usr/local/bin
           EOF
           chmod 755 pkg-scripts/postinstall
           pkgbuild \
@@ -225,12 +209,6 @@ jobs:
       - name: Install tree-sitter-cli
         run: npm install -g tree-sitter-cli
 
-      - name: Install ODBC
-        run: brew install unixodbc
-
-      - name: Install dylibbundler
-        run: brew install dylibbundler
-
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
@@ -271,19 +249,10 @@ jobs:
       - name: Build ggsql binary (aarch64)
         run: cargo build --release --bin ggsql --bin ggsql-jupyter
 
-      - name: Bundle dynamic library dependencies
-        run: |
-          dylibbundler -cd -of -b -x target/release/ggsql         -d ./libs/ -p "@executable_path/../lib/ggsql$VERSION/"
-          dylibbundler -cd -of -b -x target/release/ggsql-jupyter -d ./libs/ -p "@executable_path/../lib/ggsql$VERSION/"
-
-      - name: Sign binaries and dylibs (Developer ID Application)
+      - name: Sign binaries (Developer ID Application)
         env:
           SIGN_ID: "Developer ID Application: ${{ secrets.GWS_APPLE_SIGN_IDENTITY }}"
         run: |
-          # Sign bundled dylibs first (inside-out), replacing dylibbundler's ad-hoc sigs
-          find ./libs -type f \( -name "*.dylib" -o -name "*.so" \) -print0 | \
-            xargs -0 -I{} codesign --force --options runtime --timestamp --sign "$SIGN_ID" "{}"
-          # Then sign the executables with hardened runtime + entitlements
           codesign --force --options runtime --timestamp \
             --entitlements entitlements.plist \
             --sign "$SIGN_ID" target/release/ggsql
@@ -300,14 +269,13 @@ jobs:
           APPLE_API_ISSUER: ${{ secrets.GWS_APPLE_API_ISSUER }}
         run: |
           PKG_NAME="ggsql_${VERSION}_aarch64.pkg"
-          mkdir -p pkg-payload/usr/local/bin "pkg-payload/usr/local/lib/ggsql$VERSION"
+          mkdir -p pkg-payload/usr/local/bin
           cp target/release/ggsql          pkg-payload/usr/local/bin/
           cp target/release/ggsql-jupyter  pkg-payload/usr/local/bin/
-          cp -R ./libs/. "pkg-payload/usr/local/lib/ggsql$VERSION/"
           mkdir -p pkg-scripts
           cat > pkg-scripts/postinstall <<EOF
           #!/bin/sh
-          mkdir -p /usr/local/bin /usr/local/lib/ggsql$VERSION
+          mkdir -p /usr/local/bin
           EOF
           chmod 755 pkg-scripts/postinstall
           pkgbuild \
@@ -361,8 +329,7 @@ jobs:
             libwebkit2gtk-4.1-dev \
             libappindicator3-dev \
             librsvg2-dev \
-            patchelf \
-            unixodbc-dev
+            patchelf
 
       - name: Install cargo-packager
         run: cargo install cargo-packager --locked
@@ -409,18 +376,14 @@ jobs:
             libwebkit2gtk-4.1-dev \
             libappindicator3-dev \
             librsvg2-dev \
-            patchelf \
-            unixodbc-dev
+            patchelf
 
       - name: Install cargo-packager
         run: cargo install cargo-packager --locked
 
       - name: Build ggsql binary (aarch64)
         run: cargo build --release --bin ggsql --bin ggsql-jupyter
 
-      - name: Make empty libs dir for bundling
-        run: mkdir -p libs
-
       - name: Build Debian package (aarch64)
         run: cargo packager --release --formats deb
 
@@ -451,9 +414,6 @@ jobs:
       - name: Install tree-sitter-cli
         run: npm install -g tree-sitter-cli
 
-      - name: Install ODBC
-        run: sudo apt-get install -y unixodbc-dev
-
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
 

CHANGELOG.md

@@ -1,11 +1,25 @@
 ## [Unreleased]
 
+### Added
+
+- Added panel decorations (grid lines, axes, background) for polar coordinates (#156).
+- Added `radar` setting to polar coordinates for making radar plots (#418).
+
+## 0.3.2 - 2026-05-05
+
 ### Fixed
 
 - Side effects like `CREATE TEMP TABLE` before the `VISUALISE` statement are now
   separated from directly feeding into the visualisation data (#415)
 - Fixed bug where panel axes were unintentionally anchored to zero when using 
   `FACET ... SETTING free => 'x'/'y'` (#410).
+- Fixed bug where faceted data were matched to the incorrect panels (#409)
+
+### Changed
+
+- Restructured how ggsql integrates with ODBC drivers to use the system ODBC,
+rather than bundling unixodbc as part of binary releases. This fixes several
+issues on Linux and macOS caused by relative paths to dynamic libraries.
 
 ## 0.3.1 - 2026-04-30
 

Cargo.lock

@@ -15,7 +15,7 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 authors = ["ggsql Team"]
 license = "MIT"
@@ -25,8 +25,8 @@ description = "A declarative visualization language that extends SQL with powerf
 
 [workspace.dependencies]
 # workspace packages
-tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.3.1" }
-ggsql = { path = "src", version = "0.3.1" }
+tree-sitter-ggsql = { path = "tree-sitter-ggsql", version = "0.3.2" }
+ggsql = { path = "src", version = "0.3.2" }
 
 # Parsing
 csscolorparser = "0.8.1"
@@ -42,8 +42,8 @@ bytes = "1"
 rusqlite = { version = "0.38", features = ["bundled", "chrono"] }
 
 # ODBC
-odbc-api = { version = "13", default-features = false, features = ["odbc_version_3_80"] }
 toml_edit = "0.22"
+libloading = "0.8"
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }

Cargo.toml

@@ -84,11 +84,12 @@ DRAW bar
 
 See how we didn't have to specify the polar coordinate system in the last example because we have a mapping to radius, allowing ggsql to deduce the coordinate system automatically.
 
-If we instead map the species to angle we end up with a rose plot
+If we instead map the species to angle we end up with a rose plot. We turn off the automatic conversion to radar plots for discrete angle categories here.
 
 ```{ggsql}
 VISUALISE species AS angle, species AS fill FROM ggsql:penguins
 DRAW bar
+PROJECT TO polar SETTING radar => false
 ```
 
 Moving back to the regular pie chart, we might be interested in comparing how the species distribution varies by sex. We can do this with faceting: