@justwant/db 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -0
- package/dist/drizzle/createAdapter.d.ts.map +1 -1
- package/dist/drizzle/createAdapter.js +30 -2
- package/dist/drizzle/createAdapter.js.map +1 -1
- package/dist/e2e-helpers.d.ts +10 -0
- package/dist/e2e-helpers.d.ts.map +1 -0
- package/dist/e2e-helpers.js +36 -0
- package/dist/e2e-helpers.js.map +1 -0
- package/dist/e2e-matrix.js +72 -0
- package/dist/e2e-matrix.js.map +1 -0
- package/dist/waddler/core.d.ts.map +1 -1
- package/dist/waddler/core.js +39 -25
- package/dist/waddler/core.js.map +1 -1
- package/dist/waddler/errors.d.ts.map +1 -1
- package/dist/waddler/errors.js +15 -4
- package/dist/waddler/errors.js.map +1 -1
- package/docs/E2E-COVERAGE.md +60 -0
- package/docs/LIMITATIONS.md +25 -0
- package/package.json +17 -5
package/README.md
CHANGED
|
@@ -101,6 +101,43 @@ await users.drop();
|
|
|
101
101
|
## Docs
|
|
102
102
|
|
|
103
103
|
- [Drivers](docs/DRIVERS.md) — config per driver, mapping
|
|
104
|
+
- [Limitations](docs/LIMITATIONS.md) — better-sqlite3 `run()` vs `execute()`, Waddler transactions
|
|
105
|
+
|
|
106
|
+
## E2E Tests
|
|
107
|
+
|
|
108
|
+
Tests run against real database instances.
|
|
109
|
+
|
|
110
|
+
| Backend | Drizzle | Waddler | Prisma |
|
|
111
|
+
|---------|---------|---------|--------|
|
|
112
|
+
| SQLite (Bun) | Yes | Yes | Yes |
|
|
113
|
+
| PGLite | — | Yes | — |
|
|
114
|
+
| PostgreSQL | Yes | Yes | Yes |
|
|
115
|
+
| MySQL | Yes | Yes | Yes |
|
|
116
|
+
|
|
117
|
+
Without Docker: SQLite, PGLite, and Prisma SQLite run. For full coverage including PostgreSQL and MySQL:
|
|
118
|
+
|
|
119
|
+
```bash
|
|
120
|
+
cd packages/db && docker compose up -d
|
|
121
|
+
bun run test:e2e:full
|
|
122
|
+
```
|
|
123
|
+
|
|
124
|
+
Or step by step:
|
|
125
|
+
|
|
126
|
+
```bash
|
|
127
|
+
bunx prisma generate --schema=prisma/schema.postgres.prisma
|
|
128
|
+
bunx prisma generate --schema=prisma/schema.mysql.prisma
|
|
129
|
+
docker compose up -d
|
|
130
|
+
# wait ~5s for DBs to be ready
|
|
131
|
+
DATABASE_URL=postgres://test:test@localhost:5432/justwant_test bunx prisma db push --schema=prisma/schema.postgres.prisma --skip-generate
|
|
132
|
+
DATABASE_URL=mysql://test:test@localhost:3306/justwant_test bunx prisma db push --schema=prisma/schema.mysql.prisma --skip-generate --accept-data-loss
|
|
133
|
+
bun test
|
|
134
|
+
```
|
|
135
|
+
|
|
136
|
+
Stop containers when done:
|
|
137
|
+
|
|
138
|
+
```bash
|
|
139
|
+
bun run test:e2e:down
|
|
140
|
+
```
|
|
104
141
|
|
|
105
142
|
## Invariants
|
|
106
143
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAdapter.d.ts","sourceRoot":"","sources":["../../src/drizzle/createAdapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,OAAO,KAAK,EAEV,cAAc,EACd,aAAa,EAEd,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACnD,oEAAoE;IACpE,OAAO,CAAC,EAAE,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAC;CACrC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,aAAa,EACjB,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,
|
|
1
|
+
{"version":3,"file":"createAdapter.d.ts","sourceRoot":"","sources":["../../src/drizzle/createAdapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,OAAO,KAAK,EAEV,cAAc,EACd,aAAa,EAEd,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,2BAA2B;IAC1C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACnD,oEAAoE;IACpE,OAAO,CAAC,EAAE,IAAI,GAAG,OAAO,GAAG,QAAQ,CAAC;CACrC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,aAAa,EACjB,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,CAoNhB"}
|
|
@@ -89,6 +89,21 @@ export function createDrizzleAdapter(db, options) {
|
|
|
89
89
|
}),
|
|
90
90
|
create: (data) => createBoundQuery(async () => {
|
|
91
91
|
const values = toDbValues(data);
|
|
92
|
+
const idColName = idCol?.name ?? "id";
|
|
93
|
+
const idValue = values[idColName];
|
|
94
|
+
if (dialect === "mysql") {
|
|
95
|
+
await insert(table).values(values);
|
|
96
|
+
if (idValue == null)
|
|
97
|
+
throw new Error("MySQL create requires id in data");
|
|
98
|
+
const rows = (await select()
|
|
99
|
+
.from(table)
|
|
100
|
+
.where(eq(idCol, idValue))
|
|
101
|
+
.limit(1));
|
|
102
|
+
const row = rows[0];
|
|
103
|
+
if (!row)
|
|
104
|
+
throw new Error("Insert did not return row");
|
|
105
|
+
return fromDbRow(row);
|
|
106
|
+
}
|
|
92
107
|
const result = (await insert(table).values(values).returning());
|
|
93
108
|
const row = result[0];
|
|
94
109
|
if (!row)
|
|
@@ -98,6 +113,19 @@ export function createDrizzleAdapter(db, options) {
|
|
|
98
113
|
update: (id, data) => createBoundQuery(async () => {
|
|
99
114
|
const values = toDbValues(data);
|
|
100
115
|
const idColumn = idCol ?? table.id;
|
|
116
|
+
if (dialect === "mysql") {
|
|
117
|
+
await update(table)
|
|
118
|
+
.set(values)
|
|
119
|
+
.where(eq(idColumn, id));
|
|
120
|
+
const rows = (await select()
|
|
121
|
+
.from(table)
|
|
122
|
+
.where(eq(idColumn, id))
|
|
123
|
+
.limit(1));
|
|
124
|
+
const row = rows[0];
|
|
125
|
+
if (!row)
|
|
126
|
+
throw new Error("Update did not return row");
|
|
127
|
+
return fromDbRow(row);
|
|
128
|
+
}
|
|
101
129
|
const result = (await update(table)
|
|
102
130
|
.set(values)
|
|
103
131
|
.where(eq(idColumn, id))
|
|
@@ -149,10 +177,10 @@ export function createDrizzleAdapter(db, options) {
|
|
|
149
177
|
function inferDialect(db) {
|
|
150
178
|
const d = db;
|
|
151
179
|
const dialect = d?.dialect;
|
|
152
|
-
const name = dialect?.name ?? "";
|
|
180
|
+
const name = String(dialect?.name ?? "").toLowerCase();
|
|
153
181
|
if (name === "sqlite" || name === "bun-sqlite" || name.includes("sqlite"))
|
|
154
182
|
return "sqlite";
|
|
155
|
-
if (name === "mysql")
|
|
183
|
+
if (name === "mysql" || name === "mysql2")
|
|
156
184
|
return "mysql";
|
|
157
185
|
// Fallback: bun-sqlite and better-sqlite3 use a client with .exec/.run
|
|
158
186
|
const client = d?.client;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAdapter.js","sourceRoot":"","sources":["../../src/drizzle/createAdapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createAdapter.js","sourceRoot":"","sources":["../../src/drizzle/createAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* E2E helpers for availability checks.
|
|
3
|
+
* Used by integration tests to skip when Docker DBs are not running.
|
|
4
|
+
*/
|
|
5
|
+
export declare const POSTGRES_URL: string;
|
|
6
|
+
export declare const MYSQL_URL: string;
|
|
7
|
+
export declare function hasPostgres(): Promise<boolean>;
|
|
8
|
+
export declare function hasMysql(): Promise<boolean>;
|
|
9
|
+
export declare function skipIf(condition: boolean, message: string): void;
|
|
10
|
+
//# sourceMappingURL=e2e-helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"e2e-helpers.d.ts","sourceRoot":"","sources":["../src/e2e-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,YAAY,QACwD,CAAC;AAClF,eAAO,MAAM,SAAS,QACqD,CAAC;AAE5E,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAUpD;AAED,wBAAsB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAUjD;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAIhE"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* E2E helpers for availability checks.
|
|
3
|
+
* Used by integration tests to skip when Docker DBs are not running.
|
|
4
|
+
*/
|
|
5
|
+
export const POSTGRES_URL = process.env.POSTGRES_URL ?? "postgres://test:test@localhost:5432/justwant_test";
|
|
6
|
+
export const MYSQL_URL = process.env.MYSQL_URL ?? "mysql://test:test@localhost:3306/justwant_test";
|
|
7
|
+
export async function hasPostgres() {
|
|
8
|
+
try {
|
|
9
|
+
const { Pool } = await import("pg");
|
|
10
|
+
const pool = new Pool({ connectionString: POSTGRES_URL });
|
|
11
|
+
await pool.query("SELECT 1");
|
|
12
|
+
await pool.end();
|
|
13
|
+
return true;
|
|
14
|
+
}
|
|
15
|
+
catch {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export async function hasMysql() {
|
|
20
|
+
try {
|
|
21
|
+
const mysql = await import("mysql2/promise");
|
|
22
|
+
const conn = await mysql.createConnection(MYSQL_URL);
|
|
23
|
+
await conn.query("SELECT 1");
|
|
24
|
+
await conn.end();
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
export function skipIf(condition, message) {
|
|
32
|
+
if (condition) {
|
|
33
|
+
console.log(`Skipping E2E: ${message}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=e2e-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"e2e-helpers.js","sourceRoot":"","sources":["../src/e2e-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,YAAY,GACvB,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,mDAAmD,CAAC;AAClF,MAAM,CAAC,MAAM,SAAS,GACpB,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,gDAAgD,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,SAAkB,EAAE,OAAe;IACxD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,iBAAiB,OAAO,EAAE,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared E2E matrix: run the same scenarios across multiple dialect setups.
|
|
3
|
+
* Use with describe() and test() from bun:test.
|
|
4
|
+
*/
|
|
5
|
+
import { expect } from "bun:test";
|
|
6
|
+
/**
|
|
7
|
+
* Registers describe blocks and tests for each setup × scenario.
|
|
8
|
+
* Call from a spec file: runE2EMatrix(setups, scenarios, { describe, test });
|
|
9
|
+
*/
|
|
10
|
+
export function runE2EMatrix(setups, scenarios, runner) {
|
|
11
|
+
const { describe, test } = runner;
|
|
12
|
+
for (const setup of setups) {
|
|
13
|
+
describe(setup.name, () => {
|
|
14
|
+
for (const scenario of scenarios) {
|
|
15
|
+
test(scenario.name, async () => {
|
|
16
|
+
if (!(await setup.available())) {
|
|
17
|
+
console.log(`Skipping E2E ${setup.name}: not available`);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const ctx = await setup.create();
|
|
21
|
+
try {
|
|
22
|
+
await scenario.fn(ctx);
|
|
23
|
+
}
|
|
24
|
+
finally {
|
|
25
|
+
await ctx.teardown?.();
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
/** Standard CRUD scenario. */
|
|
33
|
+
export const scenarioCrud = async (ctx) => {
|
|
34
|
+
const id = `e2e-${Date.now()}`;
|
|
35
|
+
const created = await ctx.create({ id, email: `${id}@test.com`, name: "E2E User" });
|
|
36
|
+
expect(created).toMatchObject({ id, email: `${id}@test.com`, name: "E2E User" });
|
|
37
|
+
const found = await ctx.findById(id);
|
|
38
|
+
expect(found).toMatchObject({ id, email: `${id}@test.com`, name: "E2E User" });
|
|
39
|
+
const updated = await ctx.update(id, { name: "E2E Updated" });
|
|
40
|
+
expect(updated.name).toBe("E2E Updated");
|
|
41
|
+
const rows = await ctx.findMany({ email: `${id}@test.com` });
|
|
42
|
+
expect(rows).toHaveLength(1);
|
|
43
|
+
expect(rows[0]).toMatchObject({ id, name: "E2E Updated" });
|
|
44
|
+
await ctx.hardDelete(id);
|
|
45
|
+
const afterDelete = await ctx.findById(id);
|
|
46
|
+
expect(afterDelete).toBeNull();
|
|
47
|
+
};
|
|
48
|
+
/** Transaction scenario. Requires ctx.transaction. */
|
|
49
|
+
export const scenarioTransaction = async (ctx) => {
|
|
50
|
+
if (!ctx.transaction) {
|
|
51
|
+
console.log("Skipping transaction: not supported");
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
const id = `e2e-tx-${Date.now()}`;
|
|
55
|
+
await ctx.transaction(async (tx) => {
|
|
56
|
+
await tx.create({ id, email: `${id}@test.com`, name: "TX User" });
|
|
57
|
+
});
|
|
58
|
+
const found = await ctx.findById(id);
|
|
59
|
+
expect(found).not.toBeNull();
|
|
60
|
+
expect(found?.email).toBe(`${id}@test.com`);
|
|
61
|
+
await ctx.hardDelete(id);
|
|
62
|
+
};
|
|
63
|
+
/** Unique constraint violation. */
|
|
64
|
+
export const scenarioUniqueViolation = async (ctx) => {
|
|
65
|
+
const id1 = `e2e-dup-${Date.now()}`;
|
|
66
|
+
const id2 = `e2e-dup2-${Date.now()}`;
|
|
67
|
+
await ctx.create({ id: id1, email: "dup@test.com", name: "A" });
|
|
68
|
+
const { AdapterUniqueViolationError } = await import("@justwant/db/errors");
|
|
69
|
+
await expect(ctx.create({ id: id2, email: "dup@test.com", name: "B" })).rejects.toThrow(AdapterUniqueViolationError);
|
|
70
|
+
await ctx.hardDelete(id1);
|
|
71
|
+
};
|
|
72
|
+
//# sourceMappingURL=e2e-matrix.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"e2e-matrix.js","sourceRoot":"","sources":["../src/e2e-matrix.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/waddler/core.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/waddler/core.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,KAAK,EACV,2BAA2B,EAC3B,EAAE,EAKF,uBAAuB,EAIvB,UAAU,EACX,MAAM,YAAY,CAAC;AAgGpB;;GAEG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,uBAAuB,GAAG,EAAE,CAM5D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,2BAA2B,GAAG,EAAE,CAoS9F"}
|
package/dist/waddler/core.js
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { ContractValidationError, validateContractData } from "@justwant/contract/validate";
|
|
5
5
|
import { getCreateTableSQL, getDropTableSQL, getExistTableSQL } from "../ddl/index.js";
|
|
6
|
-
import { appendWhere } from "./buildWhere.js";
|
|
7
6
|
import { parseWaddlerError } from "./errors.js";
|
|
8
7
|
import { mapRowToContract } from "./mapping.js";
|
|
9
8
|
function resolveTableIdentifier(sql, source) {
|
|
@@ -43,34 +42,44 @@ function toRows(result) {
|
|
|
43
42
|
return (r?.rows ?? []);
|
|
44
43
|
}
|
|
45
44
|
/**
|
|
46
|
-
* Build SELECT query with optional WHERE.
|
|
45
|
+
* Build SELECT query with optional WHERE.
|
|
46
|
+
* Uses a single template (no append) to avoid waddler node-postgres bug:
|
|
47
|
+
* NodePgSQLTemplate caches query text at construction; append updates params
|
|
48
|
+
* but not the cached text, causing "bind message supplies N parameters,
|
|
49
|
+
* but prepared statement requires 0".
|
|
47
50
|
*/
|
|
48
51
|
function buildSelectQuery(sql, tableId, mapping, where, softDeleteColName, limit) {
|
|
49
|
-
const
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
append.call(query, sql ` WHERE `);
|
|
55
|
-
append.call(query, sql `${sql.identifier(softDeleteColName)} IS NULL`);
|
|
56
|
-
const whereFiltered = Object.fromEntries(Object.entries(where).filter(([, v]) => v !== undefined));
|
|
57
|
-
if (Object.keys(whereFiltered).length > 0) {
|
|
58
|
-
appendWhere(sql, query, mapping, whereFiltered, {
|
|
59
|
-
firstConnector: " AND ",
|
|
60
|
-
});
|
|
61
|
-
}
|
|
52
|
+
const whereEntries = Object.entries(where).filter(([, v]) => v !== undefined);
|
|
53
|
+
const hasWhere = !!softDeleteColName || whereEntries.length > 0;
|
|
54
|
+
if (!hasWhere) {
|
|
55
|
+
if (limit !== undefined) {
|
|
56
|
+
return sql `SELECT * FROM ${tableId} LIMIT ${limit}`;
|
|
62
57
|
}
|
|
63
|
-
|
|
64
|
-
|
|
58
|
+
return sql `SELECT * FROM ${tableId}`;
|
|
59
|
+
}
|
|
60
|
+
// Build WHERE as single template (no append) for pg/mysql compatibility
|
|
61
|
+
const conditions = [];
|
|
62
|
+
if (softDeleteColName) {
|
|
63
|
+
conditions.push(sql `${sql.identifier(softDeleteColName)} IS NULL`);
|
|
64
|
+
}
|
|
65
|
+
for (const [key, val] of whereEntries) {
|
|
66
|
+
const colName = mapping[key]?.name;
|
|
67
|
+
if (colName) {
|
|
68
|
+
conditions.push(sql `${sql.identifier(colName)} = ${val}`);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
if (conditions.length === 0) {
|
|
72
|
+
if (limit !== undefined) {
|
|
73
|
+
return sql `SELECT * FROM ${tableId} LIMIT ${limit}`;
|
|
65
74
|
}
|
|
75
|
+
return sql `SELECT * FROM ${tableId}`;
|
|
66
76
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
appendWhere(sql, query, mapping, where);
|
|
77
|
+
let query = sql `SELECT * FROM ${tableId} WHERE ${conditions[0]}`;
|
|
78
|
+
for (let i = 1; i < conditions.length; i++) {
|
|
79
|
+
query = sql `${query} AND ${conditions[i]}`;
|
|
71
80
|
}
|
|
72
|
-
if (
|
|
73
|
-
|
|
81
|
+
if (limit !== undefined) {
|
|
82
|
+
query = sql `${query} LIMIT ${limit}`;
|
|
74
83
|
}
|
|
75
84
|
return query;
|
|
76
85
|
}
|
|
@@ -184,7 +193,9 @@ export function createWaddlerAdapter(sql, options) {
|
|
|
184
193
|
}
|
|
185
194
|
const cols = Object.keys(values);
|
|
186
195
|
const vals = Object.values(values);
|
|
187
|
-
const colList =
|
|
196
|
+
const colList = dialect === "mysql"
|
|
197
|
+
? cols.map((c) => `\`${String(c).replace(/`/g, "``")}\``).join(", ")
|
|
198
|
+
: cols.map((c) => `"${String(c).replace(/"/g, '""')}"`).join(", ");
|
|
188
199
|
const returning = supportsReturning ? " RETURNING *" : "";
|
|
189
200
|
const insertQuery = sql `INSERT INTO ${tableId} (${sql.raw(colList)}) VALUES ${sql.values([vals])}${sql.raw(returning)}`;
|
|
190
201
|
const rows = toRows(await insertQuery);
|
|
@@ -192,7 +203,10 @@ export function createWaddlerAdapter(sql, options) {
|
|
|
192
203
|
return fromDbRow(rows[0]);
|
|
193
204
|
}
|
|
194
205
|
if (!supportsReturning && dialect === "mysql") {
|
|
195
|
-
const
|
|
206
|
+
const insertedId = values[idColName];
|
|
207
|
+
if (insertedId == null)
|
|
208
|
+
throw new Error("MySQL create requires id in data");
|
|
209
|
+
const selectQuery = sql `SELECT * FROM ${tableId} WHERE ${sql.identifier(idColName)} = ${insertedId}`;
|
|
196
210
|
const lastRows = toRows(await selectQuery);
|
|
197
211
|
const row = lastRows[0];
|
|
198
212
|
if (!row)
|
package/dist/waddler/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/waddler/core.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/waddler/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/waddler/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAGL,YAAY,EAMb,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/waddler/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAGL,YAAY,EAMb,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAwE5D"}
|
package/dist/waddler/errors.js
CHANGED
|
@@ -8,12 +8,18 @@ import { AdapterCheckViolationError, AdapterConnectionError, AdapterError, Adapt
|
|
|
8
8
|
*/
|
|
9
9
|
export function parseWaddlerError(raw) {
|
|
10
10
|
const err = raw;
|
|
11
|
+
const cause = err?.cause;
|
|
11
12
|
const message = typeof err?.message === "string" ? err.message : String(raw ?? "Unknown error");
|
|
12
|
-
const causeMsg = typeof
|
|
13
|
-
? err.cause.message
|
|
14
|
-
: "";
|
|
13
|
+
const causeMsg = typeof cause?.message === "string" ? cause.message : "";
|
|
15
14
|
const msgToCheck = causeMsg || message;
|
|
16
|
-
const code = err?.code;
|
|
15
|
+
const code = (err?.code ?? cause?.code);
|
|
16
|
+
const errno = (err?.errno ?? cause?.errno);
|
|
17
|
+
if (errno === 1062 || code === "ER_DUP_ENTRY") {
|
|
18
|
+
return new AdapterUniqueViolationError(message, {
|
|
19
|
+
table: String(err?.table ?? cause?.table ?? ""),
|
|
20
|
+
column: String(err?.column ?? cause?.column ?? ""),
|
|
21
|
+
});
|
|
22
|
+
}
|
|
17
23
|
if (typeof code === "string") {
|
|
18
24
|
switch (code) {
|
|
19
25
|
case "23503":
|
|
@@ -60,6 +66,11 @@ export function parseWaddlerError(raw) {
|
|
|
60
66
|
if (msg.includes("CHECK constraint failed")) {
|
|
61
67
|
return new AdapterCheckViolationError(msg);
|
|
62
68
|
}
|
|
69
|
+
if (msg.includes("duplicate key") ||
|
|
70
|
+
msg.includes("Duplicate entry") ||
|
|
71
|
+
msg.includes("UNIQUE constraint")) {
|
|
72
|
+
return new AdapterUniqueViolationError(msg);
|
|
73
|
+
}
|
|
63
74
|
return new AdapterError(String(message), "UNKNOWN", { original: raw });
|
|
64
75
|
}
|
|
65
76
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/waddler/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,YAAY,EACZ,+BAA+B,EAC/B,4BAA4B,EAC5B,mBAAmB,EACnB,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAY;IAC5C,MAAM,GAAG,GAAG,GAA8B,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,eAAe,CAAC,CAAC;IAChG,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/waddler/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
# E2E Coverage et améliorations
|
|
2
|
+
|
|
3
|
+
## État actuel
|
|
4
|
+
|
|
5
|
+
| Couche | SQLite | PGLite | PostgreSQL | MySQL |
|
|
6
|
+
|--------|--------|--------|------------|-------|
|
|
7
|
+
| **Drizzle** | ✅ | — | ✅ | ✅ |
|
|
8
|
+
| **Waddler** | ✅ (bun-sqlite) | ✅ | ✅ | ✅ |
|
|
9
|
+
| **Prisma** | ✅ | — | ✅ | ✅ |
|
|
10
|
+
|
|
11
|
+
- **better-sqlite3** : skip sous Bun (bindings natifs non supportés)
|
|
12
|
+
- **Tests unitaires** : mock ou in-memory uniquement
|
|
13
|
+
|
|
14
|
+
## Pistes d'amélioration
|
|
15
|
+
|
|
16
|
+
### 1. Matrice de compatibilité partagée
|
|
17
|
+
|
|
18
|
+
Créer un helper `runE2EMatrix(dialects, scenarios)` qui exécute les mêmes scénarios (CRUD, transaction, softDelete, unique violation) sur chaque dialecte disponible. Réduit la duplication entre Drizzle, Waddler et Prisma.
|
|
19
|
+
|
|
20
|
+
### 2. Tests de régression par dialecte
|
|
21
|
+
|
|
22
|
+
Pour chaque adapter, ajouter des tests ciblant les différences dialectales :
|
|
23
|
+
|
|
24
|
+
- **PostgreSQL** : `RETURNING`, `jsonb`, `uuid`
|
|
25
|
+
- **MySQL** : pas de `RETURNING` (fallback insert+select), backticks pour identifiants
|
|
26
|
+
- **SQLite** : `TEXT` vs `VARCHAR`, contraintes
|
|
27
|
+
|
|
28
|
+
### 3. better-sqlite3 sous Node
|
|
29
|
+
|
|
30
|
+
Exécuter les tests better-sqlite3 via `node` au lieu de `bun` dans CI :
|
|
31
|
+
|
|
32
|
+
```bash
|
|
33
|
+
node --test packages/db/src/waddler/integration.spec.ts
|
|
34
|
+
```
|
|
35
|
+
|
|
36
|
+
Ou un script dédié : `test:better-sqlite3` qui lance uniquement ces tests avec Node.
|
|
37
|
+
|
|
38
|
+
### 4. Tests de performance / charge
|
|
39
|
+
|
|
40
|
+
Pour valider le comportement sous charge :
|
|
41
|
+
|
|
42
|
+
- Insertions en batch
|
|
43
|
+
- Concurrence (plusieurs clients en parallèle)
|
|
44
|
+
- Transactions longues
|
|
45
|
+
|
|
46
|
+
### 5. CI avec Docker
|
|
47
|
+
|
|
48
|
+
Dans GitHub Actions ou équivalent :
|
|
49
|
+
|
|
50
|
+
```yaml
|
|
51
|
+
services:
|
|
52
|
+
postgres:
|
|
53
|
+
image: postgres:16-alpine
|
|
54
|
+
env: ...
|
|
55
|
+
mysql:
|
|
56
|
+
image: mysql:8
|
|
57
|
+
env: ...
|
|
58
|
+
```
|
|
59
|
+
|
|
60
|
+
Puis exécuter `bun run test:e2e:full` pour une couverture E2E complète à chaque push.
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
# Limitations
|
|
2
|
+
|
|
3
|
+
Known limitations and workarounds for @justwant/db adapters.
|
|
4
|
+
|
|
5
|
+
## better-sqlite3: `run()` vs `execute()`
|
|
6
|
+
|
|
7
|
+
The better-sqlite3 driver requires `run()` for statements that do not return data (DDL, DELETE, UPDATE without RETURNING). The Waddler better-sqlite3 integration may use `execute()` internally for all operations, which can cause:
|
|
8
|
+
|
|
9
|
+
```
|
|
10
|
+
TypeError: This statement does not return data. Use run() instead
|
|
11
|
+
```
|
|
12
|
+
|
|
13
|
+
**Impact:** `hardDelete`, raw DDL, and other non-returning operations may fail when using `@justwant/db/better-sqlite3`.
|
|
14
|
+
|
|
15
|
+
**Workaround:** Use `db.sql.unsafe("CREATE TABLE ...").run()` for DDL when available. For CRUD, `create` and `findById` work; `hardDelete` may need to be skipped or replaced with raw SQL.
|
|
16
|
+
|
|
17
|
+
**Runtime:** better-sqlite3 uses native bindings. Run E2E tests with **Node** (not Bun): `bun run test:better-sqlite3`.
|
|
18
|
+
|
|
19
|
+
## Waddler: no transaction support in E2E matrix
|
|
20
|
+
|
|
21
|
+
The Waddler adapter does not expose a `transaction()` method. The shared E2E matrix (`runE2EMatrix`) runs scenarios across Bun SQLite, PGLite, PostgreSQL, and MySQL, but the transaction scenario is skipped for all Waddler setups.
|
|
22
|
+
|
|
23
|
+
**Impact:** Transaction behavior is not validated in the matrix for Waddler backends.
|
|
24
|
+
|
|
25
|
+
**Workaround:** Use Drizzle or Prisma adapters when transactions are required. Drizzle supports `adapter.transaction(fn)` for SQLite, PostgreSQL, and MySQL.
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@justwant/db",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Data Access Layer (DAL) for transactional databases. Contract-first, ORM-agnostic. Drizzle, Prisma, Waddler.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
9
|
-
"url": "https://github.com/elydelva/justwant",
|
|
9
|
+
"url": "git+https://github.com/elydelva/justwant.git",
|
|
10
10
|
"directory": "packages/db"
|
|
11
11
|
},
|
|
12
12
|
"keywords": [
|
|
@@ -190,9 +190,17 @@
|
|
|
190
190
|
"build": "tsc",
|
|
191
191
|
"typecheck": "tsc --noEmit -p tsconfig.typecheck.json",
|
|
192
192
|
"pretest": "prisma generate && DATABASE_URL=file:./test.db prisma db push --skip-generate",
|
|
193
|
-
"test": "bun test"
|
|
193
|
+
"test": "bun test",
|
|
194
|
+
"test:e2e:full": "bunx prisma generate && bunx prisma generate --schema=prisma/schema.postgres.prisma && bunx prisma generate --schema=prisma/schema.mysql.prisma && docker compose up -d && sleep 5 && DATABASE_URL=postgres://test:test@localhost:5432/justwant_test bunx prisma db push --schema=prisma/schema.postgres.prisma --skip-generate && DATABASE_URL=mysql://test:test@localhost:3306/justwant_test bunx prisma db push --schema=prisma/schema.mysql.prisma --skip-generate --accept-data-loss && bun test",
|
|
195
|
+
"test:e2e:down": "docker compose down",
|
|
196
|
+
"test:better-sqlite3": "bun run build && node scripts/better-sqlite3-e2e.mjs"
|
|
194
197
|
},
|
|
195
|
-
"files": [
|
|
198
|
+
"files": [
|
|
199
|
+
"dist",
|
|
200
|
+
"README.md",
|
|
201
|
+
"docs",
|
|
202
|
+
"prisma/schema.prisma"
|
|
203
|
+
],
|
|
196
204
|
"publishConfig": {
|
|
197
205
|
"access": "public"
|
|
198
206
|
},
|
|
@@ -220,11 +228,15 @@
|
|
|
220
228
|
}
|
|
221
229
|
},
|
|
222
230
|
"devDependencies": {
|
|
223
|
-
"@
|
|
231
|
+
"@electric-sql/pglite": "^0.2.0",
|
|
224
232
|
"@justwant/tsconfig": "workspace:*",
|
|
225
233
|
"@prisma/client": "^6.0.0",
|
|
234
|
+
"@standard-schema/spec": "^1.1.0",
|
|
235
|
+
"@types/pg": "^8.18.0",
|
|
226
236
|
"better-sqlite3": "^11.0.0",
|
|
227
237
|
"drizzle-orm": "^0.45.0",
|
|
238
|
+
"mysql2": "^3.11.0",
|
|
239
|
+
"pg": "^8.13.0",
|
|
228
240
|
"prisma": "^6.0.0",
|
|
229
241
|
"typescript": "^5.7.0",
|
|
230
242
|
"waddler": "*"
|