sqlite moves into the sx library: import vendors/sqlite/sqlite.sx
The amalgamation and the bindings now ship with sx itself (sx library/vendors/sqlite/ — bindings + c/ amalgamation); every import flips from ../src/db/sqlite.sx to vendors/sqlite/sqlite.sx, resolved through the compiler's stdlib search paths. vendor/ and src/db/ leave this repo entirely. make test 22/22 — the object cache keys on content, not path, so the relocated source still hits the existing cache entries.
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
#import "modules/std/json.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/db_import";
|
||||
EMPTY :: ".sx-tmp/db_import_empty";
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#import "modules/std/json.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/publish_fail";
|
||||
MDIR :: ".sx-tmp/publish_fail_m";
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
hash :: #import "modules/std/hash.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
cstd :: #library "c";
|
||||
c_getcwd :: (buf: [*]u8, size: usize) -> *u8 #foreign cstd "getcwd";
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#import "modules/std/json.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/publish_persist";
|
||||
MDIR :: ".sx-tmp/publish_persist_m";
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#import "modules/std/json.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/release_ops";
|
||||
MDIR :: ".sx-tmp/release_ops_m";
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
hash :: #import "modules/std/hash.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/remote_publish";
|
||||
MDIR :: ".sx-tmp/remote_publish_m";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#import "modules/std.sx";
|
||||
#import "modules/std/fs.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
#import "../src/domain/platform.sx";
|
||||
#import "../src/domain/app.sx";
|
||||
#import "../src/domain/release.sx";
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
#
|
||||
# Locate the compiler via SX (overridable); defaults to the sibling sx repo.
|
||||
#
|
||||
# The vendored SQLite needs no flags here: src/db/sqlite.sx declares it
|
||||
# as a `#import c` unit, so `sx run` compiles (cached) and loads it as a
|
||||
# priority symbol target — the version assert in tests/sqlite_smoke.sx
|
||||
# SQLite needs no flags here: the sx library ships it (vendors/sqlite),
|
||||
# declared as a `#import c` unit — `sx run` compiles (cached) and loads it
|
||||
# as a priority symbol target; the version assert in tests/sqlite_smoke.sx
|
||||
# proves the OS copy never shadows it.
|
||||
set -u
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#import "modules/std/json.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/server_http";
|
||||
MDIR :: ".sx-tmp/server_http_m";
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
hash :: #import "modules/std/hash.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/server_write";
|
||||
PORT :: "18793";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Pinned acceptance for the FULL SQLite mapping (src/db/sqlite.sx) —
|
||||
// Pinned acceptance for the FULL SQLite mapping (vendors/sqlite, shipped with sx) —
|
||||
// every wrapper family beyond the P5.1 smoke (which keeps owning the
|
||||
// vendored-version pin):
|
||||
//
|
||||
@@ -22,7 +22,7 @@
|
||||
// query answers match.
|
||||
#import "modules/std.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
DBDIR :: ".sx-tmp/sqlite_api";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Pinned acceptance for P5.1 — the VENDORED SQLite is compiled and
|
||||
// usable through src/db/sqlite.sx's `#import c` unit.
|
||||
// Pinned acceptance for P5.1 — the sx-shipped SQLite (vendors/sqlite) is
|
||||
// compiled and usable through its `#import c` unit.
|
||||
//
|
||||
// * version: sqlite3_libversion() equals the vendored amalgamation's
|
||||
// version (vendor/sqlite/README.md) — a silent fallback to the OS
|
||||
@@ -14,7 +14,7 @@
|
||||
#import "modules/std.sx";
|
||||
#import "modules/std/fs.sx";
|
||||
process :: #import "modules/std/process.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
VENDORED_VERSION :: "3.53.2";
|
||||
DBDIR :: ".sx-tmp/sqlite_smoke";
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
process :: #import "modules/std/process.sx";
|
||||
fs :: #import "modules/std/fs.sx";
|
||||
hash :: #import "modules/std/hash.sx";
|
||||
sq :: #import "../src/db/sqlite.sx";
|
||||
sq :: #import "vendors/sqlite/sqlite.sx";
|
||||
|
||||
STORE :: ".sx-tmp/token_ops";
|
||||
MDIR :: ".sx-tmp/token_ops_m";
|
||||
|
||||
Reference in New Issue
Block a user