Skip to content

Commit 277366f

Browse files
svlandegsvlandeg
committed
use / to denote positional-only parameters
1 parent c49bf7f commit 277366f

File tree

3 files changed

+80
-52
lines changed

3 files changed

+80
-52
lines changed

‎scripts/generate_select.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Arg(BaseModel):
3737
else:
3838
t_type = f"_T{i}"
3939
t_var = f"_TCCA[{t_type}]"
40-
arg = Arg(name=f"_ent{i}", annotation=t_var)
40+
arg = Arg(name=f"ent{i}", annotation=t_var)
4141
ret_type = t_type
4242
args.append(arg)
4343
return_types.append(ret_type)

‎sqlmodel/sql/_expression_select_gen.py‎

Lines changed: 76 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -103,97 +103,108 @@
103103

104104

105105
@overload
106-
def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ...
106+
def select(ent0: _TCCA[_T0], /) -> SelectOfScalar[_T0]: ...
107107

108108

109109
@overload
110-
def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: ...
110+
def select(ent0: _TScalar_0, /) -> SelectOfScalar[_TScalar_0]: ...
111111

112112

113113
# Generated overloads start
114114

115115

116116
@overload
117117
def select(
118-
_ent0: _TCCA[_T0],
119-
_ent1: _TCCA[_T1],
118+
ent0: _TCCA[_T0],
119+
ent1: _TCCA[_T1],
120+
/,
120121
) -> Select[tuple[_T0, _T1]]: ...
121122

122123

123124
@overload
124125
def select(
125-
_ent0: _TCCA[_T0],
126+
ent0: _TCCA[_T0],
126127
entity_1: _TScalar_1,
128+
/,
127129
) -> Select[tuple[_T0, _TScalar_1]]: ...
128130

129131

130132
@overload
131133
def select(
132134
entity_0: _TScalar_0,
133-
_ent1: _TCCA[_T1],
135+
ent1: _TCCA[_T1],
136+
/,
134137
) -> Select[tuple[_TScalar_0, _T1]]: ...
135138

136139

137140
@overload
138141
def select(
139142
entity_0: _TScalar_0,
140143
entity_1: _TScalar_1,
144+
/,
141145
) -> Select[tuple[_TScalar_0, _TScalar_1]]: ...
142146

143147

144148
@overload
145149
def select(
146-
_ent0: _TCCA[_T0],
147-
_ent1: _TCCA[_T1],
148-
_ent2: _TCCA[_T2],
150+
ent0: _TCCA[_T0],
151+
ent1: _TCCA[_T1],
152+
ent2: _TCCA[_T2],
153+
/,
149154
) -> Select[tuple[_T0, _T1, _T2]]: ...
150155

151156

152157
@overload
153158
def select(
154-
_ent0: _TCCA[_T0],
155-
_ent1: _TCCA[_T1],
159+
ent0: _TCCA[_T0],
160+
ent1: _TCCA[_T1],
156161
entity_2: _TScalar_2,
162+
/,
157163
) -> Select[tuple[_T0, _T1, _TScalar_2]]: ...
158164

159165

160166
@overload
161167
def select(
162-
_ent0: _TCCA[_T0],
168+
ent0: _TCCA[_T0],
163169
entity_1: _TScalar_1,
164-
_ent2: _TCCA[_T2],
170+
ent2: _TCCA[_T2],
171+
/,
165172
) -> Select[tuple[_T0, _TScalar_1, _T2]]: ...
166173

167174

168175
@overload
169176
def select(
170-
_ent0: _TCCA[_T0],
177+
ent0: _TCCA[_T0],
171178
entity_1: _TScalar_1,
172179
entity_2: _TScalar_2,
180+
/,
173181
) -> Select[tuple[_T0, _TScalar_1, _TScalar_2]]: ...
174182

175183

176184
@overload
177185
def select(
178186
entity_0: _TScalar_0,
179-
_ent1: _TCCA[_T1],
180-
_ent2: _TCCA[_T2],
187+
ent1: _TCCA[_T1],
188+
ent2: _TCCA[_T2],
189+
/,
181190
) -> Select[tuple[_TScalar_0, _T1, _T2]]: ...
182191

183192

184193
@overload
185194
def select(
186195
entity_0: _TScalar_0,
187-
_ent1: _TCCA[_T1],
196+
ent1: _TCCA[_T1],
188197
entity_2: _TScalar_2,
198+
/,
189199
) -> Select[tuple[_TScalar_0, _T1, _TScalar_2]]: ...
190200

191201

192202
@overload
193203
def select(
194204
entity_0: _TScalar_0,
195205
entity_1: _TScalar_1,
196-
_ent2: _TCCA[_T2],
206+
ent2: _TCCA[_T2],
207+
/,
197208
) -> Select[tuple[_TScalar_0, _TScalar_1, _T2]]: ...
198209

199210

@@ -202,123 +213,137 @@ def select(
202213
entity_0: _TScalar_0,
203214
entity_1: _TScalar_1,
204215
entity_2: _TScalar_2,
216+
/,
205217
) -> Select[tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: ...
206218

207219

208220
@overload
209221
def select(
210-
_ent0: _TCCA[_T0],
211-
_ent1: _TCCA[_T1],
212-
_ent2: _TCCA[_T2],
213-
_ent3: _TCCA[_T3],
222+
ent0: _TCCA[_T0],
223+
ent1: _TCCA[_T1],
224+
ent2: _TCCA[_T2],
225+
ent3: _TCCA[_T3],
226+
/,
214227
) -> Select[tuple[_T0, _T1, _T2, _T3]]: ...
215228

216229

217230
@overload
218231
def select(
219-
_ent0: _TCCA[_T0],
220-
_ent1: _TCCA[_T1],
221-
_ent2: _TCCA[_T2],
232+
ent0: _TCCA[_T0],
233+
ent1: _TCCA[_T1],
234+
ent2: _TCCA[_T2],
222235
entity_3: _TScalar_3,
236+
/,
223237
) -> Select[tuple[_T0, _T1, _T2, _TScalar_3]]: ...
224238

225239

226240
@overload
227241
def select(
228-
_ent0: _TCCA[_T0],
229-
_ent1: _TCCA[_T1],
242+
ent0: _TCCA[_T0],
243+
ent1: _TCCA[_T1],
230244
entity_2: _TScalar_2,
231-
_ent3: _TCCA[_T3],
245+
ent3: _TCCA[_T3],
246+
/,
232247
) -> Select[tuple[_T0, _T1, _TScalar_2, _T3]]: ...
233248

234249

235250
@overload
236251
def select(
237-
_ent0: _TCCA[_T0],
238-
_ent1: _TCCA[_T1],
252+
ent0: _TCCA[_T0],
253+
ent1: _TCCA[_T1],
239254
entity_2: _TScalar_2,
240255
entity_3: _TScalar_3,
256+
/,
241257
) -> Select[tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: ...
242258

243259

244260
@overload
245261
def select(
246-
_ent0: _TCCA[_T0],
262+
ent0: _TCCA[_T0],
247263
entity_1: _TScalar_1,
248-
_ent2: _TCCA[_T2],
249-
_ent3: _TCCA[_T3],
264+
ent2: _TCCA[_T2],
265+
ent3: _TCCA[_T3],
266+
/,
250267
) -> Select[tuple[_T0, _TScalar_1, _T2, _T3]]: ...
251268

252269

253270
@overload
254271
def select(
255-
_ent0: _TCCA[_T0],
272+
ent0: _TCCA[_T0],
256273
entity_1: _TScalar_1,
257-
_ent2: _TCCA[_T2],
274+
ent2: _TCCA[_T2],
258275
entity_3: _TScalar_3,
276+
/,
259277
) -> Select[tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: ...
260278

261279

262280
@overload
263281
def select(
264-
_ent0: _TCCA[_T0],
282+
ent0: _TCCA[_T0],
265283
entity_1: _TScalar_1,
266284
entity_2: _TScalar_2,
267-
_ent3: _TCCA[_T3],
285+
ent3: _TCCA[_T3],
286+
/,
268287
) -> Select[tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: ...
269288

270289

271290
@overload
272291
def select(
273-
_ent0: _TCCA[_T0],
292+
ent0: _TCCA[_T0],
274293
entity_1: _TScalar_1,
275294
entity_2: _TScalar_2,
276295
entity_3: _TScalar_3,
296+
/,
277297
) -> Select[tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: ...
278298

279299

280300
@overload
281301
def select(
282302
entity_0: _TScalar_0,
283-
_ent1: _TCCA[_T1],
284-
_ent2: _TCCA[_T2],
285-
_ent3: _TCCA[_T3],
303+
ent1: _TCCA[_T1],
304+
ent2: _TCCA[_T2],
305+
ent3: _TCCA[_T3],
306+
/,
286307
) -> Select[tuple[_TScalar_0, _T1, _T2, _T3]]: ...
287308

288309

289310
@overload
290311
def select(
291312
entity_0: _TScalar_0,
292-
_ent1: _TCCA[_T1],
293-
_ent2: _TCCA[_T2],
313+
ent1: _TCCA[_T1],
314+
ent2: _TCCA[_T2],
294315
entity_3: _TScalar_3,
316+
/,
295317
) -> Select[tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: ...
296318

297319

298320
@overload
299321
def select(
300322
entity_0: _TScalar_0,
301-
_ent1: _TCCA[_T1],
323+
ent1: _TCCA[_T1],
302324
entity_2: _TScalar_2,
303-
_ent3: _TCCA[_T3],
325+
ent3: _TCCA[_T3],
326+
/,
304327
) -> Select[tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: ...
305328

306329

307330
@overload
308331
def select(
309332
entity_0: _TScalar_0,
310-
_ent1: _TCCA[_T1],
333+
ent1: _TCCA[_T1],
311334
entity_2: _TScalar_2,
312335
entity_3: _TScalar_3,
336+
/,
313337
) -> Select[tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: ...
314338

315339

316340
@overload
317341
def select(
318342
entity_0: _TScalar_0,
319343
entity_1: _TScalar_1,
320-
_ent2: _TCCA[_T2],
321-
_ent3: _TCCA[_T3],
344+
ent2: _TCCA[_T2],
345+
ent3: _TCCA[_T3],
346+
/,
322347
) -> Select[tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: ...
323348

324349

@@ -328,6 +353,7 @@ def select(
328353
entity_1: _TScalar_1,
329354
_ent2: _TCCA[_T2],
330355
entity_3: _TScalar_3,
356+
/,
331357
) -> Select[tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: ...
332358

333359

@@ -337,6 +363,7 @@ def select(
337363
entity_1: _TScalar_1,
338364
entity_2: _TScalar_2,
339365
_ent3: _TCCA[_T3],
366+
/,
340367
) -> Select[tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: ...
341368

342369

@@ -346,6 +373,7 @@ def select(
346373
entity_1: _TScalar_1,
347374
entity_2: _TScalar_2,
348375
entity_3: _TScalar_3,
376+
/,
349377
) -> Select[tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: ...
350378

351379

‎sqlmodel/sql/_expression_select_gen.py.jinja2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ _T{{ i }} = TypeVar("_T{{ i }}")
4848
# Generated TypeVars end
4949

5050
@overload
51-
def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ...
51+
def select(ent0: _TCCA[_T0], /) -> SelectOfScalar[_T0]: ...
5252

5353

5454
@overload
55-
def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: ...
55+
def select(ent0: _TScalar_0, /) -> SelectOfScalar[_TScalar_0]: ...
5656

5757

5858
# Generated overloads start
@@ -61,7 +61,7 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: ...
6161

6262
@overload
6363
def select(
64-
{% for arg in signature[0] %}{{ arg.name }}: {{ arg.annotation }}, {% endfor %}
64+
{% for arg in signature[0] %}{{ arg.name }}: {{ arg.annotation }}, {% endfor %}/,
6565
) -> Select[tuple[{%for ret in signature[1] %}{{ ret }} {% if not loop.last %}, {% endif %}{% endfor %}]]: ...
6666

6767
{% endfor %}

0 commit comments

Comments
 (0)