Commit 0109ffb
committed
feat(linux): per-table WHERE filter dialog with full operator set
Server-side filter for the Browse tab with per-column operators,
type-aware value coercion, and per-(connection, schema, table)
persistence. Reachable via a Filter button on the paginator action
bar and Ctrl+R shortcut.
Architecture (3 layers, 3 new files):
- crates/core/src/filter.rs: FilterSet / FilterRule / FilterOp /
FilterValue / Combinator types + build_filter_where(driver_id,
columns, set) -> Result<Option<(String, Vec<Value>)>, BuildFilterError>.
Returns Ok(None) for empty rules so callers skip WHERE entirely.
Identifiers via sql_dialect::quote_ident; placeholders via
placeholder_for ($N for PG, ? for MySQL/SQLite). Type-aware
coercion: "42" against an int column binds as Value::Int(42),
not Value::Text. PG ILIKE; falls back to LIKE on MySQL/SQLite.
29 unit tests cover every operator, all three drivers' placeholder
dialects, type coercion (int/float/decimal/date/datetime/timestamptz/
uuid/bool/json), error paths, and serde round-trip.
- crates/app/src/services/filter_settings.rs: per-(connection_id,
schema, table) persistence in $XDG_CONFIG_HOME/tablepro/filter_settings.json.
Atomic temp-file rename via existing config_io::atomic_write_json.
Empty FilterSet save removes the entry so the file shrinks back.
Schema is in the key (column_widths.json doesn't include schema —
latent bug there, not fixed in this commit). 3 unit tests.
- crates/app/src/ui/filter_dialog.rs: AdwDialog with the rule editor.
Match-combinator at the top (DropDown: All / Any), boxed-list of
rules below, Add Rule footer row. Value widget shape adapts to
operator (None for IsNull, Single for Eq/Lt, Pair for BETWEEN,
List for IN). Column-type narrows the operator dropdown via per-
type allowlist mirroring the core classifier. Bytes columns hidden
from the column dropdown. Cancel / Clear all / Apply in the
HeaderBar; default widget = Apply so Enter submits.
Connection trait: new `query_params(sql, params)` with a default
that delegates to `query` for empty params (legacy callers
unchanged) and errors otherwise. PG / MySQL / SQLite drivers
override with sqlx parametric streaming, mirroring the existing
execute_params shape. ReadOnlyConnection passes through (filter
SELECTs are still safe).
Browse plumbing:
- BrowseTab gains current_filter (FilterSet) restored from
filter_settings on init.
- fetch_browse_page composes SELECT * FROM ... WHERE <built> ORDER
BY ... LIMIT ... OFFSET ... and routes via query_params.
No-WHERE + no-ORDER BY keeps the fast-path fetch_rows call so
unfiltered usage doesn't pay the parametric overhead.
- fetch_browse_row_count applies the same WHERE so the "of N" total
reflects filtered counts. Validation errors silently skip there
(the page fetch on the same tick already toasts).
- FilterApplied input persists, resets offset to 0, refreshes
chrome, fires both FetchPage and FetchRowCount.
- Filter button picks up `.accent` CSS class + count-suffixed
tooltip when rules are active.
App:
- new AppMsg::ShowFilterDialog routes to on_show_filter_dialog
which fetches the active tab's columns + current filter and
presents the dialog with an on_apply callback that sends
BrowseTabInput::FilterApplied.
- Ctrl+R bound at window scope; `win.open-filter` action; entry
in the Browse-table section of the shortcuts window.
92 + 103 unit tests pass (29 new filter tests + 3 filter_settings
tests). Manual GUI walkthrough deferred to in-app verification.1 parent fd198a7 commit 0109ffb
14 files changed
Lines changed: 2108 additions & 26 deletions
File tree
- linux/crates
- app/src
- services
- ui
- app
- core/src
- drivers
- mysql/src
- postgres/src
- sqlite/src
| 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 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
27 | 29 | | |
28 | | - | |
| 30 | + | |
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
| |||
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| 42 | + | |
| 43 | + | |
40 | 44 | | |
41 | 45 | | |
42 | 46 | | |
| |||
46 | 50 | | |
47 | 51 | | |
48 | 52 | | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 53 | + | |
56 | 54 | | |
57 | 55 | | |
58 | 56 | | |
59 | 57 | | |
60 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
61 | 74 | | |
62 | 75 | | |
63 | 76 | | |
64 | 77 | | |
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 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
78 | 96 | | |
79 | | - | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
80 | 103 | | |
81 | 104 | | |
82 | 105 | | |
| |||
116 | 139 | | |
117 | 140 | | |
118 | 141 | | |
119 | | - | |
| 142 | + | |
120 | 143 | | |
121 | 144 | | |
122 | 145 | | |
| |||
125 | 148 | | |
126 | 149 | | |
127 | 150 | | |
| 151 | + | |
| 152 | + | |
128 | 153 | | |
129 | 154 | | |
130 | 155 | | |
131 | 156 | | |
132 | 157 | | |
133 | 158 | | |
134 | 159 | | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
135 | 170 | | |
136 | 171 | | |
137 | 172 | | |
| |||
144 | 179 | | |
145 | 180 | | |
146 | 181 | | |
147 | | - | |
148 | | - | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
149 | 193 | | |
150 | 194 | | |
151 | 195 | | |
| |||
283 | 327 | | |
284 | 328 | | |
285 | 329 | | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
286 | 365 | | |
287 | 366 | | |
288 | 367 | | |
| |||
0 commit comments