Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
windows-build:
runs-on: windows-latest
env:
VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
VCPKG_DEFAULT_TRIPLET: x64-windows-static
VCPKG_ROOT: ${{ github.workspace }}\\vcpkg
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
cmake -G "Visual Studio 17 2022" -A x64 `
-DCMAKE_BUILD_TYPE=Release `
-DBUILD_TESTING=OFF `
-DVCPKG_TARGET_TRIPLET=x64-windows-static-md `
-DVCPKG_TARGET_TRIPLET=x64-windows-static `
-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" `
../..

Expand Down
6 changes: 3 additions & 3 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
- ~13,400 lines of C++ code across 54 files
- Supports Linux (x86/ARM64), macOS (Intel/Apple Silicon), and Windows
- Declarative API philosophy: logic lives in YAML/SQL, not compiled code
- Single binary deployment with built-in DuckDB 1.4.4
- Single binary deployment with built-in DuckDB 1.5.1

## Architecture Documentation

Expand Down Expand Up @@ -627,7 +627,7 @@ make integration-test-ci # Full suite with server management

### DuckDB Integration

- Embedded in-process OLAP database (v1.4.3)
- Embedded in-process OLAP database (v1.5.1)
- Extensions for external data sources: BigQuery, Postgres, Iceberg, Parquet, CSV
- Query execution with result caching

Expand Down Expand Up @@ -1152,7 +1152,7 @@ Common extensions:

| Library | Purpose |
|---------|---------|
| **DuckDB 1.4.4** | In-process OLAP database |
| **DuckDB 1.5.1** | In-process OLAP database |
| **Crow** | C++ web framework |
| **OpenSSL** | Encryption/security |
| **jwt-cpp** | JWT authentication |
Expand Down
15 changes: 12 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,25 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# Windows-specific settings
if(WIN32)
# Use dynamic runtime libraries for Windows builds
# Use static runtime libraries for Windows builds (/MT, matching DuckDB 1.5.1)
add_definitions(-D_WIN32_WINNT=0x0601) # Target Windows 7 or later

# Set vcpkg triplet for Windows
if(NOT DEFINED VCPKG_TARGET_TRIPLET)
if(MINGW)
set(VCPKG_TARGET_TRIPLET "x64-mingw-dynamic" CACHE STRING "")
else()
set(VCPKG_TARGET_TRIPLET "x64-windows-static-md" CACHE STRING "")
set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "")
endif()
endif()

# Force static CRT (/MT) to match DuckDB 1.5.1's unconditional
# set(CMAKE_MSVC_RUNTIME_LIBRARY ...) in duckdb/CMakeLists.txt:39.
# vcpkg's toolchain only sets /MT for packages; flapi's own targets need
# this explicit setting or MSVC defaults to /MD → LNK2038 at link time.
if(NOT MINGW)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" CACHE STRING "")
endif()
endif()

if(APPLE)
Expand Down Expand Up @@ -184,7 +192,7 @@ find_package(zstd CONFIG REQUIRED)
find_package(lz4 CONFIG REQUIRED)

# Add DuckDB
set(DUCKDB_EXPLICIT_VERSION 1.4.4)
set(DUCKDB_EXPLICIT_VERSION 1.5.1)
set(ENABLE_EXTENSION_AUTOLOADING true)
set(ENABLE_EXTENSION_AUTOINSTALL true)
if (WIN32)
Expand Down Expand Up @@ -269,6 +277,7 @@ add_library(flapi-lib STATIC
# Link libraries to flapi-lib
target_link_libraries(flapi-lib PUBLIC
duckdb_static
dummy_static_extension_loader
Crow::Crow
yaml-cpp::yaml-cpp
jwt-cpp::jwt-cpp
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The easiest way to get started with flAPI is to use the pre-built docker image.
```


The image is pretty small and mainly contains the flAPI binary which is statically linked against [DuckDB v1.4.3](https://github.com/duckdb/duckdb/releases/tag/v1.4.3). Details about the docker image can be found in the [Dockerfile](./docker/development/Dockerfile).
The image is pretty small and mainly contains the flAPI binary which is statically linked against [DuckDB v1.5.1](https://github.com/duckdb/duckdb/releases/tag/v1.5.1). Details about the docker image can be found in the [Dockerfile](./docker/development/Dockerfile).

#### 2. Run flAPI:
Once you have downloaded the binary, you can run flAPI by executing the following command:
Expand Down
Loading
Loading