pqb 0.20.1 → 0.21.0

package/dist/index.d.ts

@@ -332,6 +332,7 @@ type CommonQueryData = {
      */
     originalQuery?: Query;
     scopes: Record<string, QueryScopeData>;
+    all?: true;
 };
 type SelectQueryData = CommonQueryData & {
     type: undefined;
@@ -2102,12 +2103,70 @@ declare class ScopeMethods {
      *
      * ```ts
      * // SomeTable has a default scope, ignore it for this query:
-     * await db.some.unScope('default');
+     * await db.some.unscope('default');
      * ```
      *
      * @param scope - name of the scope to remove from the query
      */
-    unScope<T extends QueryBase>(this: T, scope: keyof T['meta']['scopes']): T;
+    unscope<T extends QueryBase>(this: T, scope: keyof T['meta']['scopes']): T;
+}
+
+type SoftDeleteOption<Shape extends ColumnsShapeBase> = true | keyof Shape;
+type QueryWithSoftDelete = Query & {
+    meta: {
+        scopes: {
+            nonDeleted: unknown;
+        };
+    };
+};
+/**
+ * `softDelete` configures the table to set `deletedAt` to current time instead of deleting records.
+ * All queries on such table will filter out deleted records by default.
+ *
+ * ```ts
+ * import { BaseTable } from './baseTable';
+ *
+ * export class SomeTable extends BaseTable {
+ *   readonly table = 'some';
+ *   columns = this.setColumns((t) => ({
+ *     id: t.identity().primaryKey(),
+ *     deletedAt: t.timestamp().nullable(),
+ *   }));
+ *
+ *   // true is for using `deletedAt` column
+ *   readonly softDelete = true;
+ *   // or provide a different column name
+ *   readonly softDelete = 'myDeletedAt';
+ * }
+ *
+ * const db = orchidORM(
+ *   { databaseURL: '...' },
+ *   {
+ *     someTable: SomeTable,
+ *   },
+ * );
+ *
+ * // deleted records are ignored by default
+ * const onlyNonDeleted = await db.someTable;
+ * ```
+ */
+declare class SoftDeleteMethods {
+    /**
+     * `includeDeleted` disables the default `deletedAt` filter:
+     *
+     * ```ts
+     * const allRecords = await db.someTable.includeDeleted();
+     * ```
+     */
+    includeDeleted<T extends QueryWithSoftDelete>(this: T): T;
+    /**
+     * `hardDelete` deletes records bypassing the `softDelete` behavior:
+     *
+     * ```ts
+     * await db.someTable.find(1).hardDelete();
+     * ```
+     */
+    hardDelete<T extends QueryWithSoftDelete>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
 }
 
 type NoPrimaryKeyOption = 'error' | 'warning' | 'ignore';
@@ -2130,6 +2189,10 @@ type DbTableOptions<Table extends string | undefined, Shape extends ColumnsShape
      * See {@link ScopeMethods}
      */
     scopes?: DbTableOptionScopes<Table, Shape>;
+    /**
+     * See {@link SoftDeleteMethods}
+     */
+    softDelete?: SoftDeleteOption<Shape>;
 } & QueryLogOptions;
 /**
  * See {@link ScopeMethods}
@@ -2227,9 +2290,10 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Col
      */
     queryArrays<R extends any[] = any[]>(...args: SQLQueryArgs): Promise<QueryArraysResult<R>>;
 }
-type DbTableConstructor<ColumnTypes> = <Table extends string, Shape extends ColumnsShapeBase, Options extends DbTableOptions<Table, Shape>>(table: Table, shape?: ((t: ColumnTypes) => Shape) | Shape, options?: Options) => Db<Table, Shape, EmptyObject, ColumnTypes, Shape, Options extends {
-    scopes: CoreQueryScopes;
-} ? Options['scopes'] : EmptyObject>;
+type DbTableConstructor<ColumnTypes> = <Table extends string, Shape extends ColumnsShapeBase, Options extends DbTableOptions<Table, Shape>>(table: Table, shape?: ((t: ColumnTypes) => Shape) | Shape, options?: Options) => Db<Table, Shape, EmptyObject, ColumnTypes, Shape, MapTableScopesOption<Options['scopes'], Options['softDelete']>>;
+type MapTableScopesOption<Scopes extends CoreQueryScopes | undefined, SoftDelete extends true | PropertyKey | undefined> = {
+    [K in keyof Scopes | (SoftDelete extends true | PropertyKey ? 'nonDeleted' : never)]: unknown;
+};
 type DbResult<ColumnTypes> = Db<string, Record<string, never>, EmptyObject, ColumnTypes> & DbTableConstructor<ColumnTypes> & {
     adapter: Adapter;
     close: Adapter['close'];
@@ -3425,16 +3489,6 @@ type DeleteMethodsNames = 'del' | '_del' | 'delete' | '_delete';
 type DeleteArgs<T extends Query> = T['meta']['hasWhere'] extends true ? [] : [never];
 type DeleteResult<T extends Query> = T['meta']['hasSelect'] extends true ? SetQueryKind<T, 'delete'> : SetQueryReturnsRowCount<SetQueryKind<T, 'delete'>>;
 declare class Delete {
-    /**
-     * Alias for `delete` method
-     *
-     * @deprecated use `delete` instead, this method will be removed
-     */
-    del<T extends Query>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
-    /**
-     * @deprecated use `_del` instead, this method will be removed
-     */
-    _del<T extends Query>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
     /**
      * It is aliased to `del` because `delete` is a reserved word in JavaScript.
      *
@@ -5345,7 +5399,7 @@ declare class ColumnRefExpression<T extends ColumnTypeBase> extends Expression<T
     constructor(_type: T, name: string);
     makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
 }
-interface QueryMethods<ColumnTypes> extends Omit<AsMethods, 'result'>, AggregateMethods, Select, From, Join, With, Union, Omit<JsonModifiers, 'result'>, JsonMethods, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, SearchMethods, Clear, Having, Then, QueryLog, Omit<QueryHooks, 'result'>, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawSqlMethods<ColumnTypes>, CopyMethods, TransformMethods, ScopeMethods {
+interface QueryMethods<ColumnTypes> extends Omit<AsMethods, 'result'>, AggregateMethods, Select, From, Join, With, Union, Omit<JsonModifiers, 'result'>, JsonMethods, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, SearchMethods, Clear, Having, Then, QueryLog, Omit<QueryHooks, 'result'>, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawSqlMethods<ColumnTypes>, CopyMethods, TransformMethods, ScopeMethods, SoftDeleteMethods {
 }
 declare class QueryMethods<ColumnTypes> {
     /**
@@ -7329,4 +7383,4 @@ declare module 'orchid-core' {
 }
 declare function addComputedColumns<T extends Query, Computed extends ComputedColumnsBase<T>>(q: T, computed: Computed): QueryWithComputed<T, Computed>;
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, AsMethods, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanNullable, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsObject, ColumnsShape, CommonQueryData, ComputedColumnsBase, CopyMethods, CopyOptions, CopyQueryData, Create, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationDataOmittingFKeys, CreateRelationsData, CreateRelationsDataOmittingFKeys, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, DynamicRawSQL, EnumColumn, ExpressionOutput, FnExpression, FnExpressionArgs, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, From, FromArgs, FromResult, GetArg, GetQueryResult, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operator, Operators, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBeforeHook, QueryData, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryHelperResult, QueryHookSelect, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RawSqlMethods, RealColumn, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RelationsChain, SearchArg, SearchMethods, SearchWeight, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableBase, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumn, SetQueryReturnsColumnInfo, SetQueryReturnsColumnOptional, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBase, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addComputedColumns, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addQueryOn, addWhere, addWhereIn, addWhereNot, anyShape, checkIfASimpleQuery, cloneQuery, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, countSelect, createDb, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getShapeFromSelect, getTableData, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeExpression, makeFnExpression, makeRegexToFindInSql, makeSQL, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, raw, referencesArgsToCode, resetTableData, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, AsMethods, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanNullable, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsObject, ColumnsShape, CommonQueryData, ComputedColumnsBase, CopyMethods, CopyOptions, CopyQueryData, Create, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationDataOmittingFKeys, CreateRelationsData, CreateRelationsDataOmittingFKeys, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DropMode, DynamicRawSQL, EnumColumn, ExpressionOutput, FnExpression, FnExpressionArgs, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, From, FromArgs, FromResult, GetArg, GetQueryResult, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operator, Operators, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBeforeHook, QueryData, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryHelperResult, QueryHookSelect, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RawSqlMethods, RealColumn, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RelationsChain, SearchArg, SearchMethods, SearchWeight, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableBase, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumn, SetQueryReturnsColumnInfo, SetQueryReturnsColumnOptional, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBase, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addComputedColumns, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addQueryOn, addWhere, addWhereIn, addWhereNot, anyShape, checkIfASimpleQuery, cloneQuery, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, countSelect, createDb, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getShapeFromSelect, getTableData, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeExpression, makeFnExpression, makeRegexToFindInSql, makeSQL, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, raw, referencesArgsToCode, resetTableData, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };

package/dist/index.js

@@ -2468,7 +2468,7 @@ const setQueryObjectValue = (q, object, key, value) => {
   return q;
 };
 const throwIfNoWhere = (q, method) => {
-  if (!q.q.or && !q.q.and) {
+  if (!q.q.or && !q.q.and && !q.q.all) {
     throw new OrchidOrmInternalError(
       q,
       `Dangerous ${method} without conditions`
@@ -5587,9 +5587,6 @@ class OnConflictQueryBuilder {
   }
 }
 
-const del = (self) => {
-  return _del(self.clone());
-};
 const _del = (q) => {
   if (!q.q.select) {
     if (q.q.returnType === "oneOrThrow" || q.q.returnType === "valueOrThrow") {
@@ -5602,20 +5599,6 @@ const _del = (q) => {
   return q;
 };
 class Delete {
-  /**
-   * Alias for `delete` method
-   *
-   * @deprecated use `delete` instead, this method will be removed
-   */
-  del(..._args) {
-    return del(this);
-  }
-  /**
-   * @deprecated use `_del` instead, this method will be removed
-   */
-  _del(..._args) {
-    return _del(this);
-  }
   /**
    * It is aliased to `del` because `delete` is a reserved word in JavaScript.
    *
@@ -5666,7 +5649,7 @@ class Delete {
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   delete(..._args) {
-    return del(this);
+    return _del(this.clone());
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _delete(..._args) {
@@ -9362,12 +9345,12 @@ class ScopeMethods {
    *
    * ```ts
    * // SomeTable has a default scope, ignore it for this query:
-   * await db.some.unScope('default');
+   * await db.some.unscope('default');
    * ```
    *
    * @param scope - name of the scope to remove from the query
    */
-  unScope(scope) {
+  unscope(scope) {
     var _a;
     const q = this.clone();
     const data = q.q;
@@ -9390,6 +9373,59 @@ class ScopeMethods {
   }
 }
 
+function enableSoftDelete(q, table, shape, softDelete, scopes) {
+  var _a, _b;
+  const column = softDelete === true ? "deletedAt" : softDelete;
+  if (!shape[column]) {
+    throw new Error(
+      `Table ${table} is missing ${column} column which is required for soft delete`
+    );
+  }
+  const scope = {
+    and: [{ [column]: null }]
+  };
+  scopes.deleted = scope;
+  pushQueryValue(q, "and", scope.and[0]);
+  ((_b = (_a = q.q).scopes) != null ? _b : _a.scopes = {}).nonDeleted = scope;
+  const _del = _softDelete(column);
+  q.baseQuery.delete = function() {
+    return _del.call(this.clone());
+  };
+  q.baseQuery._delete = _del;
+}
+const nowSql = new RawSQL("now()");
+const _softDelete = (column) => {
+  const set = { [column]: nowSql };
+  return function() {
+    return this._update(set);
+  };
+};
+const { _delete } = Delete.prototype;
+class SoftDeleteMethods {
+  /**
+   * `includeDeleted` disables the default `deletedAt` filter:
+   *
+   * ```ts
+   * const allRecords = await db.someTable.includeDeleted();
+   * ```
+   */
+  includeDeleted() {
+    return this.unscope("nonDeleted");
+  }
+  /**
+   * `hardDelete` deletes records bypassing the `softDelete` behavior:
+   *
+   * ```ts
+   * await db.someTable.find(1).hardDelete();
+   * ```
+   */
+  hardDelete(..._args) {
+    return _delete.call(
+      this.clone().unscope("nonDeleted")
+    );
+  }
+}
+
 class ColumnRefExpression extends orchidCore.Expression {
   constructor(_type, name) {
     super();
@@ -9414,9 +9450,8 @@ class QueryMethods {
     return this.clone()._all();
   }
   _all() {
-    var _a, _b;
     this.q.returnType = "all";
-    (_b = (_a = this.q).and) != null ? _b : _a.and = [];
+    this.q.all = true;
     return this;
   }
   /**
@@ -10027,7 +10062,8 @@ orchidCore.applyMixins(QueryMethods, [
   RawSqlMethods,
   CopyMethods,
   TransformMethods,
-  ScopeMethods
+  ScopeMethods,
+  SoftDeleteMethods
 ]);
 
 var __defProp = Object.defineProperty;
@@ -10071,7 +10107,8 @@ class Db {
     this.columnTypes = columnTypes2;
     var _a, _b;
     const self = this;
-    const scopes = options.scopes ? {} : orchidCore.emptyObject;
+    const { softDelete } = options;
+    const scopes = options.scopes || softDelete ? {} : orchidCore.emptyObject;
     const tableData = getTableData();
     this.internal = __spreadProps(__spreadValues({}, tableData), {
       transactionStorage,
@@ -10193,6 +10230,9 @@ class Db {
         this.q.scopes = { default: scopes.default };
       }
     }
+    if (softDelete) {
+      enableSoftDelete(this, table, shape, softDelete, scopes);
+    }
   }
   [node_util.inspect.custom]() {
     return `QueryObject<${this.table}>`;