Commit faf3b25
Guard TEXT binds with embedded NULs at the dbapi layer
dqlite's wire encodes TEXT as NUL-terminated UTF-8, so a Python str
with embedded "\x00" cannot round-trip. The wire encoder already
rejects with EncodeError (which cursor._call_client wraps as
DataError), so the failure was already in the dbapi.Error hierarchy
— but the wire-internal diagnostic talked about "null-terminated
encoding would lose data", not the actionable workaround.
Stdlib sqlite3 accepts the same bind faithfully (sqlite3_bind_text
stores the bytes as-is; only sqlite3_column_text truncates at the
first NUL on read-back, while sqlite3_column_blob round-trips). So
cross-driver code that stores NUL-containing payloads in TEXT works
silently on stdlib and raises on dqlite — and the operator reading
the wire-internal diagnostic had no breadcrumb pointing at the BLOB
column / bytes-bind workaround.
Add a pre-encode guard at _convert_bind_param that raises DataError
with a diagnostic naming the offset of the offending NUL and the
canonical BLOB workaround. Runs after the adapter / __conform__
chain so an adapter that produces a NUL-bearing str is also caught
at the adapter site rather than escaping into the wire encoder.
Defence-in-depth: the wire-layer rejection stays in place.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent fef8c60 commit faf3b25
2 files changed
Lines changed: 128 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1029 | 1029 | | |
1030 | 1030 | | |
1031 | 1031 | | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
| 1044 | + | |
1032 | 1045 | | |
1033 | 1046 | | |
1034 | 1047 | | |
| |||
1118 | 1131 | | |
1119 | 1132 | | |
1120 | 1133 | | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
1121 | 1157 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
0 commit comments