Repository navigation
Commit b31f7ce
committed
core: rewrite sqlc.arg() to native bind parameters before parsing
sqlc.arg(), sqlc.narg(), sqlc.slice(), sqlc.embed() and @name are sqlc
syntax, not SQL, but they used to survive all the way through every
engine's parser. The pipeline only worked because each converter happened
to round-trip them as an ast.FuncCall with Func.Schema == "sqlc", and that
knowledge was scattered across named.IsParamFunc, three validators, two
AST rewriters and the PostgreSQL engine.
Add internal/sql/preprocess, which rewrites the query text to native SQL
before any engine parser runs. A dialect-parameterized lexer skips
comments, string literals, quoted identifiers and dollar-quoted strings,
then replaces each construct with the engine's placeholder ($1, ?, ?1 or
@name) and records what it replaced: the parameter set, embed spans, slice
spans, placeholder numbers and an offset map back to the original text.
The compiler consumes that side table instead of walking the AST:
- parameter numbering comes from the preprocessor in source order, and
is applied to the parsed AST by placeholder location, so an engine
that converts nodes out of order no longer reorders a query's params
- embeds are matched by location rather than node identity, which tells
a rewritten "t.*" apart from one the user wrote
- placeholder-style validation (mixed styles, numbering gaps) and
sqlc.* validation move into the preprocessor, where they can report
the span of the actual call
Deleted: internal/sql/rewrite, named.IsParamFunc/IsParamSign,
validate.SqlcFunctions, validate.In, validate.ParamRef, and the
sqlc.arg awareness in the PostgreSQL engine. A missed astutils container
node can no longer silently drop a parameter or an embed.
Engine changes are limited to what the removal exposed: GoogleSQL now
converts @name to a ParamRef like every other engine, and ClickHouse
tags binary/unary operators as A_Expr_Kind_OP and seeds comparison and
arithmetic operators so the analysis core can type a WHERE clause. With
those in place sqlc.arg/narg work for ClickHouse with no sqlc-specific
engine code at all.
Error messages for invalid sqlc.* calls now name the offending text
rather than an AST type, and point at the call instead of the statement.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015BSM9xGoosq58r1Mz6B7YP1 parent b82c64f commit b31f7ce
158 files changed
Lines changed: 1897 additions & 857 deletions
File tree
- internal
- compiler
- core/analyzer
- endtoend/testdata
- analyze_sqlc_args/clickhouse
- sqlc_arg_invalid
- mysql
- postgresql
- sqlite
- engine
- clickhouse
- dolphin
- googlesql
- postgresql
- sql
- astutils
- ast
- named
- preprocess
- testdata
- clickhouse
- arg
- at_sign_is_not_a_parameter
- embed
- slice
- googlesql
- arg_keeps_named_parameters
- embed
- slice
- mysql
- arg
- embed
- existing_placeholders_are_numbered_together
- on_duplicate_key_update
- skip_backslash_escape
- skip_backtick_identifier
- skip_double_quoted_string
- skip_hash_comment
- slice
- user_variables_are_not_parameters
- postgresql
- arg
- at_sign_cast
- at_sign
- comment_inside_call
- embed_quoted_identifier
- embed_with_args
- embed
- error_is_per_statement
- error_nested_call
- error_no_arguments
- error_placeholder_argument
- error_too_many_arguments
- error_unknown_function
- existing_placeholder
- extra_whitespace
- multiline_call
- narg
- numbering_restarts_per_statement
- quoted_names
- repeated_name
- skip_block_comment
- skip_dollar_quoted
- skip_escape_string
- skip_jsonb_operators
- skip_line_comment
- skip_nested_block_comment
- skip_other_schemas
- skip_quoted_identifier
- skip_string_literal
- skip_tagged_dollar_quoted
- slice_is_an_array
- statement_terminator_in_string
- uppercase
- sqlite
- arg
- at_sign
- embed
- existing_numbered_placeholder
- repeated_name
- slice
- rewrite
- validate
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
118 | | - | |
| 117 | + | |
| 118 | + | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
122 | | - | |
| 121 | + | |
| 122 | + | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
| |||
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
137 | | - | |
138 | | - | |
| 137 | + | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | | - | |
| 142 | + | |
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
| 161 | + | |
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| |||
175 | 175 | | |
176 | 176 | | |
177 | 177 | | |
178 | | - | |
| 178 | + | |
179 | 179 | | |
180 | 180 | | |
181 | 181 | | |
| |||
190 | 190 | | |
191 | 191 | | |
192 | 192 | | |
193 | | - | |
| 193 | + | |
194 | 194 | | |
195 | 195 | | |
196 | 196 | | |
197 | | - | |
198 | 197 | | |
199 | 198 | | |
200 | 199 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| |||
103 | 104 | | |
104 | 105 | | |
105 | 106 | | |
106 | | - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
107 | 117 | | |
108 | 118 | | |
109 | 119 | | |
110 | 120 | | |
111 | 121 | | |
112 | | - | |
| 122 | + | |
113 | 123 | | |
114 | 124 | | |
115 | 125 | | |
116 | 126 | | |
117 | 127 | | |
118 | 128 | | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
119 | 135 | | |
120 | 136 | | |
121 | 137 | | |
| |||
130 | 146 | | |
131 | 147 | | |
132 | 148 | | |
133 | | - | |
| 149 | + | |
134 | 150 | | |
135 | 151 | | |
136 | 152 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
188 | | - | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
189 | 183 | | |
190 | | - | |
191 | 184 | | |
| 185 | + | |
192 | 186 | | |
193 | 187 | | |
194 | 188 | | |
195 | 189 | | |
196 | | - | |
197 | 190 | | |
198 | 191 | | |
199 | 192 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
261 | | - | |
| 261 | + | |
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
21 | | - | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
22 | 39 | | |
23 | | - | |
| 40 | + | |
24 | 41 | | |
25 | 42 | | |
26 | 43 | | |
| |||
29 | 46 | | |
30 | 47 | | |
31 | 48 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 49 | + | |
44 | 50 | | |
45 | 51 | | |
46 | 52 | | |
| |||
128 | 134 | | |
129 | 135 | | |
130 | 136 | | |
131 | | - | |
| 137 | + | |
132 | 138 | | |
133 | 139 | | |
134 | 140 | | |
| |||
156 | 162 | | |
157 | 163 | | |
158 | 164 | | |
159 | | - | |
| 165 | + | |
160 | 166 | | |
161 | 167 | | |
162 | 168 | | |
| |||
188 | 194 | | |
189 | 195 | | |
190 | 196 | | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
191 | 214 | | |
192 | 215 | | |
193 | 216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
| 17 | + | |
22 | 18 | | |
23 | 19 | | |
24 | 20 | | |
| |||
48 | 44 | | |
49 | 45 | | |
50 | 46 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
| 47 | + | |
| 48 | + | |
59 | 49 | | |
| 50 | + | |
| 51 | + | |
60 | 52 | | |
61 | 53 | | |
62 | 54 | | |
63 | | - | |
| 55 | + | |
64 | 56 | | |
65 | | - | |
| 57 | + | |
66 | 58 | | |
67 | 59 | | |
68 | 60 | | |
| |||
123 | 115 | | |
124 | 116 | | |
125 | 117 | | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
132 | 129 | | |
133 | 130 | | |
134 | 131 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
0 commit comments