Checkpoint before follow-up message

Co-authored-by: contact <contact@ophir.dev>

Author: cursoragent

.cargo/config.toml

@@ -5,3 +5,6 @@
 # set by the user, and this is a good thing. If the user already set some
 # LIBSQLITE3_FLAGS, he probably knows what he is doing.
 LIBSQLITE3_FLAGS = "-DSQLITE_ENABLE_MATH_FUNCTIONS"
+
+[build]
+rustflags = ["-C", "link-arg=-Wl,-rpath=$ORIGIN/lib"]

Cargo.toml

@@ -49,6 +49,7 @@ sqlparser = { version = "0.59.0", default-features = false, features = [
     "std",
     "visitor",
 ] }
+odbc-sys = { version = "0.27", features = ["static"] }
 async-stream = "0.3"
 async-trait = "0.1.61"
 async-recursion = "1.0.0"

Dockerfile

@@ -7,21 +7,22 @@ RUN apt-get update && \
     if [ "$TARGETARCH" = "$BUILDARCH" ]; then \
         rustup target list --installed > TARGET && \
         echo gcc > LINKER && \
-        apt-get install -y gcc libgcc-s1 cmake unixodbc-dev libodbc2 libltdl7 && \
-        LIBDIR="/lib/*"; \
-        USRLIBDIR="/usr/lib/*"; \
+        apt-get install -y gcc libgcc-s1 cmake unixodbc-dev libltdl-dev pkg-config && \
+        LIBMULTIARCH=$(gcc -print-multiarch); \
+        LIBDIR="/lib/$LIBMULTIARCH"; \
+        USRLIBDIR="/usr/lib/$LIBMULTIARCH"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
         echo aarch64-unknown-linux-gnu > TARGET && \
         echo aarch64-linux-gnu-gcc > LINKER && \
         dpkg --add-architecture arm64 && apt-get update && \
-        apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libodbc2:arm64 libltdl7:arm64 && \
+        apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libltdl-dev:arm64 && \
         LIBDIR="/lib/aarch64-linux-gnu"; \
         USRLIBDIR="/usr/lib/aarch64-linux-gnu"; \
     elif [ "$TARGETARCH" = "arm" ]; then \
         echo armv7-unknown-linux-gnueabihf > TARGET && \
         echo arm-linux-gnueabihf-gcc > LINKER && \
         dpkg --add-architecture armhf && apt-get update && \
-        apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libodbc2:armhf libltdl7:armhf && \
+        apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libltdl-dev:armhf && \
         cargo install --force --locked bindgen-cli && \
         SYSROOT=$(arm-linux-gnueabihf-gcc -print-sysroot); \
         echo "--sysroot=$SYSROOT -I$SYSROOT/usr/include -I$SYSROOT/usr/include/arm-linux-gnueabihf" > BINDGEN_EXTRA_CLANG_ARGS; \
@@ -31,13 +32,16 @@ RUN apt-get update && \
         echo "Unsupported cross compilation target: $TARGETARCH"; \
         exit 1; \
     fi && \
-    cp $LIBDIR/libgcc_s.so.1 $USRLIBDIR/libodbc.so.2 $USRLIBDIR/libltdl.so.7 /opt/sqlpage-libs/ && \
+    echo $USRLIBDIR > ODBC_LIBDIR && \
+    cp $LIBDIR/libgcc_s.so.1 /opt/sqlpage-libs/ && \
     rustup target add $(cat TARGET) && \
     cargo init .
 
 # Build dependencies (creates a layer that avoids recompiling dependencies on every build)
 COPY Cargo.toml Cargo.lock ./
 RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \
+    RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
+    PKG_CONFIG_ALL_STATIC=1 \
     cargo build \
      --target $(cat TARGET) \
      --config target.$(cat TARGET).linker='"'$(cat LINKER)'"' \
@@ -46,6 +50,8 @@ RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \
 # Build the project
 COPY . .
 RUN touch src/main.rs && \
+    RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
+    PKG_CONFIG_ALL_STATIC=1 \
     cargo build \
         --target $(cat TARGET) \
         --config target.$(cat TARGET).linker='"'$(cat LINKER)'"' \
@@ -62,7 +68,9 @@ ENV SQLPAGE_WEB_ROOT=/var/www
 ENV SQLPAGE_CONFIGURATION_DIRECTORY=/etc/sqlpage
 WORKDIR /var/www
 COPY --from=builder /usr/src/sqlpage/sqlpage.bin /usr/local/bin/sqlpage
-COPY --from=builder /opt/sqlpage-libs/* /lib/
+# Provide runtime helper libs next to the binary for rpath=$ORIGIN/lib
+RUN mkdir -p /usr/local/bin/lib
+COPY --from=builder /opt/sqlpage-libs/* /usr/local/bin/lib/
 USER sqlpage
 COPY --from=builder --chown=sqlpage:sqlpage /usr/src/sqlpage/sqlpage/sqlpage.db sqlpage/sqlpage.db
 EXPOSE 8080

README.md

@@ -190,12 +190,12 @@ You can skip this section if you want to use one of the built-in database driver
 
 SQLPage supports ODBC connections to connect to databases that don't have native drivers, such as Oracle, Snowflake, BigQuery, IBM DB2, and many others.
 
-ODBC support requires an ODBC driver manager and appropriate database drivers to be installed on your system.
+On Linux, the SQLPage binary and Docker image now statically link against the `unixODBC` driver manager, so you generally do not need to install `unixodbc` on the host anymore. You still need to install the database-specific ODBC driver for the database you want to connect to.
 
 #### Install ODBC
 
  - On windows, it's installed by default.
- - On linux: `sudo apt-get install -y unixodbc odbcinst unixodbc-common libodbcinst2`
+ - On linux, the driver manager is bundled with SQLPage; install only your database driver's package.
  - On mac: `brew install unixodbc`
 
 

configuration.md

@@ -105,7 +105,7 @@ DATABASE_URL="Driver={Oracle ODBC Driver};Server=localhost:1521/XE;UID=hr;PWD=pa
 DATABASE_URL="Driver={SnowflakeDSIIDriver};Server=account.snowflakecomputing.com;Database=mydb;UID=user;PWD=password"
 ```
 
-ODBC drivers must be installed and configured on your system. On Linux, you typically need `unixodbc` and the appropriate database-specific ODBC driver.
+ODBC drivers must be installed and configured on your system. On Linux, the `unixODBC` driver manager is statically linked into the SQLPage binary, so you usually only need to install and configure the database-specific ODBC driver for your target database (for example Snowflake, Oracle, DuckDB...).
 
 If the `database_password` configuration parameter is set, it will override any password specified in the `database_url`.
 It does not need to be percent-encoded.