orchid-orm 1.9.11 → 1.9.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +94 -42
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +5 -1
- package/dist/index.mjs.map +1 -1
- package/package.json +6 -6
package/dist/index.d.ts
CHANGED
|
@@ -162,24 +162,50 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
162
162
|
noPrimaryKey?: boolean | undefined;
|
|
163
163
|
snakeCase: boolean | undefined;
|
|
164
164
|
columnTypes: Record<string, orchid_core.AnyColumnTypeCreator> extends CT ? {
|
|
165
|
-
timestamps
|
|
165
|
+
timestamps<T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
166
166
|
name(name: string): {
|
|
167
167
|
timestamp(): T;
|
|
168
168
|
};
|
|
169
169
|
timestamp(): T;
|
|
170
|
-
|
|
170
|
+
timestampsSnakeCase(): {
|
|
171
|
+
createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
172
|
+
updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
173
|
+
};
|
|
174
|
+
}): {
|
|
171
175
|
createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
172
176
|
updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
173
177
|
};
|
|
174
|
-
timestampsSnakeCase
|
|
178
|
+
timestampsSnakeCase<T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
175
179
|
name(name: string): {
|
|
176
180
|
timestamp(): T_1;
|
|
177
181
|
};
|
|
178
182
|
timestamp(): T_1;
|
|
179
|
-
})
|
|
183
|
+
}): {
|
|
180
184
|
createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
|
|
181
185
|
updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
|
|
182
186
|
};
|
|
187
|
+
timestampsNoTZ<T_2 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
188
|
+
name(name: string): {
|
|
189
|
+
timestampNoTZ(): T_2;
|
|
190
|
+
};
|
|
191
|
+
timestampNoTZ(): T_2;
|
|
192
|
+
timestampsNoTZSnakeCase(): {
|
|
193
|
+
createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
194
|
+
updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
195
|
+
};
|
|
196
|
+
}): {
|
|
197
|
+
createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
198
|
+
updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
199
|
+
};
|
|
200
|
+
timestampsNoTZSnakeCase<T_3 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
201
|
+
name(name: string): {
|
|
202
|
+
timestampNoTZ(): T_3;
|
|
203
|
+
};
|
|
204
|
+
timestampNoTZ(): T_3;
|
|
205
|
+
}): {
|
|
206
|
+
createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
|
|
207
|
+
updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
|
|
208
|
+
};
|
|
183
209
|
name: typeof orchid_core.name;
|
|
184
210
|
raw: (sql: string, values?: false | Record<string, unknown> | undefined) => orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>;
|
|
185
211
|
smallint(): pqb.SmallIntColumn;
|
|
@@ -201,12 +227,12 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
201
227
|
citext(min: number, max: number): pqb.CitextColumn;
|
|
202
228
|
bytea(): pqb.ByteaColumn;
|
|
203
229
|
date(): pqb.DateColumn;
|
|
204
|
-
|
|
205
|
-
timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.
|
|
230
|
+
timestampNoTZ<Precision_2 extends number>(precision?: Precision_2 | undefined): pqb.TimestampColumn<Precision_2>;
|
|
231
|
+
timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.TimestampTZColumn<number>;
|
|
206
232
|
time<Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined): pqb.TimeColumn<Precision_4>;
|
|
207
233
|
interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_5 | undefined): pqb.IntervalColumn<Fields, Precision_5>;
|
|
208
234
|
boolean(): pqb.BooleanColumn;
|
|
209
|
-
enum<U extends string,
|
|
235
|
+
enum<U extends string, T_4 extends [U, ...U[]]>(dataType: string, type: T_4): pqb.EnumColumn<U, T_4>;
|
|
210
236
|
point(): pqb.PointColumn;
|
|
211
237
|
line(): pqb.LineColumn;
|
|
212
238
|
lseg(): pqb.LsegColumn;
|
|
@@ -226,8 +252,8 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
226
252
|
xml(): pqb.XMLColumn;
|
|
227
253
|
json<Type extends orchid_core.JSONTypeAny>(schemaOrFn: Type | ((j: {
|
|
228
254
|
set: <Value extends orchid_core.JSONTypeAny>(valueType: Value) => orchid_core.JSONSet<Value>;
|
|
229
|
-
tuple: <
|
|
230
|
-
union: <
|
|
255
|
+
tuple: <T_5 extends [] | orchid_core.JSONTupleItems, Rest extends orchid_core.JSONTypeAny | null = null>(items: T_5, rest?: Rest) => orchid_core.JSONTuple<T_5, Rest>;
|
|
256
|
+
union: <T_6 extends [orchid_core.JSONTypeAny, orchid_core.JSONTypeAny, ...orchid_core.JSONTypeAny[]]>(types: T_6) => orchid_core.JSONUnion<T_6>;
|
|
231
257
|
any: () => orchid_core.JSONAny;
|
|
232
258
|
bigint: () => orchid_core.JSONBigInt;
|
|
233
259
|
boolean: () => orchid_core.JSONBoolean;
|
|
@@ -240,21 +266,21 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
240
266
|
unknown: () => orchid_core.JSONUnknown;
|
|
241
267
|
array: <Type_1 extends orchid_core.JSONTypeAny>(element: Type_1) => orchid_core.JSONArray<Type_1, "many">;
|
|
242
268
|
discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends orchid_core.Primitive, Types extends [orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => orchid_core.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types>;
|
|
243
|
-
enum: <U_1 extends string,
|
|
244
|
-
instanceOf: <
|
|
269
|
+
enum: <U_1 extends string, T_7 extends [U_1, ...U_1[]]>(options: T_7) => orchid_core.JSONEnum<U_1, T_7>;
|
|
270
|
+
instanceOf: <T_8 extends new (...args: any[]) => any>(cls: T_8) => orchid_core.JSONInstanceOf<T_8>;
|
|
245
271
|
intersection: <Left extends orchid_core.JSONTypeAny, Right extends orchid_core.JSONTypeAny>(left: Left, right: Right) => orchid_core.JSONIntersection<Left, Right>;
|
|
246
|
-
lazy: <
|
|
247
|
-
literal: <
|
|
272
|
+
lazy: <T_9 extends orchid_core.JSONTypeAny>(fn: () => T_9) => orchid_core.JSONLazy<T_9>;
|
|
273
|
+
literal: <T_10 extends orchid_core.Primitive>(value: T_10) => orchid_core.JSONLiteral<T_10>;
|
|
248
274
|
map: <Key extends orchid_core.JSONTypeAny, Value_1 extends orchid_core.JSONTypeAny>(keyType: Key, valueType: Value_1) => orchid_core.JSONMap<Key, Value_1>;
|
|
249
|
-
nativeEnum: <
|
|
250
|
-
nullable: <
|
|
251
|
-
nullish: <
|
|
252
|
-
object: <
|
|
275
|
+
nativeEnum: <T_11 extends orchid_core.EnumLike>(givenEnum: T_11) => orchid_core.JSONNativeEnum<T_11>;
|
|
276
|
+
nullable: <T_12 extends orchid_core.JSONTypeAny>(type: T_12) => orchid_core.JSONNullable<T_12>;
|
|
277
|
+
nullish: <T_13 extends orchid_core.JSONTypeAny>(type: T_13) => orchid_core.JSONNullish<T_13>;
|
|
278
|
+
object: <T_14 extends orchid_core.JSONObjectShape, UnknownKeys extends orchid_core.UnknownKeysParam = "strip", Catchall extends orchid_core.JSONTypeAny = orchid_core.JSONTypeAny>(shape: T_14) => orchid_core.JSONObject<T_14, UnknownKeys, Catchall, orchid_core.JSONTypeAny extends Catchall ? orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_15 extends object ? { [k in keyof T_15]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never : (orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_18 extends object ? { [k in keyof T_18]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never) & {
|
|
253
279
|
[k: string]: Catchall["type"];
|
|
254
|
-
} extends infer
|
|
280
|
+
} extends infer T_16 extends object ? { [k_2 in keyof T_16]: ((orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_17 extends object ? { [k in keyof T_17]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never) & {
|
|
255
281
|
[k: string]: Catchall["type"];
|
|
256
282
|
})[k_2]; } : never>;
|
|
257
|
-
optional: <
|
|
283
|
+
optional: <T_19 extends orchid_core.JSONTypeAny>(type: T_19) => orchid_core.JSONOptional<T_19>;
|
|
258
284
|
record: typeof orchid_core.record;
|
|
259
285
|
}) => Type)): pqb.JSONColumn<Type>;
|
|
260
286
|
jsonText(): pqb.JSONTextColumn;
|
|
@@ -279,25 +305,51 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
279
305
|
check(check: orchid_core.RawExpression): {};
|
|
280
306
|
} : CT;
|
|
281
307
|
filePath: string;
|
|
282
|
-
setColumns<
|
|
283
|
-
timestamps
|
|
308
|
+
setColumns<T_20 extends ColumnsShape>(fn: (t: Record<string, orchid_core.AnyColumnTypeCreator> extends CT ? {
|
|
309
|
+
timestamps<T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
284
310
|
name(name: string): {
|
|
285
311
|
timestamp(): T;
|
|
286
312
|
};
|
|
287
313
|
timestamp(): T;
|
|
288
|
-
|
|
314
|
+
timestampsSnakeCase(): {
|
|
315
|
+
createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
316
|
+
updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
317
|
+
};
|
|
318
|
+
}): {
|
|
289
319
|
createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
290
320
|
updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
|
|
291
321
|
};
|
|
292
|
-
timestampsSnakeCase
|
|
322
|
+
timestampsSnakeCase<T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
293
323
|
name(name: string): {
|
|
294
324
|
timestamp(): T_1;
|
|
295
325
|
};
|
|
296
326
|
timestamp(): T_1;
|
|
297
|
-
})
|
|
327
|
+
}): {
|
|
298
328
|
createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
|
|
299
329
|
updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
|
|
300
330
|
};
|
|
331
|
+
timestampsNoTZ<T_2 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
332
|
+
name(name: string): {
|
|
333
|
+
timestampNoTZ(): T_2;
|
|
334
|
+
};
|
|
335
|
+
timestampNoTZ(): T_2;
|
|
336
|
+
timestampsNoTZSnakeCase(): {
|
|
337
|
+
createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
338
|
+
updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
339
|
+
};
|
|
340
|
+
}): {
|
|
341
|
+
createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
342
|
+
updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
|
|
343
|
+
};
|
|
344
|
+
timestampsNoTZSnakeCase<T_3 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
|
|
345
|
+
name(name: string): {
|
|
346
|
+
timestampNoTZ(): T_3;
|
|
347
|
+
};
|
|
348
|
+
timestampNoTZ(): T_3;
|
|
349
|
+
}): {
|
|
350
|
+
createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
|
|
351
|
+
updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
|
|
352
|
+
};
|
|
301
353
|
name: typeof orchid_core.name;
|
|
302
354
|
raw: (sql: string, values?: false | Record<string, unknown> | undefined) => orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>;
|
|
303
355
|
smallint(): pqb.SmallIntColumn;
|
|
@@ -319,12 +371,12 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
319
371
|
citext(min: number, max: number): pqb.CitextColumn;
|
|
320
372
|
bytea(): pqb.ByteaColumn;
|
|
321
373
|
date(): pqb.DateColumn;
|
|
322
|
-
|
|
323
|
-
timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.
|
|
374
|
+
timestampNoTZ<Precision_2 extends number>(precision?: Precision_2 | undefined): pqb.TimestampColumn<Precision_2>;
|
|
375
|
+
timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.TimestampTZColumn<number>;
|
|
324
376
|
time<Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined): pqb.TimeColumn<Precision_4>;
|
|
325
377
|
interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_5 | undefined): pqb.IntervalColumn<Fields, Precision_5>;
|
|
326
378
|
boolean(): pqb.BooleanColumn;
|
|
327
|
-
enum<U extends string,
|
|
379
|
+
enum<U extends string, T_4 extends [U, ...U[]]>(dataType: string, type: T_4): pqb.EnumColumn<U, T_4>;
|
|
328
380
|
point(): pqb.PointColumn;
|
|
329
381
|
line(): pqb.LineColumn;
|
|
330
382
|
lseg(): pqb.LsegColumn;
|
|
@@ -344,8 +396,8 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
344
396
|
xml(): pqb.XMLColumn;
|
|
345
397
|
json<Type extends orchid_core.JSONTypeAny>(schemaOrFn: Type | ((j: {
|
|
346
398
|
set: <Value extends orchid_core.JSONTypeAny>(valueType: Value) => orchid_core.JSONSet<Value>;
|
|
347
|
-
tuple: <
|
|
348
|
-
union: <
|
|
399
|
+
tuple: <T_5 extends [] | orchid_core.JSONTupleItems, Rest extends orchid_core.JSONTypeAny | null = null>(items: T_5, rest?: Rest) => orchid_core.JSONTuple<T_5, Rest>;
|
|
400
|
+
union: <T_6 extends [orchid_core.JSONTypeAny, orchid_core.JSONTypeAny, ...orchid_core.JSONTypeAny[]]>(types: T_6) => orchid_core.JSONUnion<T_6>;
|
|
349
401
|
any: () => orchid_core.JSONAny;
|
|
350
402
|
bigint: () => orchid_core.JSONBigInt;
|
|
351
403
|
boolean: () => orchid_core.JSONBoolean;
|
|
@@ -358,21 +410,21 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
358
410
|
unknown: () => orchid_core.JSONUnknown;
|
|
359
411
|
array: <Type_1 extends orchid_core.JSONTypeAny>(element: Type_1) => orchid_core.JSONArray<Type_1, "many">;
|
|
360
412
|
discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends orchid_core.Primitive, Types extends [orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => orchid_core.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types>;
|
|
361
|
-
enum: <U_1 extends string,
|
|
362
|
-
instanceOf: <
|
|
413
|
+
enum: <U_1 extends string, T_7 extends [U_1, ...U_1[]]>(options: T_7) => orchid_core.JSONEnum<U_1, T_7>;
|
|
414
|
+
instanceOf: <T_8 extends new (...args: any[]) => any>(cls: T_8) => orchid_core.JSONInstanceOf<T_8>;
|
|
363
415
|
intersection: <Left extends orchid_core.JSONTypeAny, Right extends orchid_core.JSONTypeAny>(left: Left, right: Right) => orchid_core.JSONIntersection<Left, Right>;
|
|
364
|
-
lazy: <
|
|
365
|
-
literal: <
|
|
416
|
+
lazy: <T_9 extends orchid_core.JSONTypeAny>(fn: () => T_9) => orchid_core.JSONLazy<T_9>;
|
|
417
|
+
literal: <T_10 extends orchid_core.Primitive>(value: T_10) => orchid_core.JSONLiteral<T_10>;
|
|
366
418
|
map: <Key extends orchid_core.JSONTypeAny, Value_1 extends orchid_core.JSONTypeAny>(keyType: Key, valueType: Value_1) => orchid_core.JSONMap<Key, Value_1>;
|
|
367
|
-
nativeEnum: <
|
|
368
|
-
nullable: <
|
|
369
|
-
nullish: <
|
|
370
|
-
object: <
|
|
419
|
+
nativeEnum: <T_11 extends orchid_core.EnumLike>(givenEnum: T_11) => orchid_core.JSONNativeEnum<T_11>;
|
|
420
|
+
nullable: <T_12 extends orchid_core.JSONTypeAny>(type: T_12) => orchid_core.JSONNullable<T_12>;
|
|
421
|
+
nullish: <T_13 extends orchid_core.JSONTypeAny>(type: T_13) => orchid_core.JSONNullish<T_13>;
|
|
422
|
+
object: <T_14 extends orchid_core.JSONObjectShape, UnknownKeys extends orchid_core.UnknownKeysParam = "strip", Catchall extends orchid_core.JSONTypeAny = orchid_core.JSONTypeAny>(shape: T_14) => orchid_core.JSONObject<T_14, UnknownKeys, Catchall, orchid_core.JSONTypeAny extends Catchall ? orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_21 extends object ? { [k in keyof T_21]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never : (orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_24 extends object ? { [k in keyof T_24]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never) & {
|
|
371
423
|
[k: string]: Catchall["type"];
|
|
372
|
-
} extends infer
|
|
424
|
+
} extends infer T_22 extends object ? { [k_2 in keyof T_22]: ((orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_23 extends object ? { [k in keyof T_23]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never) & {
|
|
373
425
|
[k: string]: Catchall["type"];
|
|
374
426
|
})[k_2]; } : never>;
|
|
375
|
-
optional: <
|
|
427
|
+
optional: <T_19 extends orchid_core.JSONTypeAny>(type: T_19) => orchid_core.JSONOptional<T_19>;
|
|
376
428
|
record: typeof orchid_core.record;
|
|
377
429
|
}) => Type)): pqb.JSONColumn<Type>;
|
|
378
430
|
jsonText(): pqb.JSONTextColumn;
|
|
@@ -395,9 +447,9 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
|
|
|
395
447
|
dropMode?: pqb.DropMode | undefined;
|
|
396
448
|
}) | undefined): {};
|
|
397
449
|
check(check: orchid_core.RawExpression): {};
|
|
398
|
-
} : CT) =>
|
|
399
|
-
shape:
|
|
400
|
-
type: ColumnShapeOutput<
|
|
450
|
+
} : CT) => T_20): {
|
|
451
|
+
shape: T_20;
|
|
452
|
+
type: ColumnShapeOutput<T_20>;
|
|
401
453
|
};
|
|
402
454
|
belongsTo<Self extends any, Related extends TableClass<Table>, Scope extends Query, Options extends {
|
|
403
455
|
primaryKey: keyof InstanceType<Related>["columns"]["shape"];
|
package/dist/index.js
CHANGED
|
@@ -1225,7 +1225,9 @@ const delayRelation = (delayedRelations, table, relationName, data) => {
|
|
|
1225
1225
|
};
|
|
1226
1226
|
const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations) => {
|
|
1227
1227
|
var _a;
|
|
1228
|
-
const
|
|
1228
|
+
const baseQuery = Object.create(otherDbTable);
|
|
1229
|
+
baseQuery.baseQuery = baseQuery;
|
|
1230
|
+
const query = (relation.options.scope ? relation.options.scope(baseQuery) : baseQuery).as(relationName);
|
|
1229
1231
|
const definedAs = query.definedAs;
|
|
1230
1232
|
if (!definedAs) {
|
|
1231
1233
|
throw new Error(
|
|
@@ -1258,6 +1260,7 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
|
|
|
1258
1260
|
dbTable.shape[relationName] = dbTable.query.shape[relationName] = data.virtualColumn;
|
|
1259
1261
|
}
|
|
1260
1262
|
makeRelationQuery(dbTable, definedAs, relationName, data);
|
|
1263
|
+
baseQuery.joinQuery = data.joinQuery;
|
|
1261
1264
|
dbTable.relations[relationName] = {
|
|
1262
1265
|
type,
|
|
1263
1266
|
key: relationName,
|
|
@@ -1267,6 +1270,7 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
|
|
|
1267
1270
|
primaryKey: data.primaryKey,
|
|
1268
1271
|
options: relation.options
|
|
1269
1272
|
};
|
|
1273
|
+
dbTable.relationsQueries[relationName] = query;
|
|
1270
1274
|
const tableRelations = delayedRelations.get(dbTable);
|
|
1271
1275
|
if (!tableRelations)
|
|
1272
1276
|
return;
|