@mikro-orm/knex 6.0.0-dev.9 → 6.0.0-dev.90

package/query/QueryBuilderHelper.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import type { Dictionary, EntityData, EntityMetadata, EntityProperty, FlatQueryOrderMap, QBFilterQuery } from '@mikro-orm/core';
+import type { Dictionary, EntityData, EntityKey, EntityMetadata, EntityProperty, FlatQueryOrderMap, QBFilterQuery } from '@mikro-orm/core';
 import { LockMode } from '@mikro-orm/core';
 import { QueryType } from './enums';
 import type { Field, JoinOptions } from '../typings';
@@ -20,10 +20,9 @@ export declare class QueryBuilderHelper {
     mapper(field: string | Knex.Raw, type?: QueryType): string;
     mapper(field: string | Knex.Raw, type?: QueryType, value?: any, alias?: string | null): string;
     processData(data: Dictionary, convertCustomTypes: boolean, multi?: boolean): any;
-    joinOneToReference(prop: EntityProperty, ownerAlias: string, alias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond?: Dictionary): JoinOptions;
-    joinManyToOneReference(prop: EntityProperty, ownerAlias: string, alias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond?: Dictionary): JoinOptions;
-    joinManyToManyReference(prop: EntityProperty, ownerAlias: string, alias: string, pivotAlias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond: Dictionary, path: string): Dictionary<JoinOptions>;
-    joinPivotTable(field: string, prop: EntityProperty, ownerAlias: string, alias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond?: Dictionary): JoinOptions;
+    joinOneToReference(prop: EntityProperty, ownerAlias: string, alias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond?: Dictionary, schema?: string): JoinOptions;
+    joinManyToOneReference(prop: EntityProperty, ownerAlias: string, alias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond?: Dictionary, schema?: string): JoinOptions;
+    joinManyToManyReference(prop: EntityProperty, ownerAlias: string, alias: string, pivotAlias: string, type: 'leftJoin' | 'innerJoin' | 'pivotJoin', cond: Dictionary, path: string, schema?: string): Dictionary<JoinOptions>;
     processJoins(qb: Knex.QueryBuilder, joins: Dictionary<JoinOptions>, schema?: string): void;
     private processJoinClause;
     private wrapQueryGroup;
@@ -43,16 +42,14 @@ export declare class QueryBuilderHelper {
     }[], qb: Knex.QueryBuilder): void;
     appendQueryCondition(type: QueryType, cond: any, qb: Knex.QueryBuilder, operator?: '$and' | '$or', method?: 'where' | 'having'): void;
     private appendQuerySubCondition;
-    private processCustomExpression;
     private processObjectSubCondition;
     private getOperatorReplacement;
     getQueryOrder(type: QueryType, orderBy: FlatQueryOrderMap | FlatQueryOrderMap[], populate: Dictionary<string>): string;
     getQueryOrderFromObject(type: QueryType, orderBy: FlatQueryOrderMap, populate: Dictionary<string>): string;
-    finalize(type: QueryType, qb: Knex.QueryBuilder, meta?: EntityMetadata): void;
-    splitField(field: string, greedyAlias?: boolean): [string, string];
+    finalize(type: QueryType, qb: Knex.QueryBuilder, meta?: EntityMetadata, data?: Dictionary, returning?: Field<any>[]): void;
+    splitField<T>(field: EntityKey<T>, greedyAlias?: boolean): [string, EntityKey<T>];
     getLockSQL(qb: Knex.QueryBuilder, lockMode: LockMode, lockTables?: string[]): void;
     updateVersionProperty(qb: Knex.QueryBuilder, data: Dictionary): void;
-    static isCustomExpression(field: string, hasAlias?: boolean): boolean;
     private prefix;
     private appendGroupCondition;
     private isPrefixed;

package/query/QueryBuilderHelper.js

@@ -19,6 +19,10 @@ class QueryBuilderHelper {
         this.metadata = this.driver.getMetadata();
     }
     mapper(field, type = enums_1.QueryType.SELECT, value, alias) {
+        if (core_1.Utils.isRawSql(field)) {
+            return this.knex.raw(field.sql, field.params);
+        }
+        /* istanbul ignore next */
         if (typeof field !== 'string') {
             return field;
         }
@@ -36,12 +40,26 @@ class QueryBuilderHelper {
                     parts.push(this.mapper(a !== this.alias ? `${a}.${f}` : f, type, value, alias));
                 }
             }
+            // flatten the value if we see we are expanding nested composite key
+            // hackish, but cleaner solution would require quite a lot of refactoring
+            if (fields.length !== parts.length && Array.isArray(value)) {
+                value.forEach(row => {
+                    if (Array.isArray(row)) {
+                        const tmp = core_1.Utils.flatten(row);
+                        row.length = 0;
+                        row.push(...tmp);
+                    }
+                });
+            }
             return this.knex.raw('(' + parts.map(part => this.knex.ref(part)).join(', ') + ')');
         }
-        let ret = field;
-        const customExpression = QueryBuilderHelper.isCustomExpression(field, !!alias);
+        const rawField = core_1.RawQueryFragment.getKnownFragment(field);
+        if (rawField) {
+            return this.knex.raw(rawField.sql, rawField.params);
+        }
         const [a, f] = this.splitField(field);
         const prop = this.getProperty(f, a);
+        let ret = field;
         // embeddable nested path instead of a regular property with table alias, reset alias
         if (prop?.name === a && prop.embeddedProps[f]) {
             return this.alias + '.' + prop.fieldNames[0];
@@ -56,7 +74,7 @@ class QueryBuilderHelper {
             const as = alias === null ? '' : ` as ${aliased}`;
             return this.knex.raw(`${prop.formula(alias2)}${as}`);
         }
-        if (prop?.customType?.convertToJSValueSQL) {
+        if (prop?.hasConvertToJSValueSQL) {
             const prefixed = this.prefix(field, isTableNameAliasRequired, true);
             const valueSQL = prop.customType.convertToJSValueSQL(prefixed, this.platform);
             if (alias === null) {
@@ -65,15 +83,12 @@ class QueryBuilderHelper {
             return this.knex.raw(`${valueSQL} as ${this.platform.quoteIdentifier(alias ?? prop.fieldNames[0])}`);
         }
         // do not wrap custom expressions
-        if (!customExpression) {
+        if (!rawField) {
             ret = this.prefix(field);
         }
         if (alias) {
             ret += ' as ' + alias;
         }
-        if (customExpression) {
-            return this.knex.raw(ret, value);
-        }
         if (!isTableNameAliasRequired || this.isPrefixed(ret) || noPrefix) {
             return ret;
         }
@@ -91,28 +106,28 @@ class QueryBuilderHelper {
         }
         return data;
     }
-    joinOneToReference(prop, ownerAlias, alias, type, cond = {}) {
+    joinOneToReference(prop, ownerAlias, alias, type, cond = {}, schema) {
         const prop2 = prop.targetMeta.properties[prop.mappedBy || prop.inversedBy];
         const table = this.getTableName(prop.type);
-        const schema = this.driver.getSchemaName(prop.targetMeta);
         const joinColumns = prop.owner ? prop.referencedColumnNames : prop2.joinColumns;
         const inverseJoinColumns = prop.referencedColumnNames;
         const primaryKeys = prop.owner ? prop.joinColumns : prop2.referencedColumnNames;
         return {
-            prop, type, cond, ownerAlias, alias, table, schema,
+            prop, type, cond, ownerAlias, alias, table,
             joinColumns, inverseJoinColumns, primaryKeys,
+            schema: this.driver.getSchemaName(prop.targetMeta, { schema }),
         };
     }
-    joinManyToOneReference(prop, ownerAlias, alias, type, cond = {}) {
+    joinManyToOneReference(prop, ownerAlias, alias, type, cond = {}, schema) {
         return {
             prop, type, cond, ownerAlias, alias,
             table: this.getTableName(prop.type),
-            schema: this.driver.getSchemaName(prop.targetMeta),
+            schema: this.driver.getSchemaName(prop.targetMeta, { schema }),
             joinColumns: prop.referencedColumnNames,
             primaryKeys: prop.fieldNames,
         };
     }
-    joinManyToManyReference(prop, ownerAlias, alias, pivotAlias, type, cond, path) {
+    joinManyToManyReference(prop, ownerAlias, alias, pivotAlias, type, cond, path, schema) {
         const pivotMeta = this.metadata.find(prop.pivotEntity);
         const ret = {
             [`${ownerAlias}.${prop.name}#${pivotAlias}`]: {
@@ -123,7 +138,7 @@ class QueryBuilderHelper {
                 inverseJoinColumns: prop.inverseJoinColumns,
                 primaryKeys: prop.referencedColumnNames,
                 table: pivotMeta.tableName,
-                schema: this.driver.getSchemaName(pivotMeta),
+                schema: this.driver.getSchemaName(pivotMeta, { schema }),
                 path: path.endsWith('[pivot]') ? path : `${path}[pivot]`,
             },
         };
@@ -131,22 +146,10 @@ class QueryBuilderHelper {
             return ret;
         }
         const prop2 = prop.owner ? pivotMeta.relations[1] : pivotMeta.relations[0];
-        ret[`${pivotAlias}.${prop2.name}#${alias}`] = this.joinManyToOneReference(prop2, pivotAlias, alias, type);
+        ret[`${pivotAlias}.${prop2.name}#${alias}`] = this.joinManyToOneReference(prop2, pivotAlias, alias, type, undefined, schema);
         ret[`${pivotAlias}.${prop2.name}#${alias}`].path = path;
         return ret;
     }
-    joinPivotTable(field, prop, ownerAlias, alias, type, cond = {}) {
-        const pivotMeta = this.metadata.find(field);
-        const prop2 = pivotMeta.relations[0] === prop ? pivotMeta.relations[1] : pivotMeta.relations[0];
-        return {
-            prop, type, cond, ownerAlias, alias,
-            table: pivotMeta.collection,
-            schema: pivotMeta.schema,
-            joinColumns: prop.joinColumns,
-            inverseJoinColumns: prop2.joinColumns,
-            primaryKeys: prop.referencedColumnNames,
-        };
-    }
     processJoins(qb, joins, schema) {
         Object.values(joins).forEach(join => {
             let table = `${join.table} as ${join.alias}`;
@@ -162,6 +165,11 @@ class QueryBuilderHelper {
                 const right = `${join.alias}.${join.joinColumns[idx]}`;
                 conditions.push(`${this.knex.ref(left)} = ${this.knex.ref(right)}`);
             });
+            if (join.prop.targetMeta.discriminatorValue && !join.path?.endsWith('[pivot]')) {
+                const typeProperty = join.prop.targetMeta.root.discriminatorColumn;
+                const alias = join.inverseAlias ?? join.alias;
+                join.cond[`${alias}.${typeProperty}`] = join.prop.targetMeta.discriminatorValue;
+            }
             Object.keys(join.cond).forEach(key => {
                 conditions.push(this.processJoinClause(key, join.cond[key], params));
             });
@@ -212,20 +220,14 @@ class QueryBuilderHelper {
         if (operator === '$exists') {
             value = null;
         }
-        if (QueryBuilderHelper.isCustomExpression(key)) {
-            // unwind parameters when ? found in field name
-            const count = key.concat('?').match(/\?/g).length - 1;
-            const values = core_1.Utils.asArray(value);
-            const params1 = values.slice(0, count).map((c) => core_1.Utils.isObject(c) ? JSON.stringify(c) : c);
-            const params2 = values.slice(count);
-            const k = this.mapper(key, enums_1.QueryType.SELECT, params1);
-            const { sql, bindings } = k.toSQL().toNative();
-            if (params2.length > 0) {
-                params.push(...bindings);
-                params.push(...params2);
-                return sql + ' = ?';
+        const rawField = core_1.RawQueryFragment.getKnownFragment(key);
+        if (rawField) {
+            let sql = rawField.sql;
+            params.push(...rawField.params);
+            params.push(...core_1.Utils.asArray(value));
+            if (core_1.Utils.asArray(value).length > 0) {
+                sql += ' = ?';
             }
-            params.push(...bindings);
             return sql;
         }
         const sql = this.mapper(key);
@@ -241,7 +243,7 @@ class QueryBuilderHelper {
         return `(${parts.join(` ${core_1.GroupOperator[operator]} `)})`;
     }
     mapJoinColumns(type, join) {
-        if (join.prop && join.prop.reference === core_1.ReferenceType.ONE_TO_ONE && !join.prop.owner) {
+        if (join.prop && join.prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !join.prop.owner) {
             return join.prop.fieldNames.map((fieldName, idx) => {
                 return this.mapper(`${join.alias}.${join.inverseJoinColumns[idx]}`, type, undefined, fieldName);
             });
@@ -254,7 +256,7 @@ class QueryBuilderHelper {
     isOneToOneInverse(field) {
         const meta = this.metadata.find(this.entityName);
         const prop = meta.properties[field];
-        return prop && prop.reference === core_1.ReferenceType.ONE_TO_ONE && !prop.owner;
+        return prop && prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.owner;
     }
     getTableName(entityName) {
         const meta = this.metadata.find(entityName);
@@ -293,13 +295,13 @@ class QueryBuilderHelper {
     }
     appendOnConflictClause(type, onConflict, qb) {
         onConflict.forEach(item => {
-            const sub = qb.onConflict(item.fields);
+            const sub = item.fields.length > 0 ? qb.onConflict(item.fields) : qb.onConflict();
             core_1.Utils.runIfNotEmpty(() => sub.ignore(), item.ignore);
             core_1.Utils.runIfNotEmpty(() => {
                 let mergeParam = item.merge;
                 if (core_1.Utils.isObject(item.merge)) {
                     mergeParam = {};
-                    Object.keys(item.merge).forEach(key => {
+                    core_1.Utils.keys(item.merge).forEach(key => {
                         const k = this.mapper(key, type);
                         mergeParam[k] = item.merge[key];
                     });
@@ -330,34 +332,29 @@ class QueryBuilderHelper {
     }
     appendQuerySubCondition(qb, type, method, cond, key, operator) {
         const m = operator === '$or' ? 'orWhere' : method;
+        if (cond[key] instanceof core_1.RawQueryFragment) {
+            cond[key] = this.knex.raw(cond[key].sql, cond[key].params);
+        }
         if (this.isSimpleRegExp(cond[key])) {
             return void qb[m](this.mapper(key, type), 'like', this.getRegExpParam(cond[key]));
         }
         if (core_1.Utils.isPlainObject(cond[key]) || cond[key] instanceof RegExp) {
             return this.processObjectSubCondition(cond, key, qb, method, m, type);
         }
-        if (QueryBuilderHelper.isCustomExpression(key)) {
-            return this.processCustomExpression(qb, m, key, cond, type);
-        }
         const op = cond[key] === null ? 'is' : '=';
+        const raw = core_1.RawQueryFragment.getKnownFragment(key);
+        if (raw) {
+            const value = core_1.Utils.asArray(cond[key]);
+            if (value.length > 0) {
+                return void qb[m](this.knex.raw(raw.sql, raw.params), op, value[0]);
+            }
+            return void qb[m](this.knex.raw(raw.sql, raw.params));
+        }
         if (this.subQueries[key]) {
             return void qb[m](this.knex.raw(`(${this.subQueries[key]})`), op, cond[key]);
         }
         qb[m](this.mapper(key, type, cond[key], null), op, cond[key]);
     }
-    processCustomExpression(clause, m, key, cond, type) {
-        // unwind parameters when ? found in field name
-        const count = key.concat('?').match(/\?/g).length - 1;
-        const value = core_1.Utils.asArray(cond[key]);
-        const params1 = value.slice(0, count).map((c) => core_1.Utils.isObject(c) ? JSON.stringify(c) : c);
-        const params2 = value.slice(count);
-        const k = this.mapper(key, type, params1);
-        if (params2.length > 0) {
-            const val = params2.length === 1 && params2[0] === null ? null : this.knex.raw('?', params2);
-            return void clause[m](k, val);
-        }
-        clause[m](k);
-    }
     processObjectSubCondition(cond, key, qb, method, m, type) {
         // grouped condition for one field
         let value = cond[key];
@@ -394,7 +391,8 @@ class QueryBuilderHelper {
             }));
         }
         else {
-            qb[m](this.mapper(key, type, undefined, null), replacement, value[op]);
+            const mappedKey = this.mapper(key, type, value[op], null);
+            qb[m](mappedKey, replacement, value[op]);
         }
     }
     getOperatorReplacement(op, value) {
@@ -422,36 +420,58 @@ class QueryBuilderHelper {
     }
     getQueryOrderFromObject(type, orderBy, populate) {
         const ret = [];
-        Object.keys(orderBy).forEach(k => {
-            const direction = orderBy[k];
+        Object.keys(orderBy).forEach(key => {
+            const direction = orderBy[key];
             const order = core_1.Utils.isNumber(direction) ? core_1.QueryOrderNumeric[direction] : direction;
-            if (QueryBuilderHelper.isCustomExpression(k)) {
-                ret.push(`${k} ${order.toLowerCase()}`);
+            const raw = core_1.RawQueryFragment.getKnownFragment(key);
+            if (raw) {
+                ret.push(`${this.platform.formatQuery(raw.sql, raw.params)} ${order.toLowerCase()}`);
                 return;
             }
-            // eslint-disable-next-line prefer-const
-            let [alias, field] = this.splitField(k, true);
-            alias = populate[alias] || alias;
-            core_1.Utils.splitPrimaryKeys(field).forEach(f => {
-                const prop = this.getProperty(f, alias);
-                const noPrefix = (prop && prop.persist === false && !prop.formula) || QueryBuilderHelper.isCustomExpression(f);
-                const column = this.mapper(noPrefix ? f : `${alias}.${f}`, type, undefined, null);
+            core_1.Utils.splitPrimaryKeys(key).forEach(f => {
+                // eslint-disable-next-line prefer-const
+                let [alias, field] = this.splitField(f, true);
+                alias = populate[alias] || alias;
+                const prop = this.getProperty(field, alias);
+                const noPrefix = (prop && prop.persist === false && !prop.formula) || core_1.RawQueryFragment.isKnownFragment(f);
+                const column = this.mapper(noPrefix ? field : `${alias}.${field}`, type, undefined, null);
                 /* istanbul ignore next */
                 const rawColumn = core_1.Utils.isString(column) ? column.split('.').map(e => this.knex.ref(e)).join('.') : column;
                 const customOrder = prop?.customOrder;
-                const colPart = customOrder
+                let colPart = customOrder
                     ? this.platform.generateCustomOrder(rawColumn, customOrder)
                     : rawColumn;
+                if (core_1.Utils.isRawSql(colPart)) {
+                    colPart = this.platform.formatQuery(colPart.sql, colPart.params);
+                }
                 ret.push(`${colPart} ${order.toLowerCase()}`);
             });
         });
         return ret.join(', ');
     }
-    finalize(type, qb, meta) {
-        const useReturningStatement = type === enums_1.QueryType.INSERT && this.platform.usesReturningStatement() && meta && !meta.compositePK;
-        if (useReturningStatement) {
-            const returningProps = meta.hydrateProps.filter(prop => prop.persist !== false && (prop.primary || prop.defaultRaw));
-            qb.returning(core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames)));
+    finalize(type, qb, meta, data, returning) {
+        if (!meta || !data || !this.platform.usesReturningStatement()) {
+            return;
+        }
+        // always respect explicit returning hint
+        if (returning && returning.length > 0) {
+            qb.returning(returning.map(field => this.mapper(field, type)));
+            return;
+        }
+        if (type === enums_1.QueryType.INSERT) {
+            const returningProps = meta.hydrateProps
+                .filter(prop => prop.returning || (prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw)))
+                .filter(prop => !(prop.name in data));
+            if (returningProps.length > 0) {
+                qb.returning(core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames)));
+            }
+            return;
+        }
+        if (type === enums_1.QueryType.UPDATE) {
+            const returningProps = meta.hydrateProps.filter(prop => core_1.Utils.isRawSql(data[prop.name]));
+            if (returningProps.length > 0) {
+                qb.returning(core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames)));
+            }
         }
     }
     splitField(field, greedyAlias = false) {
@@ -489,23 +509,18 @@ class QueryBuilderHelper {
         }
         const versionProperty = meta.properties[meta.versionProperty];
         let sql = this.platform.quoteIdentifier(versionProperty.fieldNames[0]) + ' + 1';
-        if (versionProperty.type.toLowerCase() === 'date') {
+        if (versionProperty.runtimeType === 'Date') {
             sql = this.platform.getCurrentTimestampSQL(versionProperty.length);
         }
         qb.update(versionProperty.fieldNames[0], this.knex.raw(sql));
     }
-    static isCustomExpression(field, hasAlias = false) {
-        // if we do not have alias, we don't consider spaces as custom expressions
-        const re = hasAlias ? /[ ?<>=()'"`:]|^\d/ : /[?<>=()'"`:]|^\d/;
-        return !!field.match(re);
-    }
     prefix(field, always = false, quote = false) {
         let ret;
         if (!this.isPrefixed(field)) {
             const alias = always ? (quote ? this.alias : this.platform.quoteIdentifier(this.alias)) + '.' : '';
             const fieldName = this.fieldName(field, this.alias, always);
-            if (QueryBuilderHelper.isCustomExpression(fieldName)) {
-                return fieldName;
+            if (fieldName instanceof core_1.RawQueryFragment) {
+                return fieldName.sql;
             }
             ret = alias + fieldName;
         }
@@ -545,15 +560,15 @@ class QueryBuilderHelper {
         }
         if (prop.fieldNameRaw) {
             if (!always) {
-                return prop.fieldNameRaw
-                    .replace(/\[::alias::]\.?/g, '')
-                    .replace(this.platform.quoteIdentifier('') + '.', '');
+                return (0, core_1.raw)(prop.fieldNameRaw
+                    .replace(new RegExp(core_1.ALIAS_REPLACEMENT_RE + '\\.?', 'g'), '')
+                    .replace(this.platform.quoteIdentifier('') + '.', ''));
             }
             if (alias) {
-                return prop.fieldNameRaw.replace(/\[::alias::]/g, alias);
+                return (0, core_1.raw)(prop.fieldNameRaw.replace(new RegExp(core_1.ALIAS_REPLACEMENT_RE, 'g'), alias));
             }
             /* istanbul ignore next */
-            return prop.fieldNameRaw;
+            return (0, core_1.raw)(prop.fieldNameRaw);
         }
         /* istanbul ignore next */
         return prop.fieldNames?.[0] ?? field;
@@ -564,7 +579,7 @@ class QueryBuilderHelper {
         // check if `alias` is not matching an embedded property name instead of alias, e.g. `address.city`
         if (alias && meta) {
             const prop = meta.properties[alias];
-            if (prop?.reference === core_1.ReferenceType.EMBEDDED) {
+            if (prop?.kind === core_1.ReferenceKind.EMBEDDED) {
                 // we want to select the full object property so hydration works as expected
                 if (prop.object) {
                     return prop;
@@ -596,17 +611,18 @@ class QueryBuilderHelper {
                 return;
             }
             if (prop.joinColumns && Array.isArray(data[k])) {
-                const copy = data[k];
+                const copy = core_1.Utils.flatten(data[k]);
                 delete data[k];
                 prop.joinColumns.forEach((joinColumn, idx) => data[joinColumn] = copy[idx]);
                 return;
             }
             if (prop.customType && convertCustomTypes && !this.platform.isRaw(data[k])) {
-                data[k] = prop.customType.convertToDatabaseValue(data[k], this.platform, { fromQuery: true, key: k, mode: 'query' });
+                data[k] = prop.customType.convertToDatabaseValue(data[k], this.platform, { fromQuery: true, key: k, mode: 'query-data' });
             }
-            if (prop.customType && 'convertToDatabaseValueSQL' in prop.customType && !this.platform.isRaw(data[k])) {
+            if (prop.hasConvertToDatabaseValueSQL && !this.platform.isRaw(data[k])) {
                 const quoted = this.platform.quoteValue(data[k]);
-                data[k] = this.knex.raw(prop.customType.convertToDatabaseValueSQL(quoted, this.platform).replace(/\?/, '\\?'));
+                const sql = prop.customType.convertToDatabaseValueSQL(quoted, this.platform);
+                data[k] = this.knex.raw(sql.replace(/\?/, '\\?'));
             }
             if (!prop.customType && (Array.isArray(data[k]) || core_1.Utils.isPlainObject(data[k]))) {
                 data[k] = JSON.stringify(data[k]);

package/query/ScalarCriteriaNode.d.ts

@@ -3,7 +3,8 @@ import type { IQueryBuilder } from '../typings';
 /**
  * @internal
  */
-export declare class ScalarCriteriaNode extends CriteriaNode {
-    process<T>(qb: IQueryBuilder<T>, alias?: string): any;
+export declare class ScalarCriteriaNode<T extends object> extends CriteriaNode<T> {
+    process(qb: IQueryBuilder<T>, alias?: string): any;
+    willAutoJoin<T>(qb: IQueryBuilder<T>, alias?: string): boolean;
     shouldJoin(): boolean;
 }

package/query/ScalarCriteriaNode.js

@@ -13,23 +13,26 @@ class ScalarCriteriaNode extends CriteriaNode_1.CriteriaNode {
             const parentPath = this.parent.getPath(); // the parent is always there, otherwise `shouldJoin` would return `false`
             const nestedAlias = qb.getAliasForJoinPath(path) || qb.getNextAlias(this.prop?.pivotTable ?? this.entityName);
             const field = `${alias}.${this.prop.name}`;
-            const type = this.prop.reference === core_1.ReferenceType.MANY_TO_MANY ? 'pivotJoin' : 'leftJoin';
+            const type = this.prop.kind === core_1.ReferenceKind.MANY_TO_MANY ? 'pivotJoin' : 'leftJoin';
             qb.join(field, nestedAlias, undefined, type, path);
             // select the owner as virtual property when joining from 1:1 inverse side, but only if the parent is root entity
-            if (this.prop.reference === core_1.ReferenceType.ONE_TO_ONE && !parentPath.includes('.')) {
+            if (this.prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !parentPath.includes('.')) {
                 qb.addSelect(field);
             }
         }
         return this.payload;
     }
+    willAutoJoin(qb, alias) {
+        return this.shouldJoin();
+    }
     shouldJoin() {
         if (!this.parent || !this.prop) {
             return false;
         }
-        switch (this.prop.reference) {
-            case core_1.ReferenceType.ONE_TO_MANY: return true;
-            case core_1.ReferenceType.MANY_TO_MANY: return true;
-            case core_1.ReferenceType.ONE_TO_ONE: return !this.prop.owner;
+        switch (this.prop.kind) {
+            case core_1.ReferenceKind.ONE_TO_MANY: return true;
+            case core_1.ReferenceKind.MANY_TO_MANY: return true;
+            case core_1.ReferenceKind.ONE_TO_ONE: return !this.prop.owner;
             default: return false; // SCALAR, MANY_TO_ONE
         }
     }

package/query/enums.js

@@ -9,4 +9,4 @@ var QueryType;
     QueryType["INSERT"] = "INSERT";
     QueryType["UPDATE"] = "UPDATE";
     QueryType["DELETE"] = "DELETE";
-})(QueryType = exports.QueryType || (exports.QueryType = {}));
+})(QueryType || (exports.QueryType = QueryType = {}));

package/schema/DatabaseSchema.d.ts

@@ -10,14 +10,17 @@ export declare class DatabaseSchema {
     readonly name: string;
     private tables;
     private namespaces;
+    private nativeEnums;
     constructor(platform: AbstractSqlPlatform, name: string);
     addTable(name: string, schema: string | undefined | null, comment?: string): DatabaseTable;
     getTables(): DatabaseTable[];
     getTable(name: string): DatabaseTable | undefined;
     hasTable(name: string): boolean;
+    setNativeEnums(nativeEnums: Dictionary<unknown[]>): void;
+    getNativeEnums(): Dictionary<unknown[]>;
     hasNamespace(namespace: string): boolean;
     getNamespaces(): string[];
-    static create(connection: AbstractSqlConnection, platform: AbstractSqlPlatform, config: Configuration, schemaName?: string): Promise<DatabaseSchema>;
+    static create(connection: AbstractSqlConnection, platform: AbstractSqlPlatform, config: Configuration, schemaName?: string, schemas?: string[]): Promise<DatabaseSchema>;
     static fromMetadata(metadata: EntityMetadata[], platform: AbstractSqlPlatform, config: Configuration, schemaName?: string): DatabaseSchema;
     private static getSchemaName;
     private static shouldHaveColumn;

package/schema/DatabaseSchema.js

@@ -12,10 +12,12 @@ class DatabaseSchema {
         this.name = name;
         this.tables = [];
         this.namespaces = new Set();
+        this.nativeEnums = {}; // for postgres
     }
     addTable(name, schema, comment) {
         const namespaceName = schema ?? this.name;
         const table = new DatabaseTable_1.DatabaseTable(this.platform, name, namespaceName);
+        table.nativeEnums = this.nativeEnums;
         table.comment = comment;
         this.tables.push(table);
         if (namespaceName != null) {
@@ -32,24 +34,38 @@ class DatabaseSchema {
     hasTable(name) {
         return !!this.getTable(name);
     }
+    setNativeEnums(nativeEnums) {
+        this.nativeEnums = nativeEnums;
+        this.tables.forEach(t => t.nativeEnums = nativeEnums);
+    }
+    getNativeEnums() {
+        return this.nativeEnums;
+    }
     hasNamespace(namespace) {
         return this.namespaces.has(namespace);
     }
     getNamespaces() {
         return [...this.namespaces];
     }
-    static async create(connection, platform, config, schemaName) {
-        const schema = new DatabaseSchema(platform, schemaName ?? config.get('schema'));
+    static async create(connection, platform, config, schemaName, schemas) {
+        const schema = new DatabaseSchema(platform, schemaName ?? config.get('schema') ?? platform.getDefaultSchemaName());
         const allTables = await connection.execute(platform.getSchemaHelper().getListTablesSQL());
         const parts = config.get('migrations').tableName.split('.');
         const migrationsTableName = parts[1] ?? parts[0];
         const migrationsSchemaName = parts.length > 1 ? parts[0] : config.get('schema', platform.getDefaultSchemaName());
         const tables = allTables.filter(t => t.table_name !== migrationsTableName || (t.schema_name && t.schema_name !== migrationsSchemaName));
-        await platform.getSchemaHelper().loadInformationSchema(schema, connection, tables);
+        await platform.getSchemaHelper().loadInformationSchema(schema, connection, tables, schemas && schemas.length > 0 ? schemas : undefined);
         return schema;
     }
     static fromMetadata(metadata, platform, config, schemaName) {
         const schema = new DatabaseSchema(platform, schemaName ?? config.get('schema'));
+        const nativeEnums = {};
+        for (const meta of metadata) {
+            meta.props
+                .filter(prop => prop.nativeEnumName)
+                .forEach(prop => nativeEnums[prop.nativeEnumName] = prop.items?.map(val => '' + val) ?? []);
+        }
+        schema.setNativeEnums(nativeEnums);
         for (const meta of metadata) {
             const table = schema.addTable(meta.collection, this.getSchemaName(meta, config, schemaName));
             table.comment = meta.comment;
@@ -78,15 +94,15 @@ class DatabaseSchema {
         if (prop.persist === false || !prop.fieldNames) {
             return false;
         }
-        if (meta.pivotTable || (core_1.ReferenceType.EMBEDDED && prop.object)) {
+        if (meta.pivotTable || (core_1.ReferenceKind.EMBEDDED && prop.object)) {
             return true;
         }
         const getRootProperty = (prop) => prop.embedded ? getRootProperty(meta.properties[prop.embedded[0]]) : prop;
         const rootProp = getRootProperty(prop);
-        if (rootProp.reference === core_1.ReferenceType.EMBEDDED) {
+        if (rootProp.kind === core_1.ReferenceKind.EMBEDDED) {
             return prop === rootProp || !rootProp.object;
         }
-        return [core_1.ReferenceType.SCALAR, core_1.ReferenceType.MANY_TO_ONE].includes(prop.reference) || (prop.reference === core_1.ReferenceType.ONE_TO_ONE && prop.owner);
+        return [core_1.ReferenceKind.SCALAR, core_1.ReferenceKind.MANY_TO_ONE].includes(prop.kind) || (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && prop.owner);
     }
     toJSON() {
         const { platform, namespaces, ...rest } = this;

package/schema/DatabaseTable.d.ts

@@ -13,6 +13,7 @@ export declare class DatabaseTable {
     private indexes;
     private checks;
     private foreignKeys;
+    nativeEnums: Dictionary<unknown[]>;
     comment?: string;
     constructor(platform: AbstractSqlPlatform, name: string, schema?: string | undefined);
     getColumns(): Column[];
@@ -37,7 +38,7 @@ export declare class DatabaseTable {
     getPrimaryKey(): IndexDef | undefined;
     hasPrimaryKey(): boolean;
     private getPropertyDeclaration;
-    private getReferenceType;
+    private getReferenceKind;
     private getPropertyName;
     private getPropertyType;
     private getPropertyDefaultValue;