typeorm 0.3.30 → 0.3.31

package/data-source/BaseDataSourceOptions.d.ts

@@ -1,11 +1,12 @@
+import { QueryResultCache } from "../cache/QueryResultCache";
+import { MixedList } from "../common/MixedList";
+import { DataSource } from "../data-source/DataSource";
+import { DatabaseType } from "../driver/types/DatabaseType";
+import type { InvalidFindOptionsWhereBehavior } from "../driver/types/InvalidFindOptionsWhereBehavior";
 import { EntitySchema } from "../entity-schema/EntitySchema";
+import { Logger } from "../logger/Logger";
 import { LoggerOptions } from "../logger/LoggerOptions";
 import { NamingStrategyInterface } from "../naming-strategy/NamingStrategyInterface";
-import { DatabaseType } from "../driver/types/DatabaseType";
-import { Logger } from "../logger/Logger";
-import { DataSource } from "../data-source/DataSource";
-import { QueryResultCache } from "../cache/QueryResultCache";
-import { MixedList } from "../common/MixedList";
 /**
  * BaseDataSourceOptions is set of DataSourceOptions shared by all database types.
  */
@@ -169,19 +170,5 @@ export interface BaseDataSourceOptions {
     /**
      * Controls how null and undefined values are handled in find operations.
      */
-    readonly invalidWhereValuesBehavior?: {
-        /**
-         * How to handle null values in where conditions.
-         * - 'ignore': Skip null properties (default)
-         * - 'sql-null': Transform null to SQL NULL
-         * - 'throw': Throw an error when null is encountered
-         */
-        readonly null?: "ignore" | "sql-null" | "throw";
-        /**
-         * How to handle undefined values in where conditions.
-         * - 'ignore': Skip undefined properties (default)
-         * - 'throw': Throw an error when undefined is encountered
-         */
-        readonly undefined?: "ignore" | "throw";
-    };
+    readonly invalidWhereValuesBehavior?: InvalidFindOptionsWhereBehavior;
 }

package/data-source/BaseDataSourceOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/data-source/BaseDataSourceOptions.ts"],"names":[],"mappings":"","file":"BaseDataSourceOptions.js","sourcesContent":["import { EntitySchema } from \"../entity-schema/EntitySchema\"\nimport { LoggerOptions } from \"../logger/LoggerOptions\"\nimport { NamingStrategyInterface } from \"../naming-strategy/NamingStrategyInterface\"\nimport { DatabaseType } from \"../driver/types/DatabaseType\"\nimport { Logger } from \"../logger/Logger\"\nimport { DataSource } from \"../data-source/DataSource\"\nimport { QueryResultCache } from \"../cache/QueryResultCache\"\nimport { MixedList } from \"../common/MixedList\"\n\n/**\n * BaseDataSourceOptions is set of DataSourceOptions shared by all database types.\n */\nexport interface BaseDataSourceOptions {\n    /**\n     * Database type. This value is required.\n     */\n    readonly type: DatabaseType\n\n    /**\n     * Connection name. If connection name is not given then it will be called \"default\".\n     * Different connections must have different names.\n     *\n     * @deprecated\n     */\n    readonly name?: string\n\n    /**\n     * Entities to be loaded for this connection.\n     * Accepts both entity classes and directories where from entities need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly entities?: MixedList<Function | string | EntitySchema>\n\n    /**\n     * Subscribers to be loaded for this connection.\n     * Accepts both subscriber classes and directories where from subscribers need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly subscribers?: MixedList<Function | string>\n\n    /**\n     * Migrations to be loaded for this connection.\n     * Accepts both migration classes and glob patterns representing migration files.\n     */\n    readonly migrations?: MixedList<Function | string>\n\n    /**\n     * Migrations table name, in case of different name from \"migrations\".\n     * Accepts single string name.\n     */\n    readonly migrationsTableName?: string\n\n    /**\n     * Transaction mode for migrations to run in\n     */\n    readonly migrationsTransactionMode?: \"all\" | \"none\" | \"each\"\n\n    /**\n     * Typeorm metadata table name, in case of different name from \"typeorm_metadata\".\n     * Accepts single string name.\n     */\n    readonly metadataTableName?: string\n\n    /**\n     * Naming strategy to be used to name tables and columns in the database.\n     */\n    readonly namingStrategy?: NamingStrategyInterface\n\n    /**\n     * Logging options.\n     */\n    readonly logging?: LoggerOptions\n\n    /**\n     * Logger instance used to log queries and events in the ORM.\n     */\n    readonly logger?:\n        | \"advanced-console\"\n        | \"simple-console\"\n        | \"formatted-console\"\n        | \"file\"\n        | \"debug\"\n        | Logger\n\n    /**\n     * Maximum number of milliseconds query should be executed before logger log a warning.\n     */\n    readonly maxQueryExecutionTime?: number\n\n    /**\n     * Maximum number of clients the pool should contain.\n     */\n    readonly poolSize?: number\n\n    /**\n     * Indicates if database schema should be auto created on every application launch.\n     * Be careful with this option and don't use this in production - otherwise you can lose production data.\n     * This option is useful during debug and development.\n     * Alternative to it, you can use CLI and run schema:sync command.\n     *\n     * Note that for MongoDB database it does not create schema, because MongoDB is schemaless.\n     * Instead, it syncs just by creating indices.\n     */\n    readonly synchronize?: boolean\n\n    /**\n     * Indicates if migrations should be auto run on every application launch.\n     * Alternative to it, you can use CLI and run migrations:run command.\n     */\n    readonly migrationsRun?: boolean\n\n    /**\n     * Drops the schema each time connection is being established.\n     * Be careful with this option and don't use this in production - otherwise you'll lose all production data.\n     * This option is useful during debug and development.\n     */\n    readonly dropSchema?: boolean\n\n    /**\n     * Prefix to use on all tables (collections) of this connection in the database.\n     */\n    readonly entityPrefix?: string\n\n    /**\n     * When creating new Entity instances, skip all constructors when true.\n     */\n    readonly entitySkipConstructor?: boolean\n\n    /**\n     * Extra connection options to be passed to the underlying driver.\n     *\n     * todo: deprecate this and move all database-specific types into hts own connection options object.\n     */\n    readonly extra?: any\n\n    /**\n     * Specifies how relations must be loaded - using \"joins\" or separate queries.\n     * If you are loading too much data with nested joins it's better to load relations\n     * using separate queries.\n     *\n     * Default strategy is \"join\", but this default can be changed here.\n     * Also, strategy can be set per-query in FindOptions and QueryBuilder.\n     */\n    readonly relationLoadStrategy?: \"join\" | \"query\"\n\n    /**\n     * Optionally applied \"typename\" to the model.\n     * If set, then each hydrated model will have this property with the target model / entity name inside.\n     *\n     * (works like a discriminator property).\n     */\n    readonly typename?: string\n\n    /**\n     * Holds reference to the baseDirectory where configuration file are expected.\n     *\n     * @internal\n     */\n    baseDirectory?: string\n\n    /**\n     * Allows to setup cache options.\n     */\n    readonly cache?:\n        | boolean\n        | {\n              /**\n               * Type of caching.\n               *\n               * - \"database\" means cached values will be stored in the separate table in database. This is default value.\n               * - \"redis\" means cached values will be stored inside redis. You must provide redis connection options.\n               */\n              readonly type?:\n                  | \"database\"\n                  | \"redis\"\n                  | \"ioredis\"\n                  | \"ioredis/cluster\" // todo: add mongodb and other cache providers as well in the future\n\n              /**\n               * Factory function for custom cache providers that implement QueryResultCache.\n               */\n              readonly provider?: (connection: DataSource) => QueryResultCache\n\n              /**\n               * Configurable table name for \"database\" type cache.\n               * Default value is \"query-result-cache\"\n               */\n              readonly tableName?: string\n\n              /**\n               * Used to provide redis connection options.\n               */\n              readonly options?: any\n\n              /**\n               * If set to true then queries (using find methods and QueryBuilder's methods) will always be cached.\n               */\n              readonly alwaysEnabled?: boolean\n\n              /**\n               * Time in milliseconds in which cache will expire.\n               * This can be setup per-query.\n               * Default value is 1000 which is equivalent to 1 second.\n               */\n              readonly duration?: number\n\n              /**\n               * Used to specify if cache errors should be ignored, and pass through the call to the Database.\n               */\n              readonly ignoreErrors?: boolean\n          }\n\n    /**\n     * Allows automatic isolation of where clauses\n     */\n    readonly isolateWhereStatements?: boolean\n\n    /**\n     * Controls how null and undefined values are handled in find operations.\n     */\n    readonly invalidWhereValuesBehavior?: {\n        /**\n         * How to handle null values in where conditions.\n         * - 'ignore': Skip null properties (default)\n         * - 'sql-null': Transform null to SQL NULL\n         * - 'throw': Throw an error when null is encountered\n         */\n        readonly null?: \"ignore\" | \"sql-null\" | \"throw\"\n\n        /**\n         * How to handle undefined values in where conditions.\n         * - 'ignore': Skip undefined properties (default)\n         * - 'throw': Throw an error when undefined is encountered\n         */\n        readonly undefined?: \"ignore\" | \"throw\"\n    }\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/data-source/BaseDataSourceOptions.ts"],"names":[],"mappings":"","file":"BaseDataSourceOptions.js","sourcesContent":["import { QueryResultCache } from \"../cache/QueryResultCache\"\nimport { MixedList } from \"../common/MixedList\"\nimport { DataSource } from \"../data-source/DataSource\"\nimport { DatabaseType } from \"../driver/types/DatabaseType\"\nimport type { InvalidFindOptionsWhereBehavior } from \"../driver/types/InvalidFindOptionsWhereBehavior\"\nimport { EntitySchema } from \"../entity-schema/EntitySchema\"\nimport { Logger } from \"../logger/Logger\"\nimport { LoggerOptions } from \"../logger/LoggerOptions\"\nimport { NamingStrategyInterface } from \"../naming-strategy/NamingStrategyInterface\"\n\n/**\n * BaseDataSourceOptions is set of DataSourceOptions shared by all database types.\n */\nexport interface BaseDataSourceOptions {\n    /**\n     * Database type. This value is required.\n     */\n    readonly type: DatabaseType\n\n    /**\n     * Connection name. If connection name is not given then it will be called \"default\".\n     * Different connections must have different names.\n     *\n     * @deprecated\n     */\n    readonly name?: string\n\n    /**\n     * Entities to be loaded for this connection.\n     * Accepts both entity classes and directories where from entities need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly entities?: MixedList<Function | string | EntitySchema>\n\n    /**\n     * Subscribers to be loaded for this connection.\n     * Accepts both subscriber classes and directories where from subscribers need to be loaded.\n     * Directories support glob patterns.\n     */\n    readonly subscribers?: MixedList<Function | string>\n\n    /**\n     * Migrations to be loaded for this connection.\n     * Accepts both migration classes and glob patterns representing migration files.\n     */\n    readonly migrations?: MixedList<Function | string>\n\n    /**\n     * Migrations table name, in case of different name from \"migrations\".\n     * Accepts single string name.\n     */\n    readonly migrationsTableName?: string\n\n    /**\n     * Transaction mode for migrations to run in\n     */\n    readonly migrationsTransactionMode?: \"all\" | \"none\" | \"each\"\n\n    /**\n     * Typeorm metadata table name, in case of different name from \"typeorm_metadata\".\n     * Accepts single string name.\n     */\n    readonly metadataTableName?: string\n\n    /**\n     * Naming strategy to be used to name tables and columns in the database.\n     */\n    readonly namingStrategy?: NamingStrategyInterface\n\n    /**\n     * Logging options.\n     */\n    readonly logging?: LoggerOptions\n\n    /**\n     * Logger instance used to log queries and events in the ORM.\n     */\n    readonly logger?:\n        | \"advanced-console\"\n        | \"simple-console\"\n        | \"formatted-console\"\n        | \"file\"\n        | \"debug\"\n        | Logger\n\n    /**\n     * Maximum number of milliseconds query should be executed before logger log a warning.\n     */\n    readonly maxQueryExecutionTime?: number\n\n    /**\n     * Maximum number of clients the pool should contain.\n     */\n    readonly poolSize?: number\n\n    /**\n     * Indicates if database schema should be auto created on every application launch.\n     * Be careful with this option and don't use this in production - otherwise you can lose production data.\n     * This option is useful during debug and development.\n     * Alternative to it, you can use CLI and run schema:sync command.\n     *\n     * Note that for MongoDB database it does not create schema, because MongoDB is schemaless.\n     * Instead, it syncs just by creating indices.\n     */\n    readonly synchronize?: boolean\n\n    /**\n     * Indicates if migrations should be auto run on every application launch.\n     * Alternative to it, you can use CLI and run migrations:run command.\n     */\n    readonly migrationsRun?: boolean\n\n    /**\n     * Drops the schema each time connection is being established.\n     * Be careful with this option and don't use this in production - otherwise you'll lose all production data.\n     * This option is useful during debug and development.\n     */\n    readonly dropSchema?: boolean\n\n    /**\n     * Prefix to use on all tables (collections) of this connection in the database.\n     */\n    readonly entityPrefix?: string\n\n    /**\n     * When creating new Entity instances, skip all constructors when true.\n     */\n    readonly entitySkipConstructor?: boolean\n\n    /**\n     * Extra connection options to be passed to the underlying driver.\n     *\n     * todo: deprecate this and move all database-specific types into hts own connection options object.\n     */\n    readonly extra?: any\n\n    /**\n     * Specifies how relations must be loaded - using \"joins\" or separate queries.\n     * If you are loading too much data with nested joins it's better to load relations\n     * using separate queries.\n     *\n     * Default strategy is \"join\", but this default can be changed here.\n     * Also, strategy can be set per-query in FindOptions and QueryBuilder.\n     */\n    readonly relationLoadStrategy?: \"join\" | \"query\"\n\n    /**\n     * Optionally applied \"typename\" to the model.\n     * If set, then each hydrated model will have this property with the target model / entity name inside.\n     *\n     * (works like a discriminator property).\n     */\n    readonly typename?: string\n\n    /**\n     * Holds reference to the baseDirectory where configuration file are expected.\n     *\n     * @internal\n     */\n    baseDirectory?: string\n\n    /**\n     * Allows to setup cache options.\n     */\n    readonly cache?:\n        | boolean\n        | {\n              /**\n               * Type of caching.\n               *\n               * - \"database\" means cached values will be stored in the separate table in database. This is default value.\n               * - \"redis\" means cached values will be stored inside redis. You must provide redis connection options.\n               */\n              readonly type?:\n                  | \"database\"\n                  | \"redis\"\n                  | \"ioredis\"\n                  | \"ioredis/cluster\" // todo: add mongodb and other cache providers as well in the future\n\n              /**\n               * Factory function for custom cache providers that implement QueryResultCache.\n               */\n              readonly provider?: (connection: DataSource) => QueryResultCache\n\n              /**\n               * Configurable table name for \"database\" type cache.\n               * Default value is \"query-result-cache\"\n               */\n              readonly tableName?: string\n\n              /**\n               * Used to provide redis connection options.\n               */\n              readonly options?: any\n\n              /**\n               * If set to true then queries (using find methods and QueryBuilder's methods) will always be cached.\n               */\n              readonly alwaysEnabled?: boolean\n\n              /**\n               * Time in milliseconds in which cache will expire.\n               * This can be setup per-query.\n               * Default value is 1000 which is equivalent to 1 second.\n               */\n              readonly duration?: number\n\n              /**\n               * Used to specify if cache errors should be ignored, and pass through the call to the Database.\n               */\n              readonly ignoreErrors?: boolean\n          }\n\n    /**\n     * Allows automatic isolation of where clauses\n     */\n    readonly isolateWhereStatements?: boolean\n\n    /**\n     * Controls how null and undefined values are handled in find operations.\n     */\n    readonly invalidWhereValuesBehavior?: InvalidFindOptionsWhereBehavior\n}\n"],"sourceRoot":".."}

package/driver/types/InvalidFindOptionsWhereBehavior.d.ts

@@ -0,0 +1,15 @@
+export type InvalidFindOptionsWhereBehavior = {
+    /**
+     * How to handle null values in where conditions.
+     * - 'ignore': Skip null properties (default)
+     * - 'sql-null': Transform null to SQL NULL
+     * - 'throw': Throw an error when null is encountered
+     */
+    readonly null?: "ignore" | "sql-null" | "throw";
+    /**
+     * How to handle undefined values in where conditions.
+     * - 'ignore': Skip undefined properties (default)
+     * - 'throw': Throw an error when undefined is encountered
+     */
+    readonly undefined?: "ignore" | "throw";
+};

package/driver/types/InvalidFindOptionsWhereBehavior.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+
+//# sourceMappingURL=InvalidFindOptionsWhereBehavior.js.map

package/driver/types/InvalidFindOptionsWhereBehavior.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/driver/types/InvalidFindOptionsWhereBehavior.ts"],"names":[],"mappings":"","file":"InvalidFindOptionsWhereBehavior.js","sourcesContent":["export type InvalidFindOptionsWhereBehavior = {\n    /**\n     * How to handle null values in where conditions.\n     * - 'ignore': Skip null properties (default)\n     * - 'sql-null': Transform null to SQL NULL\n     * - 'throw': Throw an error when null is encountered\n     */\n    readonly null?: \"ignore\" | \"sql-null\" | \"throw\"\n\n    /**\n     * How to handle undefined values in where conditions.\n     * - 'ignore': Skip undefined properties (default)\n     * - 'throw': Throw an error when undefined is encountered\n     */\n    readonly undefined?: \"ignore\" | \"throw\"\n}\n"],"sourceRoot":"../.."}

package/entity-manager/EntityManager.d.ts

@@ -212,6 +212,23 @@ export declare class EntityManager {
      */
     insert<Entity extends ObjectLiteral>(target: EntityTarget<Entity>, entity: QueryDeepPartialEntity<Entity> | QueryDeepPartialEntity<Entity>[]): Promise<InsertResult>;
     upsert<Entity extends ObjectLiteral>(target: EntityTarget<Entity>, entityOrEntities: QueryDeepPartialEntity<Entity> | QueryDeepPartialEntity<Entity>[], conflictPathsOrOptions: string[] | UpsertOptions<Entity>): Promise<InsertResult>;
+    /**
+     * Shared by update/delete/softDelete/restore. Object criteria is normalized
+     * via {@link OrmUtils.normalizeWhereCriteria}, then rejected if it would
+     * produce no predicate and therefore render as an always-true `WHERE 1=1` —
+     * an empty object or array, an empty OR-branch, a bare primitive inside an
+     * OR-array, or a keyless object. Primitive id criteria is returned untouched
+     * for `whereInIds` (rejected only when wholly empty).
+     *
+     * @param criteria the raw criteria passed to the operation
+     * @param methodName the calling method, used in the error message
+     * @returns the criteria to build with, and whether to execute it via
+     *   `whereInIds` (primitive) or `where` (object)
+     */
+    protected normalizeAndValidateWhereCriteria(criteria: any, methodName: string): {
+        criteria: any;
+        isPrimitive: boolean;
+    };
     /**
      * Updates entity partially. Entity can be found by a given condition(s).
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
@@ -372,6 +389,12 @@ export declare class EntityManager {
      * Decrements some column by provided value of the entities matched given conditions.
      */
     decrement<Entity extends ObjectLiteral>(entityClass: EntityTarget<Entity>, conditions: any, propertyPath: string, value: number | string): Promise<UpdateResult>;
+    /**
+     * Shared implementation of {@link increment} and {@link decrement}: builds a
+     * `column = column +/- value` UPDATE and delegates execution to {@link update},
+     * so the criteria handling stays aligned with the other write methods.
+     */
+    protected incrementOrDecrementBy<Entity extends ObjectLiteral>(operation: "increment" | "decrement", entityClass: EntityTarget<Entity>, conditions: any, propertyPath: string, value: number | string): Promise<UpdateResult>;
     /**
      * Gets repository for the given entity class or name.
      * If single database connection mode is used, then repository is obtained from the

package/entity-manager/EntityManager.js

@@ -339,6 +339,51 @@ class EntityManager {
         }
         return qb.execute();
     }
+    /**
+     * Shared by update/delete/softDelete/restore. Object criteria is normalized
+     * via {@link OrmUtils.normalizeWhereCriteria}, then rejected if it would
+     * produce no predicate and therefore render as an always-true `WHERE 1=1` —
+     * an empty object or array, an empty OR-branch, a bare primitive inside an
+     * OR-array, or a keyless object. Primitive id criteria is returned untouched
+     * for `whereInIds` (rejected only when wholly empty).
+     *
+     * @param criteria the raw criteria passed to the operation
+     * @param methodName the calling method, used in the error message
+     * @returns the criteria to build with, and whether to execute it via
+     *   `whereInIds` (primitive) or `where` (object)
+     */
+    normalizeAndValidateWhereCriteria(criteria, methodName) {
+        const rejectEmpty = () => {
+            throw new error_1.TypeORMError(`Empty criteria(s) are not allowed for the ${methodName} method.`);
+        };
+        if (OrmUtils_1.OrmUtils.isPrimitiveCriteria(criteria)) {
+            if (OrmUtils_1.OrmUtils.isCriteriaNullOrEmpty(criteria))
+                rejectEmpty();
+            return { criteria, isPrimitive: true };
+        }
+        const normalizedCriteria = OrmUtils_1.OrmUtils.normalizeWhereCriteria(criteria, this.connection.options.invalidWhereValuesBehavior);
+        // On the object-criteria path, `.where()` builds a predicate only from
+        // an object's own keys. Anything else yields an empty predicate list
+        // that renders as an always-true `1=1`, so a criterion is unsafe unless
+        // it is a non-empty object. This must reject:
+        //  - primitives (a bare number/string in a mixed OR-array like
+        //    `[1, { id: 2 }]` — `.where(1)` produces no predicate),
+        //  - empty plain objects (`{}`), empty arrays (`[]`), and
+        //  - empty non-plain objects, e.g. an empty entity instance
+        //    (`new Post()`), which isCriteriaNullOrEmpty does not catch.
+        // Value-type criteria (Date, Buffer) execute via the primitive branch
+        // and never reach here.
+        const rendersNoPredicate = (value) => value === null ||
+            typeof value !== "object" ||
+            Object.keys(value).length === 0;
+        const isEmpty = Array.isArray(normalizedCriteria)
+            ? normalizedCriteria.length === 0 ||
+                normalizedCriteria.some(rendersNoPredicate)
+            : rendersNoPredicate(normalizedCriteria);
+        if (isEmpty)
+            rejectEmpty();
+        return { criteria: normalizedCriteria, isPrimitive: false };
+    }
     /**
      * Updates entity partially. Entity can be found by a given condition(s).
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
@@ -346,32 +391,19 @@ class EntityManager {
      * Does not check if entity exist in the database.
      * Condition(s) cannot be empty.
      */
-    update(target, criteria, partialEntity, options) {
-        // if user passed empty criteria or empty list of criterias, then throw an error
-        if (OrmUtils_1.OrmUtils.isCriteriaNullOrEmpty(criteria)) {
-            return Promise.reject(new error_1.TypeORMError(`Empty criteria(s) are not allowed for the update method.`));
-        }
-        if (OrmUtils_1.OrmUtils.isPrimitiveCriteria(criteria)) {
-            const qb = this.createQueryBuilder()
-                .update(target)
-                .set(partialEntity)
-                .whereInIds(criteria);
-            if (options?.returning !== undefined) {
-                qb.returning(options.returning);
-            }
-            return qb.execute();
+    async update(target, criteria, partialEntity, options) {
+        const { criteria: whereCriteria, isPrimitive } = this.normalizeAndValidateWhereCriteria(criteria, "update");
+        const qb = this.createQueryBuilder().update(target).set(partialEntity);
+        if (isPrimitive) {
+            qb.whereInIds(whereCriteria);
         }
         else {
-            const normalizedCriteria = OrmUtils_1.OrmUtils.normalizeWhereCriteria(criteria, this.connection.options.invalidWhereValuesBehavior);
-            const qb = this.createQueryBuilder()
-                .update(target)
-                .set(partialEntity)
-                .where(normalizedCriteria);
-            if (options?.returning !== undefined) {
-                qb.returning(options.returning);
-            }
-            return qb.execute();
+            qb.where(whereCriteria);
+        }
+        if (options?.returning !== undefined) {
+            qb.returning(options.returning);
         }
+        return qb.execute();
     }
     /**
      * Updates all entities of target type, setting fields from supplied partial entity.
@@ -394,26 +426,10 @@ class EntityManager {
      * Does not check if entity exist in the database.
      * Condition(s) cannot be empty.
      */
-    delete(targetOrEntity, criteria) {
-        // if user passed empty criteria or empty list of criterias, then throw an error
-        if (OrmUtils_1.OrmUtils.isCriteriaNullOrEmpty(criteria)) {
-            return Promise.reject(new error_1.TypeORMError(`Empty criteria(s) are not allowed for the delete method.`));
-        }
-        if (OrmUtils_1.OrmUtils.isPrimitiveCriteria(criteria)) {
-            return this.createQueryBuilder()
-                .delete()
-                .from(targetOrEntity)
-                .whereInIds(criteria)
-                .execute();
-        }
-        else {
-            const normalizedCriteria = OrmUtils_1.OrmUtils.normalizeWhereCriteria(criteria, this.connection.options.invalidWhereValuesBehavior);
-            return this.createQueryBuilder()
-                .delete()
-                .from(targetOrEntity)
-                .where(normalizedCriteria)
-                .execute();
-        }
+    async delete(targetOrEntity, criteria) {
+        const { criteria: whereCriteria, isPrimitive } = this.normalizeAndValidateWhereCriteria(criteria, "delete");
+        const qb = this.createQueryBuilder().delete().from(targetOrEntity);
+        return (isPrimitive ? qb.whereInIds(whereCriteria) : qb.where(whereCriteria)).execute();
     }
     /**
      * Deletes all entities of target type.
@@ -432,26 +448,10 @@ class EntityManager {
      * Does not check if entity exist in the database.
      * Condition(s) cannot be empty.
      */
-    softDelete(targetOrEntity, criteria) {
-        // if user passed empty criteria or empty list of criterias, then throw an error
-        if (OrmUtils_1.OrmUtils.isCriteriaNullOrEmpty(criteria)) {
-            return Promise.reject(new error_1.TypeORMError(`Empty criteria(s) are not allowed for the softDelete method.`));
-        }
-        if (OrmUtils_1.OrmUtils.isPrimitiveCriteria(criteria)) {
-            return this.createQueryBuilder()
-                .softDelete()
-                .from(targetOrEntity)
-                .whereInIds(criteria)
-                .execute();
-        }
-        else {
-            const normalizedCriteria = OrmUtils_1.OrmUtils.normalizeWhereCriteria(criteria, this.connection.options.invalidWhereValuesBehavior);
-            return this.createQueryBuilder()
-                .softDelete()
-                .from(targetOrEntity)
-                .where(normalizedCriteria)
-                .execute();
-        }
+    async softDelete(targetOrEntity, criteria) {
+        const { criteria: whereCriteria, isPrimitive } = this.normalizeAndValidateWhereCriteria(criteria, "softDelete");
+        const qb = this.createQueryBuilder().softDelete().from(targetOrEntity);
+        return (isPrimitive ? qb.whereInIds(whereCriteria) : qb.where(whereCriteria)).execute();
     }
     /**
      * Restores entities by a given condition(s).
@@ -460,26 +460,10 @@ class EntityManager {
      * Does not check if entity exist in the database.
      * Condition(s) cannot be empty.
      */
-    restore(targetOrEntity, criteria) {
-        // if user passed empty criteria or empty list of criterias, then throw an error
-        if (OrmUtils_1.OrmUtils.isCriteriaNullOrEmpty(criteria)) {
-            return Promise.reject(new error_1.TypeORMError(`Empty criteria(s) are not allowed for the restore method.`));
-        }
-        if (OrmUtils_1.OrmUtils.isPrimitiveCriteria(criteria)) {
-            return this.createQueryBuilder()
-                .restore()
-                .from(targetOrEntity)
-                .whereInIds(criteria)
-                .execute();
-        }
-        else {
-            const normalizedCriteria = OrmUtils_1.OrmUtils.normalizeWhereCriteria(criteria, this.connection.options.invalidWhereValuesBehavior);
-            return this.createQueryBuilder()
-                .restore()
-                .from(targetOrEntity)
-                .where(normalizedCriteria)
-                .execute();
-        }
+    async restore(targetOrEntity, criteria) {
+        const { criteria: whereCriteria, isPrimitive } = this.normalizeAndValidateWhereCriteria(criteria, "restore");
+        const qb = this.createQueryBuilder().restore().from(targetOrEntity);
+        return (isPrimitive ? qb.whereInIds(whereCriteria) : qb.where(whereCriteria)).execute();
     }
     /**
      * Checks whether any entity exists with the given options.
@@ -721,45 +705,34 @@ class EntityManager {
      * Increments some column by provided value of the entities matched given conditions.
      */
     async increment(entityClass, conditions, propertyPath, value) {
-        const metadata = this.connection.getMetadata(entityClass);
-        const column = metadata.findColumnWithPropertyPath(propertyPath);
-        if (!column)
-            throw new error_1.TypeORMError(`Column ${propertyPath} was not found in ${metadata.targetName} entity.`);
-        if (isNaN(Number(value)))
-            throw new error_1.TypeORMError(`Value "${value}" is not a number.`);
-        // convert possible embedded path "social.likes" into object { social: { like: () => value } }
-        const values = propertyPath
-            .split(".")
-            .reduceRight((value, key) => ({ [key]: value }), () => this.connection.driver.escape(column.databaseName) +
-            " + " +
-            value);
-        return this.createQueryBuilder(entityClass, "entity")
-            .update(entityClass)
-            .set(values)
-            .where(conditions)
-            .execute();
+        return this.incrementOrDecrementBy("increment", entityClass, conditions, propertyPath, value);
     }
     /**
      * Decrements some column by provided value of the entities matched given conditions.
      */
     async decrement(entityClass, conditions, propertyPath, value) {
+        return this.incrementOrDecrementBy("decrement", entityClass, conditions, propertyPath, value);
+    }
+    /**
+     * Shared implementation of {@link increment} and {@link decrement}: builds a
+     * `column = column +/- value` UPDATE and delegates execution to {@link update},
+     * so the criteria handling stays aligned with the other write methods.
+     */
+    incrementOrDecrementBy(operation, entityClass, conditions, propertyPath, value) {
         const metadata = this.connection.getMetadata(entityClass);
         const column = metadata.findColumnWithPropertyPath(propertyPath);
         if (!column)
             throw new error_1.TypeORMError(`Column ${propertyPath} was not found in ${metadata.targetName} entity.`);
         if (isNaN(Number(value)))
             throw new error_1.TypeORMError(`Value "${value}" is not a number.`);
+        const operator = operation === "increment" ? "+" : "-";
         // convert possible embedded path "social.likes" into object { social: { like: () => value } }
         const values = propertyPath
             .split(".")
             .reduceRight((value, key) => ({ [key]: value }), () => this.connection.driver.escape(column.databaseName) +
-            " - " +
+            ` ${operator} ` +
             value);
-        return this.createQueryBuilder(entityClass, "entity")
-            .update(entityClass)
-            .set(values)
-            .where(conditions)
-            .execute();
+        return this.update(entityClass, conditions, values);
     }
     /**
      * Gets repository for the given entity class or name.