8a91dba6e3
* Done! Here's a summary of the changes: 1. **`scripts/prepare-db.js`** - Added `--check` flag support that runs `cargo sqlx prepare --check` instead of `cargo sqlx prepare` 2. **`package.json`** - Added new script: ```json "prepare-db:check": "node scripts/prepare-db.js --check" ``` 3. **`.github/workflows/test.yml`** - Added `npm run prepare-db:check` to the Checks step The check will verify that the `.sqlx/` cached query metadata is up-to-date with the actual SQL queries in the codebase. If a developer modifies a SQL query but forgets to run `npm run prepare-db`, the CI will fail. * Fix image queries * Done! Added check mode support to the remote script: 1. **`crates/remote/scripts/prepare-db.sh`** - Added `--check` flag support that runs `cargo sqlx prepare --check` when passed 2. **`package.json`** - Added: ```json "remote:prepare-db:check": "cd crates/remote && bash scripts/prepare-db.sh --check" ``` Note: I didn't add `remote:prepare-db:check` to CI since it requires PostgreSQL (`initdb`, `pg_ctl`) which may not be available on the CI runner. The local SQLite-based `prepare-db:check` is already in CI. Let me know if you'd like to add the remote check to CI as well (would require installing PostgreSQL in the workflow). * Add remote db check to workflow * Added a step to install `sqlx-cli` with both SQLite and PostgreSQL features. The Rust cache should help speed up subsequent runs since it caches installed crates. * Done! All three files updated to use Rust `1.89.0`: 1. `rust-toolchain.toml` - `channel = "1.89.0"` 2. `.github/workflows/test.yml` - `toolchain: 1.89.0` 3. `.github/workflows/pre-release.yml` - `RUST_TOOLCHAIN: 1.89.0` This should fix the `zerocopy` AVX512 compile error since 1.89.0 has `stdarch_x86_avx512` stabilized. * Done. Added a step to install PostgreSQL before the Checks step so `npm run remote:prepare-db:check` can run. * Updated to install `postgresql-16` and add `/usr/lib/postgresql/16/bin` to PATH so `initdb`, `pg_ctl`, and `createdb` are available. * Added the official PostgreSQL apt repository so we can install PostgreSQL 16. * Much cleaner. Using the `ikalnytskyi/action-setup-postgres@v7` action which handles the PostgreSQL 16 installation and PATH setup automatically. * Done. Changes made: 1. **`crates/remote/scripts/prepare-db.sh`**: Now checks if `DATABASE_URL` is set. If so, uses the existing PostgreSQL server. Otherwise creates a temp cluster as before. 2. **`.github/workflows/test.yml`**: - Added `database: remote` to the PostgreSQL action to create the database - Added `DATABASE_URL: postgres://postgres@localhost:5432/remote` env var to the Checks step * Done. Changes made: 1. **`.github/workflows/test.yml`**: Removed PostgreSQL setup step and `DATABASE_URL` env var 2. **`crates/remote/scripts/prepare-db.sh`**: Simplified - for `--check` mode, exits early with `SQLX_OFFLINE=true cargo sqlx prepare --check` (no database needed)
52 lines
1.3 KiB
Bash
Executable File
52 lines
1.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
CHECK_MODE="${1:-}"
|
|
|
|
# For --check mode, run offline without database (just verify .sqlx cache)
|
|
if [ "$CHECK_MODE" = "--check" ]; then
|
|
echo "➤ Checking SQLx data (offline mode)..."
|
|
SQLX_OFFLINE=true cargo sqlx prepare --check
|
|
echo "✅ sqlx check complete"
|
|
exit 0
|
|
fi
|
|
|
|
# For prepare mode, need a running PostgreSQL instance
|
|
DATA_DIR="$(mktemp -d /tmp/sqlxpg.XXXXXX)"
|
|
PORT=54329
|
|
|
|
echo "Killing existing Postgres instance on port $PORT"
|
|
pids=$(lsof -t -i :"$PORT" 2>/dev/null || true)
|
|
[ -n "$pids" ] && kill $pids 2>/dev/null || true
|
|
sleep 1
|
|
|
|
echo "➤ Initializing temporary Postgres cluster..."
|
|
initdb -D "$DATA_DIR" > /dev/null
|
|
|
|
echo "➤ Starting Postgres on port $PORT..."
|
|
pg_ctl -D "$DATA_DIR" -o "-p $PORT" -w start > /dev/null
|
|
|
|
echo "➤ Creating 'remote' database..."
|
|
createdb -p $PORT remote
|
|
|
|
# Connection string
|
|
export DATABASE_URL="postgres://localhost:$PORT/remote"
|
|
|
|
echo "➤ Running migrations..."
|
|
sqlx migrate run
|
|
|
|
echo "➤ Preparing SQLx data..."
|
|
cargo sqlx prepare
|
|
|
|
echo "➤ Stopping Postgres..."
|
|
pg_ctl -D "$DATA_DIR" -m fast -w stop > /dev/null
|
|
|
|
echo "➤ Cleaning up..."
|
|
rm -rf "$DATA_DIR"
|
|
|
|
echo "Killing existing Postgres instance on port $PORT"
|
|
pids=$(lsof -t -i :"$PORT" 2>/dev/null || true)
|
|
[ -n "$pids" ] && kill $pids 2>/dev/null || true
|
|
sleep 1
|
|
|
|
echo "✅ sqlx prepare complete" |