orchid-orm 1.11.4 → 1.12.0

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.
Files changed (9) hide show
  1. package/codegen/index.js +2 -2
  2. package/codegen/index.js.map +1 -1
  3. package/codegen/index.mjs +2 -2
  4. package/codegen/index.mjs.map +1 -1
  5. package/dist/index.d.ts +37 -37
  6. package/dist/index.js +4 -0
  7. package/dist/index.js.map +1 -1
  8. package/dist/index.mjs +1 -1
  9. package/package.json +5 -5
package/dist/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import * as pqb from 'pqb';
2
2
  import { BelongsToRelation, HasManyRelation, HasOneRelation, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, Query, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, HasAndBelongsToManyRelation, SetQueryTableAlias, BaseRelation, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, DefaultColumnTypes, QueryData, QueryBase, ColumnsShape, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
3
- export { OrchidOrmError, OrchidOrmInternalError, columnTypes, testTransaction } from 'pqb';
3
+ export { OrchidOrmError, OrchidOrmInternalError, columnTypes, raw, testTransaction } from 'pqb';
4
4
  import * as orchid_core from 'orchid-core';
5
5
  import { StringKey, EmptyObject, ColumnTypesBase, ColumnsShapeBase, ColumnShapeOutput } from 'orchid-core';
6
6
 
@@ -174,12 +174,12 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
174
174
  };
175
175
  timestamp(): T;
176
176
  timestampsSnakeCase(): {
177
- createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
178
- updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
177
+ createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
178
+ updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
179
179
  };
180
180
  }): {
181
- createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
182
- updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
181
+ createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
182
+ updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
183
183
  };
184
184
  timestampsSnakeCase<T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
185
185
  name(name: string): {
@@ -187,8 +187,8 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
187
187
  };
188
188
  timestamp(): T_1;
189
189
  }): {
190
- createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
191
- updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
190
+ createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
191
+ updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
192
192
  };
193
193
  timestampsNoTZ<T_2 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
194
194
  name(name: string): {
@@ -196,12 +196,12 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
196
196
  };
197
197
  timestampNoTZ(): T_2;
198
198
  timestampsNoTZSnakeCase(): {
199
- createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
200
- updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
199
+ createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
200
+ updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
201
201
  };
202
202
  }): {
203
- createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
204
- updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
203
+ createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
204
+ updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
205
205
  };
206
206
  timestampsNoTZSnakeCase<T_3 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
207
207
  name(name: string): {
@@ -209,15 +209,15 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
209
209
  };
210
210
  timestampNoTZ(): T_3;
211
211
  }): {
212
- createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
213
- updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
212
+ createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
213
+ updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
214
214
  };
215
215
  name: typeof orchid_core.name;
216
216
  sql: {
217
- (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawExpression;
218
- (sql: string): orchid_core.RawExpression;
219
- (values: Record<string, unknown>, sql: string): orchid_core.RawExpression;
220
- (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawExpression;
217
+ (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
218
+ (sql: string): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
219
+ (values: Record<string, unknown>, sql: string): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
220
+ (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
221
221
  };
222
222
  smallint(): pqb.SmallIntColumn;
223
223
  integer(): pqb.IntegerColumn;
@@ -306,14 +306,14 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
306
306
  constraint<Table_1 extends string | (() => orchid_core.ForeignKeyTable), Columns extends Table_1 extends () => orchid_core.ForeignKeyTable ? [orchid_core.ColumnNameOfTable<ReturnType<Table_1>>, ...orchid_core.ColumnNameOfTable<ReturnType<Table_1>>[]] : [string, ...string[]]>({ name, references, check, dropMode, }: {
307
307
  name?: string | undefined;
308
308
  references?: [columns: string[], fnOrTable: Table_1, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined] | undefined;
309
- check?: orchid_core.RawExpression | undefined;
309
+ check?: orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}> | undefined;
310
310
  dropMode?: pqb.DropMode | undefined;
311
311
  }): {};
312
312
  foreignKey<Table_2 extends string | (() => orchid_core.ForeignKeyTable), Columns_1 extends Table_2 extends () => orchid_core.ForeignKeyTable ? [orchid_core.ColumnNameOfTable<ReturnType<Table_2>>, ...orchid_core.ColumnNameOfTable<ReturnType<Table_2>>[]] : [string, ...string[]]>(columns: string[], fnOrTable: Table_2, foreignColumns: Columns_1, options?: (pqb.ForeignKeyOptions & {
313
313
  name?: string | undefined;
314
314
  dropMode?: pqb.DropMode | undefined;
315
315
  }) | undefined): {};
316
- check(check: orchid_core.RawExpression): {};
316
+ check(check: orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>): {};
317
317
  } : CT;
318
318
  query: QueryData;
319
319
  filePath: string;
@@ -327,12 +327,12 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
327
327
  };
328
328
  timestamp(): T;
329
329
  timestampsSnakeCase(): {
330
- createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
331
- updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
330
+ createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
331
+ updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
332
332
  };
333
333
  }): {
334
- createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
335
- updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
334
+ createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
335
+ updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
336
336
  };
337
337
  timestampsSnakeCase<T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
338
338
  name(name: string): {
@@ -340,8 +340,8 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
340
340
  };
341
341
  timestamp(): T_1;
342
342
  }): {
343
- createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
344
- updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
343
+ createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
344
+ updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
345
345
  };
346
346
  timestampsNoTZ<T_2 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
347
347
  name(name: string): {
@@ -349,12 +349,12 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
349
349
  };
350
350
  timestampNoTZ(): T_2;
351
351
  timestampsNoTZSnakeCase(): {
352
- createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
353
- updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
352
+ createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
353
+ updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
354
354
  };
355
355
  }): {
356
- createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
357
- updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
356
+ createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
357
+ updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
358
358
  };
359
359
  timestampsNoTZSnakeCase<T_3 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
360
360
  name(name: string): {
@@ -362,15 +362,15 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
362
362
  };
363
363
  timestampNoTZ(): T_3;
364
364
  }): {
365
- createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
366
- updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
365
+ createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
366
+ updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>>;
367
367
  };
368
368
  name: typeof orchid_core.name;
369
369
  sql: {
370
- (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawExpression;
371
- (sql: string): orchid_core.RawExpression;
372
- (values: Record<string, unknown>, sql: string): orchid_core.RawExpression;
373
- (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawExpression;
370
+ (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
371
+ (sql: string): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
372
+ (values: Record<string, unknown>, sql: string): orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
373
+ (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>;
374
374
  };
375
375
  smallint(): pqb.SmallIntColumn;
376
376
  integer(): pqb.IntegerColumn;
@@ -459,14 +459,14 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
459
459
  constraint<Table_1 extends string | (() => orchid_core.ForeignKeyTable), Columns extends Table_1 extends () => orchid_core.ForeignKeyTable ? [orchid_core.ColumnNameOfTable<ReturnType<Table_1>>, ...orchid_core.ColumnNameOfTable<ReturnType<Table_1>>[]] : [string, ...string[]]>({ name, references, check, dropMode, }: {
460
460
  name?: string | undefined;
461
461
  references?: [columns: string[], fnOrTable: Table_1, foreignColumns: Columns, options?: pqb.ForeignKeyOptions | undefined] | undefined;
462
- check?: orchid_core.RawExpression | undefined;
462
+ check?: orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}> | undefined;
463
463
  dropMode?: pqb.DropMode | undefined;
464
464
  }): {};
465
465
  foreignKey<Table_2 extends string | (() => orchid_core.ForeignKeyTable), Columns_1 extends Table_2 extends () => orchid_core.ForeignKeyTable ? [orchid_core.ColumnNameOfTable<ReturnType<Table_2>>, ...orchid_core.ColumnNameOfTable<ReturnType<Table_2>>[]] : [string, ...string[]]>(columns: string[], fnOrTable: Table_2, foreignColumns: Columns_1, options?: (pqb.ForeignKeyOptions & {
466
466
  name?: string | undefined;
467
467
  dropMode?: pqb.DropMode | undefined;
468
468
  }) | undefined): {};
469
- check(check: orchid_core.RawExpression): {};
469
+ check(check: orchid_core.RawSQLBase<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>, {}>): {};
470
470
  } : CT) => T_21): {
471
471
  shape: T_21;
472
472
  type: ColumnShapeOutput<T_21>;
package/dist/index.js CHANGED
@@ -1508,6 +1508,10 @@ Object.defineProperty(exports, 'columnTypes', {
1508
1508
  enumerable: true,
1509
1509
  get: function () { return pqb.columnTypes; }
1510
1510
  });
1511
+ Object.defineProperty(exports, 'raw', {
1512
+ enumerable: true,
1513
+ get: function () { return pqb.raw; }
1514
+ });
1511
1515
  Object.defineProperty(exports, 'testTransaction', {
1512
1516
  enumerable: true,
1513
1517
  get: function () { return pqb.testTransaction; }