orchid-orm 1.59.2 → 1.59.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Column, TableData, ColumnsShape, Query, SelectableFromShape, CreateManyMethodsNames, CreateData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, EmptyObject, UpdateData, WhereArg, CreateMethodsNames, MaybeArray, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, AfterCommitStandaloneHook, AdapterBase, FromArg, FromResult, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, RecordUnknown, ShallowSimplify, ComputedOptionsConfig, QueryOrExpression, QueryData, IsQuery, TableDataFn, DbTableOptionScopes, QueryScopes, ColumnSchemaConfig, StaticSQLArgs, RawSQL, DynamicSQLArg, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, AfterHook, WhereResult, MergeQuery, QueryReturnType } from 'pqb';
+import { Column, TableData, ColumnsShape, Query, SelectableFromShape, CreateManyMethodsNames, CreateData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, EmptyObject, UpdateData, WhereArg, CreateMethodsNames, MaybeArray, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, AfterCommitStandaloneHook, AdapterBase, FromArg, FromResult, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, RecordUnknown, ShallowSimplify, ComputedOptionsConfig, QueryOrExpression, QueryData, IsQuery, TableDataFn, DbTableOptionScopes, QueryScopes, ColumnSchemaConfig, StaticSQLArgs, RawSql, DynamicSQLArg, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, AfterHook, WhereResult, MergeQuery, QueryReturnType } from 'pqb';
 export * from 'pqb';
 
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends Column.Shape.QueryInit = Column.Shape.QueryInit> {
@@ -673,7 +673,7 @@ interface BaseTableClass<SchemaConfig extends ColumnSchemaConfig, ColumnTypes> {
     exportAs: string;
     columnTypes: ColumnTypes;
     getFilePath(): string;
-    sql<T>(...args: StaticSQLArgs): RawSQL<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
+    sql<T>(...args: StaticSQLArgs): RawSql<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
     sql<T>(...args: [DynamicSQLArg<Column.Pick.QueryColumnOfType<T>>]): DynamicRawSQL<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
     new (): BaseTableInstance<ColumnTypes>;
     instance(): BaseTableInstance<ColumnTypes>;

package/dist/index.js

@@ -388,7 +388,7 @@ const combineOrdering = (result, joined) => {
 const wrapQuery = (joiningQuery, result, item) => {
   const baseOuterQuery = pqb.cloneQueryBaseUnscoped(joiningQuery);
   const outer = baseOuterQuery.clone();
-  outer.q.and = [new pqb.DynamicRawSQL(() => new pqb.RawSQL(`${item.as || "r"} = 1`))];
+  outer.q.and = [new pqb.DynamicRawSQL(() => new pqb.RawSql(`${item.as || "r"} = 1`))];
   outer.q.useFromLimitOffset = true;
   outer.shape = pqb.getShapeFromSelect(result, true);
   outer.q.select = Object.keys(outer.shape);
@@ -416,7 +416,7 @@ class BelongsToVirtualColumn extends pqb.VirtualColumn {
     }
     const value = item[key];
     if ("create" in value || "connectOrCreate" in value) {
-      foreignKeys.forEach((foreignKey) => item[foreignKey] = new pqb.RawSQL(""));
+      foreignKeys.forEach((foreignKey) => item[foreignKey] = new pqb.RawSql(""));
       const selectPKeys = query.select(...primaryKeys);
       pqb._with(
         q,
@@ -438,7 +438,7 @@ class BelongsToVirtualColumn extends pqb.VirtualColumn {
       pqb._with(q, as, query.select(...primaryKeys).findBy(value.connect));
       foreignKeys.map((foreignKey, i) => {
         const selectColumn = `(SELECT "${as}"."${primaryKeys[i]}" FROM "${as}")`;
-        item[foreignKey] = new pqb.RawSQL(
+        item[foreignKey] = new pqb.RawSql(
           i === 0 ? `CASE WHEN (SELECT count(*) FROM "${as}") = 0 AND (SELECT 'not-found')::int = 0 THEN NULL ELSE ${selectColumn} END` : selectColumn
         );
       });