typeorm-extensions 2.2.0-rc.5 → 2.2.0-rc.7

package/dist/extensions/where-relation-exists.extension.d.ts

@@ -19,17 +19,17 @@ type RelatedCondition<Related extends ObjectLiteral> = (subQuery: SelectQueryBui
  */
 export interface WhereRelationExistsMethods<Entity extends ObjectLiteral> {
     /** Sets `WHERE EXISTS (…)` over the relation, replacing the WHERE conditions set before. */
-    whereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    whereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `AND EXISTS (…)` over the relation. */
-    andWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    andWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `OR EXISTS (…)` over the relation. */
-    orWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    orWhereRelationExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Sets `WHERE NOT EXISTS (…)` over the relation, replacing the WHERE conditions set before. */
-    whereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    whereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `AND NOT EXISTS (…)` over the relation. */
-    andWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    andWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
     /** Adds `OR NOT EXISTS (…)` over the relation. */
-    orWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
+    orWhereRelationNotExists<Related extends ObjectLiteral, Type extends ObjectLiteral = TypedRoot<Entity, this>>(relation: RelationSelection<Type, Related>, alias: string, where?: RelatedCondition<Related>): this;
 }
 declare module 'typeorm/query-builder/SelectQueryBuilder' {
     interface SelectQueryBuilder<Entity extends ObjectLiteral> extends WhereRelationExistsMethods<Entity> {

package/dist/helpers.d.ts

@@ -1,2 +1,6 @@
 export * from './utils/table.utils';
 export { escapeLikePattern } from './utils/search.utils';
+export { COCKROACHDB_RESERVED_KEY_WORDS, findBareReservedQualifiers, POSTGRES_RESERVED_KEY_WORDS, } from './utils/reserved-qualifier.utils';
+export type { ReservedQualifier } from './utils/reserved-qualifier.utils';
+export { disableReservedQualifierGuard, enableReservedQualifierGuard, ReservedQualifierError, } from './utils/reserved-qualifier-guard.utils';
+export type { ReservedQualifierGuardOptions } from './utils/reserved-qualifier-guard.utils';

package/dist/helpers.js

@@ -14,10 +14,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escapeLikePattern = void 0;
+exports.ReservedQualifierError = exports.enableReservedQualifierGuard = exports.disableReservedQualifierGuard = exports.POSTGRES_RESERVED_KEY_WORDS = exports.findBareReservedQualifiers = exports.COCKROACHDB_RESERVED_KEY_WORDS = exports.escapeLikePattern = void 0;
 // Side-effect-free entry point: `typeorm-extensions/helpers`.
-// Exports helpers (tableHelper, escapeLikePattern) only and patches nothing; importing the package root
-// (`typeorm-extensions`) installs every QueryBuilder extension.
+// Exports helpers (tableHelper, escapeLikePattern, the reserved qualifier guard) only and patches nothing on import;
+// importing the package root (`typeorm-extensions`) installs every QueryBuilder extension.
 __exportStar(require("./utils/table.utils"), exports);
 var search_utils_1 = require("./utils/search.utils");
 Object.defineProperty(exports, "escapeLikePattern", { enumerable: true, get: function () { return search_utils_1.escapeLikePattern; } });
+var reserved_qualifier_utils_1 = require("./utils/reserved-qualifier.utils");
+Object.defineProperty(exports, "COCKROACHDB_RESERVED_KEY_WORDS", { enumerable: true, get: function () { return reserved_qualifier_utils_1.COCKROACHDB_RESERVED_KEY_WORDS; } });
+Object.defineProperty(exports, "findBareReservedQualifiers", { enumerable: true, get: function () { return reserved_qualifier_utils_1.findBareReservedQualifiers; } });
+Object.defineProperty(exports, "POSTGRES_RESERVED_KEY_WORDS", { enumerable: true, get: function () { return reserved_qualifier_utils_1.POSTGRES_RESERVED_KEY_WORDS; } });
+var reserved_qualifier_guard_utils_1 = require("./utils/reserved-qualifier-guard.utils");
+Object.defineProperty(exports, "disableReservedQualifierGuard", { enumerable: true, get: function () { return reserved_qualifier_guard_utils_1.disableReservedQualifierGuard; } });
+Object.defineProperty(exports, "enableReservedQualifierGuard", { enumerable: true, get: function () { return reserved_qualifier_guard_utils_1.enableReservedQualifierGuard; } });
+Object.defineProperty(exports, "ReservedQualifierError", { enumerable: true, get: function () { return reserved_qualifier_guard_utils_1.ReservedQualifierError; } });

package/dist/index.d.ts

@@ -6,3 +6,7 @@ export type { Json } from './types/modules/proxy-callback.types';
 export type { TypedRoot, WithTypedRoot } from './types/modules/typed-root.types';
 export * from './utils/table.utils';
 export { escapeLikePattern } from './utils/search.utils';
+export { COCKROACHDB_RESERVED_KEY_WORDS, findBareReservedQualifiers, POSTGRES_RESERVED_KEY_WORDS, } from './utils/reserved-qualifier.utils';
+export type { ReservedQualifier } from './utils/reserved-qualifier.utils';
+export { disableReservedQualifierGuard, enableReservedQualifierGuard, ReservedQualifierError, } from './utils/reserved-qualifier-guard.utils';
+export type { ReservedQualifierGuardOptions } from './utils/reserved-qualifier-guard.utils';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escapeLikePattern = void 0;
+exports.ReservedQualifierError = exports.enableReservedQualifierGuard = exports.disableReservedQualifierGuard = exports.POSTGRES_RESERVED_KEY_WORDS = exports.findBareReservedQualifiers = exports.COCKROACHDB_RESERVED_KEY_WORDS = exports.escapeLikePattern = void 0;
 __exportStar(require("./extensions"), exports);
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./types/interfaces"), exports);
@@ -22,3 +22,11 @@ __exportStar(require("./types/extensions"), exports);
 __exportStar(require("./utils/table.utils"), exports);
 var search_utils_1 = require("./utils/search.utils");
 Object.defineProperty(exports, "escapeLikePattern", { enumerable: true, get: function () { return search_utils_1.escapeLikePattern; } });
+var reserved_qualifier_utils_1 = require("./utils/reserved-qualifier.utils");
+Object.defineProperty(exports, "COCKROACHDB_RESERVED_KEY_WORDS", { enumerable: true, get: function () { return reserved_qualifier_utils_1.COCKROACHDB_RESERVED_KEY_WORDS; } });
+Object.defineProperty(exports, "findBareReservedQualifiers", { enumerable: true, get: function () { return reserved_qualifier_utils_1.findBareReservedQualifiers; } });
+Object.defineProperty(exports, "POSTGRES_RESERVED_KEY_WORDS", { enumerable: true, get: function () { return reserved_qualifier_utils_1.POSTGRES_RESERVED_KEY_WORDS; } });
+var reserved_qualifier_guard_utils_1 = require("./utils/reserved-qualifier-guard.utils");
+Object.defineProperty(exports, "disableReservedQualifierGuard", { enumerable: true, get: function () { return reserved_qualifier_guard_utils_1.disableReservedQualifierGuard; } });
+Object.defineProperty(exports, "enableReservedQualifierGuard", { enumerable: true, get: function () { return reserved_qualifier_guard_utils_1.enableReservedQualifierGuard; } });
+Object.defineProperty(exports, "ReservedQualifierError", { enumerable: true, get: function () { return reserved_qualifier_guard_utils_1.ReservedQualifierError; } });

package/dist/types/extensions/index.d.ts

@@ -10,4 +10,5 @@ export * from './search.types';
 export * from './typed-having.types';
 export * from './union.types';
 export * from './join-lateral.types';
+export * from './typed-join-and-map.types';
 export * from './query-returning.types';

package/dist/types/extensions/index.js

@@ -26,4 +26,5 @@ __exportStar(require("./search.types"), exports);
 __exportStar(require("./typed-having.types"), exports);
 __exportStar(require("./union.types"), exports);
 __exportStar(require("./join-lateral.types"), exports);
+__exportStar(require("./typed-join-and-map.types"), exports);
 __exportStar(require("./query-returning.types"), exports);

package/dist/types/extensions/typed-join-and-map.types.d.ts

@@ -0,0 +1,6 @@
+import type { SelectQueryBuilder } from 'typeorm';
+/**
+ * What a map join joins, as TypeORM's `leftJoinAndMapOne` and the others take it: an entity class or name, a
+ * relation (`'user.photos'`), a table name, or a factory that builds a subquery on the query builder it is given.
+ */
+export type JoinAndMapTarget = Function | string | ((qb: SelectQueryBuilder<any>) => SelectQueryBuilder<any>);

package/dist/types/extensions/typed-join-and-map.types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/modules/typed-root.types.d.ts

@@ -1,17 +1,19 @@
 import type { ObjectLiteral } from 'typeorm';
-declare const typedRoot: unique symbol;
 declare class TypedRootMark<Root> {
-    [typedRoot]?(): Root;
+    __typedRoot?(): Root;
 }
 /**
- * The entity type of a builder whose typed callbacks take another root, set with `typed<Root>()`: the entity
- * with an optional symbol method that only types carry. Entities loaded with it are plain entities.
+ * A query builder whose typed callbacks take another root, as `typed<Root>()` returns it:
+ * `WithTypedRoot<SelectQueryBuilder<Entity>, Root>`, the builder with an optional `__typedRoot` method that only
+ * types carry. A builder of a marked entity, `SelectQueryBuilder<WithTypedRoot<Entity, Root>>`, takes the root too.
  */
-export type WithTypedRoot<Entity, Root extends ObjectLiteral> = Entity & TypedRootMark<Root>;
+export type WithTypedRoot<Marked, Root extends ObjectLiteral> = Marked & TypedRootMark<Root>;
+type IsAny<T> = 0 extends 1 & T ? true : false;
+type BuilderRoot<Builder> = '__typedRoot' extends keyof Builder ? Builder extends TypedRootMark<infer Root> ? Root extends ObjectLiteral ? Root : never : never : never;
+type EntityRoot<Entity> = '__typedRoot' extends keyof Entity ? IsAny<Entity['__typedRoot' & keyof Entity]> extends true ? Entity : Entity extends TypedRootMark<infer Root> ? Root extends ObjectLiteral ? Root : Entity : Entity : Entity;
 /**
- * The root of a builder's typed callbacks: the one set with `typed<Root>()`, or else its entity. The key check
- * comes first: without `strictNullChecks` an entity with an index signature (`ObjectLiteral`) matches the
- * optional mark too, and its root would be inferred as `unknown`.
+ * The root of a builder's typed callbacks: the one set with `typed<Root>()` on the builder (`Builder`, which the
+ * typed methods pass as `this`) or on its entity, or else the entity.
  */
-export type TypedRoot<Entity> = typeof typedRoot extends keyof Entity ? Entity extends TypedRootMark<infer Root> ? Root extends ObjectLiteral ? Root : Entity : Entity : Entity;
+export type TypedRoot<Entity, Builder = unknown> = [BuilderRoot<Builder>] extends [never] ? EntityRoot<Entity> : BuilderRoot<Builder>;
 export {};

package/dist/utils/query-builder.utils.d.ts

@@ -2,10 +2,7 @@ import type { ObjectLiteral, WhereExpressionBuilder } from 'typeorm';
 import type { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 import type { KeyProxyCallback } from '../types/modules/proxy-callback.types';
 import { JsonPathSqlOptions } from './json-path.utils';
-/**
- * Replaces placeholders of `deferColumnKey` in SQL built by `builder`: the database column through the entity of
- * the alias, quoted, `"usr"."receipts_email"`. An alias still unknown or without an entity keeps the name.
- */
+/** Replaces placeholders of `deferColumnKey` in SQL built by `builder`, through the aliases it has by then. */
 export declare function resolveDeferredKeys(builder: WhereExpressionBuilder, statement: string): string;
 /**
  * Database name of an entity property's column (`@Column({ name })`), looked up in the metadata of
@@ -57,8 +54,9 @@ export declare function getTypedSingleColumnKey<Type extends ObjectLiteral>(buil
  * Without quotes it is `alias.propertyPath` (`user.name`, `images.url`, `p.address.city`),
  * which TypeORM maps to the column itself. With `useQuotes` it is the quoted database column
  * (`"t"."ticket_status"`), since TypeORM doesn't map quoted keys. An alias of the query without
- * metadata (a subquery or a CTE in FROM or a join) is quoted unless `useQuotes` is `false`:
- * TypeORM leaves its keys as written, and PostgreSQL folds an unquoted `cte.firstName` to `firstname`.
+ * metadata (a subquery or a CTE in FROM or a join), or one the query still doesn't have when the SQL
+ * is built, is quoted unless `useQuotes` is `false`: TypeORM leaves its keys as written, and
+ * PostgreSQL folds an unquoted `cte.firstName` to `firstname`.
  * Strings are kept as is.
  */
 export declare function getTypedSelectionKey<Type extends ObjectLiteral>(builder: WhereExpressionBuilder, selection: KeyProxyCallback<Type> | string, useQuotes?: boolean, columnsFor?: string): string | string[];

package/dist/utils/query-builder.utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTypedSelectionKey = exports.getTypedSingleColumnKey = exports.isTypedJsonPath = exports.getTypedColumnKey = exports.toFieldSql = exports.findFieldColumn = exports.getColumnDatabaseName = exports.resolveDeferredKeys = void 0;
 const typeorm_1 = require("typeorm");
+const QueryExpressionMap_1 = require("typeorm/query-builder/QueryExpressionMap");
 const proxy_key_utils_1 = require("./proxy-key.utils");
 const json_path_utils_1 = require("./json-path.utils");
 const sql_utils_1 = require("./sql.utils");
@@ -52,49 +53,100 @@ function findQueryAlias(queryBuilder, aliasName) {
 const DEFERRED_KEY_START = '\uE000';
 const DEFERRED_PROPERTY = '\uE001';
 const DEFERRED_FIELD = '\uE002';
+const DEFERRED_UNQUOTED = '\uE004';
 const DEFERRED_KEY_END = '\uE003';
-const DEFERRED_KEY = /\uE000([^\uE000-\uE003]+)([\uE001\uE002])([^\uE000-\uE003]+)\uE003/g;
+const DEFERRED_KEY = /\uE000([^\uE000-\uE004]+)([\uE001\uE002\uE004])([^\uE000-\uE004]+)\uE003/g;
 const TWO_PART_FIELD = /^([A-Za-z_][\w$]*)\.([A-Za-z_][\w$]*)$/;
 /**
- * Placeholder for a column of an alias the query doesn't have yet, e.g. a join added after the call. TypeORM maps
- * property names when it builds the SQL, and so does `resolveDeferredKeys` with these, once the alias is known.
+ * Placeholder for a column of an alias the query doesn't have yet, e.g. a join added after the call: resolved when
+ * the alias is added (`resolveAliasKeys`) or, at the latest, when the SQL is built (`resolveDeferredKeys`).
  */
 function deferColumnKey(aliasName, separator, name) {
     return `${DEFERRED_KEY_START}${aliasName}${separator}${name}${DEFERRED_KEY_END}`;
 }
 /**
- * Replaces placeholders of `deferColumnKey` in SQL built by `builder`: the database column through the entity of
- * the alias, quoted, `"usr"."receipts_email"`. An alias still unknown or without an entity keeps the name.
+ * SQL of a deferred key for `alias`, undefined while the query doesn't have it:
+ * - a quoted key: the database column through the alias' entity, quoted, `"usr"."receipts_email"`; the name
+ *   quoted without an entity;
+ * - an unquoted one (select, order, group by, distinct without `useQuotes`): `alias.property` on an alias with an
+ *   entity, which TypeORM maps and reads as a column of the entity; quoted on an alias without one (a subquery, a
+ *   CTE), as on an alias known at the call, and on an alias the query never has, which only raw SQL adds (a LATERAL
+ *   subquery in the condition of a raw join): TypeORM can't map it, and PostgreSQL would fold it to lower case.
  */
+function toDeferredKeySql(alias, aliasName, separator, name, escape) {
+    const metadata = (alias === null || alias === void 0 ? void 0 : alias.hasMetadata) ? alias.metadata : undefined;
+    if (separator === DEFERRED_UNQUOTED) {
+        return metadata ? `${aliasName}.${name}` : `${escape(aliasName)}.${escape(name)}`;
+    }
+    const column = metadata && (separator === DEFERRED_FIELD ? findColumn(metadata, name) : metadata.findColumnWithPropertyPath(name));
+    const columnName = column && !column.isVirtualProperty ? column.databaseName : name;
+    return `${escape(aliasName)}.${escape(columnName)}`;
+}
+/** Replaces placeholders of `deferColumnKey` in SQL built by `builder`, through the aliases it has by then. */
 function resolveDeferredKeys(builder, statement) {
     if (typeof statement !== 'string' || !statement.includes(DEFERRED_KEY_START)) {
         return statement;
     }
     const queryBuilder = builder;
-    return statement.replace(DEFERRED_KEY, (_match, aliasName, separator, name) => {
-        const metadata = getAliasMetadata(queryBuilder, aliasName);
-        const column = metadata && (separator === DEFERRED_FIELD ? findColumn(metadata, name) : metadata.findColumnWithPropertyPath(name));
-        const columnName = column && !column.isVirtualProperty ? column.databaseName : name;
-        return `${queryBuilder.escape(aliasName)}.${queryBuilder.escape(columnName)}`;
-    });
+    const escape = (identifier) => queryBuilder.escape(identifier);
+    return statement.replace(DEFERRED_KEY, (_match, aliasName, separator, name) => toDeferredKeySql(findQueryAlias(queryBuilder, aliasName), aliasName, separator, name, escape));
 }
 exports.resolveDeferredKeys = resolveDeferredKeys;
+/**
+ * Resolves the placeholders of a new alias in select, order, group by and distinct on, which TypeORM reads before it
+ * builds the SQL: a select of `alias.property` is how it knows to fill the property of a joined entity.
+ */
+function resolveAliasKeys(expressionMap, alias) {
+    var _a;
+    // `connection` (TypeORM 0.3) or `dataSource` (1.x), protected in its types; read only when a key is found
+    const { connection, dataSource } = expressionMap;
+    const escape = (identifier) => (connection !== null && connection !== void 0 ? connection : dataSource).driver.escape(identifier);
+    const hasKey = (statement) => typeof statement === 'string' && statement.includes(DEFERRED_KEY_START);
+    const resolve = (statement) => hasKey(statement)
+        ? statement.replace(DEFERRED_KEY, (match, aliasName, separator, name) => aliasName === alias.name ? toDeferredKeySql(alias, aliasName, separator, name, escape) : match)
+        : statement;
+    // new objects and arrays: a clone shares them with the query it was cloned from
+    if (expressionMap.selects.some((select) => hasKey(select.selection))) {
+        expressionMap.selects = expressionMap.selects.map((select) => hasKey(select.selection) ? { ...select, selection: resolve(select.selection) } : select);
+    }
+    if (expressionMap.groupBys.some(hasKey)) {
+        expressionMap.groupBys = expressionMap.groupBys.map(resolve);
+    }
+    if ((_a = expressionMap.selectDistinctOn) === null || _a === void 0 ? void 0 : _a.some(hasKey)) {
+        expressionMap.selectDistinctOn = expressionMap.selectDistinctOn.map(resolve);
+    }
+    if (Object.keys(expressionMap.orderBys).some(hasKey)) {
+        expressionMap.orderBys = Object.fromEntries(Object.entries(expressionMap.orderBys).map(([key, order]) => [resolve(key), order]));
+    }
+}
 const DEFERRED_KEYS_INSTALLED = Symbol.for('typeorm-extensions.deferredKeys');
-// TypeORM 0.3.12 maps property names in each part of the query, later versions once in the whole query
 function installDeferredKeyResolution() {
-    const prototype = typeorm_1.QueryBuilder.prototype;
-    if (prototype[DEFERRED_KEYS_INSTALLED]) {
+    const builderPrototype = typeorm_1.QueryBuilder.prototype;
+    const mapPrototype = QueryExpressionMap_1.QueryExpressionMap.prototype;
+    if (builderPrototype[DEFERRED_KEYS_INSTALLED]) {
         return;
     }
-    prototype[DEFERRED_KEYS_INSTALLED] = true;
+    builderPrototype[DEFERRED_KEYS_INSTALLED] = true;
+    // TypeORM 0.3.12 maps property names in each part of the query, later versions once in the whole query; keys are
+    // resolved first, so an unquoted `alias.property` is mapped too
     for (const method of ['replacePropertyNames', 'replacePropertyNamesForTheWholeQuery']) {
-        const original = prototype[method];
+        const original = builderPrototype[method];
         if (typeof original === 'function') {
-            prototype[method] = function (statement) {
-                return resolveDeferredKeys(this, original.call(this, statement));
+            builderPrototype[method] = function (statement) {
+                return original.call(this, resolveDeferredKeys(this, statement));
             };
         }
     }
+    const createAlias = mapPrototype.createAlias;
+    if (typeof createAlias === 'function') {
+        mapPrototype.createAlias = function (...args) {
+            const alias = createAlias.apply(this, args);
+            if (alias === null || alias === void 0 ? void 0 : alias.name) {
+                resolveAliasKeys(this, alias);
+            }
+            return alias;
+        };
+    }
 }
 installDeferredKeyResolution();
 /** Entity metadata of a query alias (the main alias when `aliasName` is undefined), if it has any. */
@@ -341,7 +393,7 @@ function assertTableColumnKey({ metadata, propertyPath }, keys, methodName) {
             `"${keys.join('.')}.someColumn"`);
     }
 }
-// an alias the query doesn't know yet may still get metadata (a join added later), so it stays unquoted
+// an alias the query doesn't know yet is resolved when it is added (`resolveAliasKeys`)
 function isAliasWithoutMetadata(queryBuilder, aliasName) {
     const alias = aliasName === undefined ? undefined : findQueryAlias(queryBuilder, aliasName);
     return alias !== undefined && !alias.hasMetadata;
@@ -352,8 +404,9 @@ function isAliasWithoutMetadata(queryBuilder, aliasName) {
  * Without quotes it is `alias.propertyPath` (`user.name`, `images.url`, `p.address.city`),
  * which TypeORM maps to the column itself. With `useQuotes` it is the quoted database column
  * (`"t"."ticket_status"`), since TypeORM doesn't map quoted keys. An alias of the query without
- * metadata (a subquery or a CTE in FROM or a join) is quoted unless `useQuotes` is `false`:
- * TypeORM leaves its keys as written, and PostgreSQL folds an unquoted `cte.firstName` to `firstname`.
+ * metadata (a subquery or a CTE in FROM or a join), or one the query still doesn't have when the SQL
+ * is built, is quoted unless `useQuotes` is `false`: TypeORM leaves its keys as written, and
+ * PostgreSQL folds an unquoted `cte.firstName` to `firstname`.
  * Strings are kept as is.
  */
 function getTypedSelectionKey(builder, selection, useQuotes, columnsFor) {
@@ -373,6 +426,14 @@ function getTypedSelectionKey(builder, selection, useQuotes, columnsFor) {
         if (useQuotes !== null && useQuotes !== void 0 ? useQuotes : isAliasWithoutMetadata(queryBuilder, resolved.aliasName)) {
             return toQuotedColumnKey(queryBuilder, resolved);
         }
+        // an alias added later decides then: TypeORM maps an entity's keys, a subquery's are quoted
+        if (useQuotes === undefined &&
+            columnsFor !== undefined &&
+            resolved.aliasName !== undefined &&
+            !resolved.metadata &&
+            !findQueryAlias(queryBuilder, resolved.aliasName)) {
+            return deferColumnKey(resolved.aliasName, DEFERRED_UNQUOTED, resolved.propertyPath);
+        }
         return resolved.aliasName === undefined
             ? resolved.propertyPath
             : `${resolved.aliasName}.${resolved.propertyPath}`;

package/dist/utils/reserved-qualifier-guard.utils.d.ts

@@ -0,0 +1,36 @@
+import { ReservedQualifier } from './reserved-qualifier.utils';
+/** The SQL of a query names a reserved word as a qualifier without quotes; see `enableReservedQualifierGuard`. */
+export declare class ReservedQualifierError extends Error {
+    /** The SQL of the query, as the driver gets it. */
+    readonly sql: string;
+    /** Each reserved word used as a qualifier, in the order of the SQL. */
+    readonly qualifiers: ReservedQualifier[];
+    constructor(sql: string, qualifiers: ReservedQualifier[]);
+}
+type GuardWordsOption = {
+    /**
+     * The words to report, instead of the default list of the database (`POSTGRES_RESERVED_KEY_WORDS`,
+     * `COCKROACHDB_RESERVED_KEY_WORDS` on CockroachDB). Spread a default list to extend it.
+     */
+    words?: readonly string[];
+};
+export type ReservedQualifierGuardOptions = GuardWordsOption & ({
+    /** `'throw'` (the default): the query rejects with a `ReservedQualifierError` before it runs. */
+    mode?: 'throw';
+} | {
+    /** `'warn'`: the query runs, and the error is passed to `onViolation`. */
+    mode: 'warn';
+    /** Reports the error the query would throw in `'throw'` mode; `console.warn` by default. */
+    onViolation?: (violation: ReservedQualifierError) => void;
+});
+/**
+ * Checks the SQL of every query builder on PostgreSQL and CockroachDB for a reserved word used as a qualifier
+ * without quotes, such as `order."userId"` or `user.id` (`findBareReservedQualifiers`), before the query runs.
+ * TypeORM quotes the aliases it writes, so such a word comes from SQL written by hand, which PostgreSQL rejects.
+ *
+ * Off by default. A second call replaces the options. Other databases aren't checked.
+ */
+export declare function enableReservedQualifierGuard(options?: ReservedQualifierGuardOptions): void;
+/** Turns the check of `enableReservedQualifierGuard` off. */
+export declare function disableReservedQualifierGuard(): void;
+export {};

package/dist/utils/reserved-qualifier-guard.utils.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.disableReservedQualifierGuard = exports.enableReservedQualifierGuard = exports.ReservedQualifierError = void 0;
+const typeorm_1 = require("typeorm");
+const reserved_qualifier_utils_1 = require("./reserved-qualifier.utils");
+const sql_utils_1 = require("./sql.utils");
+const NAME_AFTER_DOT = /^\s*\.\s*("(?:[^"]|"")*"|[A-Za-z_][\w$]*|\*)/;
+/** `"order"."userId"` for `order."userId"` / `order.userId`, `"order".*` for `order.*`. */
+function toQuotedReference(sql, { word, index }) {
+    var _a, _b;
+    const name = (_b = (_a = NAME_AFTER_DOT.exec(sql.slice(index + word.length))) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 'column';
+    const quotedName = name.startsWith('"') || name === '*' ? name : `"${name}"`;
+    return `"${word}".${quotedName}`;
+}
+/** The SQL of a query names a reserved word as a qualifier without quotes; see `enableReservedQualifierGuard`. */
+class ReservedQualifierError extends Error {
+    constructor(sql, qualifiers) {
+        const [first] = qualifiers;
+        const found = qualifiers.map(({ word, snippet }) => `"${word}" in ${snippet}`).join('; ');
+        super(`Reserved word used as a qualifier without quotes: ${found}. ` +
+            `PostgreSQL reads it as the key word, not as an alias, and rejects the query. ` +
+            (first
+                ? `Quote both halves, ${toQuotedReference(sql, first)}, or build the reference with tableHelper or the typed methods`
+                : ''));
+        this.name = 'ReservedQualifierError';
+        this.sql = sql;
+        this.qualifiers = qualifiers;
+    }
+}
+exports.ReservedQualifierError = ReservedQualifierError;
+let guard;
+let installed = false;
+let lastScan;
+const reportViolation = (violation) => console.warn(violation);
+function checkQuery(queryBuilder, sql, state) {
+    var _a;
+    const driver = (0, sql_utils_1.getDriverType)(queryBuilder);
+    if (typeof sql !== 'string' || !(0, sql_utils_1.isPostgresLikeDriver)(driver)) {
+        return;
+    }
+    const words = (_a = state.words) !== null && _a !== void 0 ? _a : (0, reserved_qualifier_utils_1.toReservedWordSet)(driver === 'cockroachdb' ? reserved_qualifier_utils_1.COCKROACHDB_RESERVED_KEY_WORDS : reserved_qualifier_utils_1.POSTGRES_RESERVED_KEY_WORDS);
+    // the same SQL again, as a query run in a loop: one scan
+    const qualifiers = lastScan && lastScan.sql === sql && lastScan.words === words
+        ? lastScan.qualifiers
+        : (0, reserved_qualifier_utils_1.scanReservedQualifiers)(sql, words);
+    lastScan = { sql, words, qualifiers };
+    if (qualifiers.length === 0) {
+        return;
+    }
+    const violation = new ReservedQualifierError(sql, qualifiers);
+    if (state.mode === 'throw') {
+        throw violation;
+    }
+    state.onViolation(violation);
+}
+// every query of every builder gets its SQL here before it runs: getMany, getRawMany, getOne, getCount, stream,
+// execute; getSql() too. getQuery() isn't checked: a subquery's SQL is checked as part of the query it is in
+function installGuard() {
+    if (installed) {
+        return;
+    }
+    installed = true;
+    const getQueryAndParameters = typeorm_1.QueryBuilder.prototype.getQueryAndParameters;
+    typeorm_1.QueryBuilder.prototype.getQueryAndParameters = function () {
+        const queryAndParameters = getQueryAndParameters.call(this);
+        if (guard) {
+            checkQuery(this, queryAndParameters[0], guard);
+        }
+        return queryAndParameters;
+    };
+}
+/**
+ * Checks the SQL of every query builder on PostgreSQL and CockroachDB for a reserved word used as a qualifier
+ * without quotes, such as `order."userId"` or `user.id` (`findBareReservedQualifiers`), before the query runs.
+ * TypeORM quotes the aliases it writes, so such a word comes from SQL written by hand, which PostgreSQL rejects.
+ *
+ * Off by default. A second call replaces the options. Other databases aren't checked.
+ */
+function enableReservedQualifierGuard(options = {}) {
+    var _a;
+    const mode = (_a = options.mode) !== null && _a !== void 0 ? _a : 'throw';
+    if (mode !== 'throw' && mode !== 'warn') {
+        throw new TypeError(`Invalid mode ${JSON.stringify(mode)} of the reserved qualifier guard: 'throw' or 'warn'`);
+    }
+    guard = {
+        mode,
+        words: options.words === undefined ? undefined : (0, reserved_qualifier_utils_1.toReservedWordSet)(options.words),
+        onViolation: (options.mode === 'warn' && options.onViolation) || reportViolation,
+    };
+    installGuard();
+}
+exports.enableReservedQualifierGuard = enableReservedQualifierGuard;
+/** Turns the check of `enableReservedQualifierGuard` off. */
+function disableReservedQualifierGuard() {
+    guard = undefined;
+    lastScan = undefined;
+}
+exports.disableReservedQualifierGuard = disableReservedQualifierGuard;

package/dist/utils/reserved-qualifier.utils.d.ts

@@ -0,0 +1,33 @@
+/** A reserved word that qualifies a name without quotes, as in `order."userId"`. */
+export interface ReservedQualifier {
+    /** The word as the SQL has it: `order`, `ORDER`. */
+    word: string;
+    /** Offset of the word in the SQL. */
+    index: number;
+    /** The SQL around the word, on one line. */
+    snippet: string;
+}
+/**
+ * The reserved key words of PostgreSQL, "reserved" in Appendix C of its documentation (`SYSTEM_USER` since
+ * PostgreSQL 16). None can be a table, an alias or a schema without quotes, so none is followed by a `.` in valid
+ * SQL. The words "reserved (can be function or type)" (`LEFT`, `JOIN`, `BINARY`, …) aren't on the list: one may
+ * name the schema of a type, as in `CAST(x AS binary.my_type)`.
+ */
+export declare const POSTGRES_RESERVED_KEY_WORDS: readonly string[];
+/** The reserved key words of CockroachDB: PostgreSQL's without `SYSTEM_USER`, with `CONCURRENTLY` and `CURRENT_SCHEMA`. */
+export declare const COCKROACHDB_RESERVED_KEY_WORDS: readonly string[];
+/** The words in lower case; cached for a frozen list, such as the defaults, which can't change afterwards. */
+export declare function toReservedWordSet(words: readonly string[]): ReadonlySet<string>;
+/** `findBareReservedQualifiers` with the words as a set of lower-case words (`toReservedWordSet`). */
+export declare function scanReservedQualifiers(sql: string, words: ReadonlySet<string>): ReservedQualifier[];
+/**
+ * Reserved words that qualify a name without quotes, as in `order."userId"` or `user.id`: PostgreSQL reads such a
+ * word as the key word, not as an alias, and rejects the statement (`syntax error at or near "order"`).
+ *
+ * Words in string literals (`E'…'` and dollar-quoted ones too), quoted identifiers, comments and parameters are
+ * skipped, and so are words after a dot (`public.order`) and a number after one (`THEN .5`). Case-insensitive;
+ * whitespace may come before the dot (`group . name`).
+ *
+ * @param words the words to look for, `POSTGRES_RESERVED_KEY_WORDS` by default
+ */
+export declare function findBareReservedQualifiers(sql: string, words?: readonly string[]): ReservedQualifier[];