Repository navigation
Commit de31dc6
authored
fix(jdbc): map in-transaction Hrana errors through the error mapper (#149)
Fixes #109
Contract: Hrana 3 is the source of truth for transport, values,
metadata, batching, transactions, and error reporting. `java.sql` is the
source of truth for the JDBC surface. xerial/sqlite-jdbc is a behavioral
reference, never a copy target.
Inside a transaction, a `StreamResult.Error` was turned into a plain
`SQLException(message)`, so SQLState, vendor code, and the constraint
category were lost. All four result sites now throw
`LibsqlErrorMapper.toSQLException(HranaError)`: `executeStatement`,
`beginTransaction`, `endTransaction`, and `extractBatchResults`.
`BatchUpdateException` now carries the mapped SQLState/vendor code and
keeps the mapped exception as its cause.
`Error.code` is mapped when present. Because Hrana 3 says the codes are
not yet stabilized, an unrecognized or absent code falls back to
categorizing the SQLite message (`UNIQUE constraint failed`, `FOREIGN
KEY constraint failed`, `NOT NULL constraint failed`, `CHECK constraint
failed`), so a unique violation maps to
`SQLIntegrityConstraintViolationException` / `23000` even when sqld
sends no code.
Base: `c3ef4de03b4188dfb98cc3e8d565b12ea41bec1b`
Head: `2612b9e10a4ae23b673c9ef56e102e5d0ad3410d`
Red: with the new `LibsqlConnectionTest` cases applied to trunk, 7 fail:
the two transaction-mode halves of the unique-violation case and every
explicit begin/execute/end/batch case; the auto-commit half passes on
trunk (it already used the mapper). Log:
`/tmp/xerial-parity-i109/lane-1-regression.log`.
Green: 36/36 `LibsqlConnectionTest` cases pass at the head
(`/tmp/xerial-parity-i109/green-unit.log`).
Lanes (all at head `2612b9e`, logs in `/tmp/xerial-parity-i109/`):
1. Regression — red at trunk, green at head.
2. Batch failure cases — pass; `BatchUpdateException` wraps the mapped
cause.
3. Four sites (begin, execute, end, batch) — pass; each maps 23000/19
where a constraint error is scripted.
4. `./mvnw -pl libsql-jdbc test` — 293 pass, BUILD SUCCESS.
5. Conformance — 123 pass, 1 skipped, BUILD SUCCESS.
6. xerial control — 100 pass, 1 skipped, BUILD SUCCESS.
7. `spotless:check` — BUILD SUCCESS.
8. Full reactor — BUILD SUCCESS.
9. Live sqld
(`TransactionLifecycleIT#uniqueViolationKeepsItsMappedSqlStateInBothModes`)
— pass; real sqld error keeps `23000` in both modes.
10. Package — jar builds.
Perf: three interleaved `time ./mvnw -pl libsql-jdbc test` runs per
side, repeated once (six samples each). Trunk median 2.108 s, head
median 2.111 s (+0.1%), within the 10% rule.
Files outside the plan's Files block:
- `LibsqlErrorMapper.java`: required to add the `HranaError` overload
and keep one mapping path, as the issue asks.
- `libsql-itests/.../TransactionLifecycleIT.java`: lane 9 asks for a
transaction-error itest; no existing case asserted SQLState against real
sqld.
No other divergences.1 parent c3ef4de commit de31dc6
4 files changed
Lines changed: 214 additions & 24 deletions
File tree
- libsql-itests/src/test/java/com/github/magnusp/libsql/itest
- libsql-jdbc/src
- main/java/com/github/magnusp/libsql/jdbc
- test/java/com/github/magnusp/libsql/jdbc
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| 11 | + | |
10 | 12 | | |
11 | 13 | | |
12 | 14 | | |
| |||
170 | 172 | | |
171 | 173 | | |
172 | 174 | | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
173 | 199 | | |
174 | 200 | | |
175 | 201 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
| |||
185 | 185 | | |
186 | 186 | | |
187 | 187 | | |
188 | | - | |
| 188 | + | |
189 | 189 | | |
190 | 190 | | |
191 | 191 | | |
| |||
197 | 197 | | |
198 | 198 | | |
199 | 199 | | |
200 | | - | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
201 | 208 | | |
202 | 209 | | |
203 | 210 | | |
| |||
251 | 258 | | |
252 | 259 | | |
253 | 260 | | |
254 | | - | |
| 261 | + | |
255 | 262 | | |
256 | 263 | | |
257 | 264 | | |
| |||
382 | 389 | | |
383 | 390 | | |
384 | 391 | | |
385 | | - | |
| 392 | + | |
386 | 393 | | |
387 | 394 | | |
388 | 395 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | | - | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | | - | |
11 | 9 | | |
12 | | - | |
13 | 10 | | |
| 11 | + | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
17 | 15 | | |
18 | | - | |
19 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
20 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
21 | 35 | | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
28 | 39 | | |
29 | 40 | | |
30 | | - | |
| 41 | + | |
31 | 42 | | |
32 | 43 | | |
33 | | - | |
| 44 | + | |
34 | 45 | | |
35 | 46 | | |
36 | 47 | | |
37 | | - | |
38 | | - | |
| 48 | + | |
| 49 | + | |
39 | 50 | | |
40 | | - | |
41 | | - | |
| 51 | + | |
| 52 | + | |
42 | 53 | | |
43 | 54 | | |
44 | | - | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
45 | 69 | | |
46 | 70 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
| |||
39 | 41 | | |
40 | 42 | | |
41 | 43 | | |
| 44 | + | |
42 | 45 | | |
43 | 46 | | |
44 | 47 | | |
| |||
435 | 438 | | |
436 | 439 | | |
437 | 440 | | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
438 | 547 | | |
439 | 548 | | |
440 | 549 | | |
| |||
577 | 686 | | |
578 | 687 | | |
579 | 688 | | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
580 | 713 | | |
581 | 714 | | |
582 | 715 | | |
| |||
0 commit comments