orchid-orm 1.59.1 → 1.59.3

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.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { makeColumnTypes, getStackTrace, applyMixins, QueryHooks, defaultSchemaConfig, raw, getCallerFilePath, snakeCaseKey, getColumnTypes, parseTableData, toSnakeCase, emptyObject, emptyArray, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValueImmutable, pushQueryOnForOuter, isExpression, cloneQueryBaseUnscoped, DynamicRawSQL, RawSQL, getShapeFromSelect, _queryWhere, _queryDefaults, getPrimaryKeys, VirtualColumn, _with, _queryCreate, _orCreate, getFreeAlias, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryRows, _queryUpdate, _queryDelete, prepareSubQueryForSql, _queryUpdateOrThrow, _queryCreateMany, OrchidOrmInternalError, toArray, objectHasValues, _queryJoinOn, _queryCreateManyFrom, NotFoundError, _queryFindByOptional, _querySelect, pick, _queryWhereExists, _queryTake, _queryTakeOptional, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
1
+ import { makeColumnTypes, getStackTrace, applyMixins, QueryHooks, defaultSchemaConfig, raw, getCallerFilePath, snakeCaseKey, getColumnTypes, parseTableData, toSnakeCase, emptyObject, emptyArray, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValueImmutable, pushQueryOnForOuter, isExpression, cloneQueryBaseUnscoped, DynamicRawSQL, RawSql, getShapeFromSelect, _queryWhere, _queryDefaults, getPrimaryKeys, VirtualColumn, _with, _queryCreate, _orCreate, getFreeAlias, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryRows, _queryUpdate, _queryDelete, prepareSubQueryForSql, _queryUpdateOrThrow, _queryCreateMany, OrchidOrmInternalError, toArray, objectHasValues, _queryJoinOn, _queryCreateManyFrom, NotFoundError, _queryFindByOptional, _querySelect, pick, _queryWhereExists, _queryTake, _queryTakeOptional, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
2
2
  export * from 'pqb';
3
3
  import { AsyncLocalStorage } from 'node:async_hooks';
4
4
 
@@ -387,7 +387,7 @@ const combineOrdering = (result, joined) => {
387
387
  const wrapQuery = (joiningQuery, result, item) => {
388
388
  const baseOuterQuery = cloneQueryBaseUnscoped(joiningQuery);
389
389
  const outer = baseOuterQuery.clone();
390
- outer.q.and = [new DynamicRawSQL(() => new RawSQL(`${item.as || "r"} = 1`))];
390
+ outer.q.and = [new DynamicRawSQL(() => new RawSql(`${item.as || "r"} = 1`))];
391
391
  outer.q.useFromLimitOffset = true;
392
392
  outer.shape = getShapeFromSelect(result, true);
393
393
  outer.q.select = Object.keys(outer.shape);
@@ -415,7 +415,7 @@ class BelongsToVirtualColumn extends VirtualColumn {
415
415
  }
416
416
  const value = item[key];
417
417
  if ("create" in value || "connectOrCreate" in value) {
418
- foreignKeys.forEach((foreignKey) => item[foreignKey] = new RawSQL(""));
418
+ foreignKeys.forEach((foreignKey) => item[foreignKey] = new RawSql(""));
419
419
  const selectPKeys = query.select(...primaryKeys);
420
420
  _with(
421
421
  q,
@@ -437,7 +437,7 @@ class BelongsToVirtualColumn extends VirtualColumn {
437
437
  _with(q, as, query.select(...primaryKeys).findBy(value.connect));
438
438
  foreignKeys.map((foreignKey, i) => {
439
439
  const selectColumn = `(SELECT "${as}"."${primaryKeys[i]}" FROM "${as}")`;
440
- item[foreignKey] = new RawSQL(
440
+ item[foreignKey] = new RawSql(
441
441
  i === 0 ? `CASE WHEN (SELECT count(*) FROM "${as}") = 0 AND (SELECT 'not-found')::int = 0 THEN NULL ELSE ${selectColumn} END` : selectColumn
442
442
  );
443
443
  });