@mikro-orm/sql 7.2.0-dev.0 → 7.2.0-dev.10

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -3,6 +3,8 @@ import { SchemaHelper, stripStatementNewlines } from '../../schema/SchemaHelper.
 import { normalizePartitionBound, normalizePartitionDefinition } from '../../schema/partitioning.js';
 /** PostGIS system views that should be automatically ignored */
 const POSTGIS_VIEWS = ['geography_columns', 'geometry_columns'];
+/** Dollar-quote delimiter, e.g. `$$` or `$body$`, captured so `split` keeps it. */
+const DOLLAR_QUOTE_TAG = /(\$(?:[A-Za-z_]\w*)?\$)/;
 export class PostgreSqlSchemaHelper extends SchemaHelper {
     static DEFAULT_VALUES = {
         'now()': ['now()', 'current_timestamp'],
@@ -492,7 +494,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             // SchemaHelper.createCheck).
             const m = /^check \(\((.*)\)\)$/is.exec(check.expression);
             const single = m ? null : /^check \((.*)\)$/is.exec(check.expression);
-            const def = m ? m[1].replace(/\((.*?)\)::\w+/g, '$1') : single ? single[1] : check.expression;
+            const def = m ? m[1].replace(/\(([^()]*)\)::\w+/g, '$1') : single ? single[1] : check.expression;
             ret[key].push({
                 name: check.name,
                 columnName: check.column_name,
@@ -505,7 +507,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
     /** Generates SQL to create a PostgreSQL trigger and its associated function. */
     createTrigger(table, trigger) {
         if (trigger.expression) {
-            return trigger.expression;
+            return this.flattenDollarQuotedBodies(trigger.expression);
         }
         const timing = trigger.timing.toUpperCase();
         const events = trigger.events.map(e => e.toUpperCase()).join(' OR ');
@@ -513,7 +515,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         const when = trigger.when ? `\n  when (${trigger.when})` : '';
         const fnName = this.getSchemaQualifiedTriggerFnName(table, trigger);
         const triggerName = this.platform.quoteIdentifier(trigger.name);
-        const fnSql = `create or replace function ${fnName}() returns trigger as $$ begin ${trigger.body}; end; $$ language plpgsql`;
+        const fnSql = `create or replace function ${fnName}() returns trigger as $$ begin ${this.normalizeTriggerBody(trigger.body)} end; $$ language plpgsql`;
         const triggerSql = `create trigger ${triggerName} ${timing} ${events} on ${table.getQuotedName()} for each ${forEach}${when} execute function ${fnName}()`;
         return `${fnSql};\n${triggerSql}`;
     }
@@ -523,9 +525,24 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         const fnName = this.getSchemaQualifiedTriggerFnName(table, trigger);
         return `drop trigger if exists ${triggerName} on ${table.getQuotedName()};\ndrop function if exists ${fnName}()`;
     }
+    /** Flattens `;\n` inside the dollar-quoted blocks of a raw DDL expression, which are not statement boundaries. */
+    flattenDollarQuotedBodies(ddl) {
+        let openTag = '';
+        return ddl
+            .split(DOLLAR_QUOTE_TAG)
+            .map((part, i) => {
+            // the capture group puts the delimiters on the odd indexes
+            if (i % 2 === 1) {
+                openTag = openTag === part ? '' : openTag || part;
+                return part;
+            }
+            return openTag ? stripStatementNewlines(part) : part;
+        })
+            .join('');
+    }
     createRoutine(routine) {
         if (routine.expression) {
-            return routine.expression;
+            return this.flattenDollarQuotedBodies(routine.expression);
         }
         const qualifiedName = this.qualifiedRoutineName(routine);
         const params = this.formatRoutineParams(routine);
@@ -579,6 +596,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         )
         -- exclude trigger-helper functions; they're managed alongside their owning trigger.
         and p.prorettype <> 'trigger'::regtype
+      order by n.nspname, p.proname
     `;
         const rows = await connection.execute(sql);
         return rows.map(row => {
@@ -775,7 +793,8 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         left join pg_enum e on t.oid = e.enumtypid
         join pg_catalog.pg_namespace n on n.oid = t.typnamespace
         where t.typtype = 'e' and n.nspname in (${Array(uniqueSchemas.length).fill('?').join(', ')})
-        group by t.typname, n.nspname`, uniqueSchemas, 'all', ctx);
+        group by t.typname, n.nspname
+        order by n.nspname, t.typname`, uniqueSchemas, 'all', ctx);
         return res.reduce((o, row) => {
             let name = row.enum_name;
             if (row.schema_name && row.schema_name !== this.platform.getDefaultSchemaName()) {
@@ -1116,6 +1135,14 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         })
             .join(', ');
     }
+    /** Non-default index access methods (gin, gist, brin, hash, ...), normalized to lower case. */
+    getIndexAccessMethod(index) {
+        // `fulltext` is a cross-dialect alias handled via `getFullTextIndexExpression`, not a pg access method
+        if (typeof index.type !== 'string' || ['', 'btree', 'fulltext'].includes(index.type.toLowerCase())) {
+            return '';
+        }
+        return index.type.toLowerCase();
+    }
     /**
      * PostgreSQL-specific index options like fill factor.
      */

package/dialects/sqlite/BaseSqliteConnection.d.ts

@@ -7,4 +7,7 @@ export declare class BaseSqliteConnection extends AbstractSqlConnection {
         skipOnConnect?: boolean;
     }): Promise<void>;
     protected attachDatabases(): Promise<void>;
+    /** Per-connection state, lost whenever the underlying connection is recreated, so it has to be replayed. */
+    protected getConnectionSetupSql(): Promise<string[]>;
+    private getAttachDatabasesSql;
 }

package/dialects/sqlite/BaseSqliteConnection.js

@@ -1,5 +1,6 @@
 import { CompiledQuery } from 'kysely';
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
+const FOREIGN_KEYS_PRAGMA = 'pragma foreign_keys = on';
 export class BaseSqliteConnection extends AbstractSqlConnection {
     createKyselyDialect(options) {
         throw new Error('No SQLite dialect configured. Pass a Kysely dialect via the `driverOptions` config option, ' +
@@ -7,19 +8,28 @@ export class BaseSqliteConnection extends AbstractSqlConnection {
     }
     async connect(options) {
         await super.connect(options);
-        await this.getClient().executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
+        await this.getClient().executeQuery(CompiledQuery.raw(FOREIGN_KEYS_PRAGMA));
         await this.attachDatabases();
     }
     async attachDatabases() {
+        for (const sql of await this.getAttachDatabasesSql()) {
+            await this.execute(sql);
+        }
+    }
+    /** Per-connection state, lost whenever the underlying connection is recreated, so it has to be replayed. */
+    async getConnectionSetupSql() {
+        return [FOREIGN_KEYS_PRAGMA, ...(await this.getAttachDatabasesSql())];
+    }
+    async getAttachDatabasesSql() {
         const attachDatabases = this.config.get('attachDatabases');
         if (!attachDatabases?.length) {
-            return;
+            return [];
         }
         const { fs } = await import('@mikro-orm/core/fs-utils');
         const baseDir = this.config.get('baseDir');
-        for (const db of attachDatabases) {
+        return attachDatabases.map(db => {
             const path = fs.absolutePath(db.path, baseDir);
-            await this.execute(`attach database '${path}' as ${this.platform.quoteIdentifier(db.name)}`);
-        }
+            return `attach database '${path}' as ${this.platform.quoteIdentifier(db.name)}`;
+        });
     }
 }

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -52,7 +52,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         for (const dbName of targetSchemas) {
             const prefix = this.getSchemaPrefix(dbName);
             const tables = await connection.execute(`select name from ${prefix}sqlite_master where type = 'table' ` +
-                `and name != 'sqlite_sequence' and name != 'geometry_columns' and name != 'spatial_ref_sys'`, [], 'all', ctx);
+                `and name != 'sqlite_sequence' and name != 'geometry_columns' and name != 'spatial_ref_sys' order by name`, [], 'all', ctx);
             for (const t of tables) {
                 allTables.push({ table_name: t.name, schema_name: dbName });
             }
@@ -561,7 +561,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         for (const event of trigger.events) {
             const name = trigger.events.length > 1 ? `${trigger.name}_${event}` : trigger.name;
             const when = trigger.when ? `\n  when ${trigger.when}` : '';
-            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ${forEach}${when} begin ${trigger.body}; end`);
+            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ${forEach}${when} begin ${this.normalizeTriggerBody(trigger.body)} end`);
         }
         return ret.join(';\n');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.0-dev.0",
+  "version": "7.2.0-dev.10",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",
@@ -47,13 +47,13 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "kysely": "0.29.3"
+    "kysely": "0.29.5"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.6"
+    "@mikro-orm/core": "^7.1.11"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.0-dev.0"
+    "@mikro-orm/core": "7.2.0-dev.10"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/NativeQueryBuilder.js

@@ -308,7 +308,7 @@ export class NativeQueryBuilder {
             const fields = this.options.groupBy.map(field => this.quote(field));
             this.parts.push(`group by ${fields.join(', ')}`);
         }
-        if (this.options.having) {
+        if (this.options.having?.sql.trim()) {
             this.parts.push(`having ${this.options.having.sql}`);
             this.params.push(...this.options.having.params);
         }

package/query/QueryBuilder.d.ts

@@ -52,6 +52,12 @@ type IsNever<T, True = true, False = false> = [T] extends [never] ? True : False
 type GetAlias<T extends string> = T extends `${infer A}.${string}` ? A : never;
 type GetPropName<T extends string> = T extends `${string}.${infer P}` ? P : T;
 type AppendToHint<Parent extends string, Child extends string> = `${Parent}.${Child}`;
+/**
+ * Extracts the entity type from a query builder via its main alias. Matching against
+ * `QueryBuilder<infer T>` is unreliable once another generic, such as selected fields,
+ * differs from its default.
+ */
+type QueryBuilderEntity<Q extends QueryBuilder<any>> = Q['mainAlias'] extends Alias<infer T extends object> ? T : object;
 /**
  * Context tuple format: [Path, Alias, Type, Select]
  * - Path: The relation path from root entity (e.g., 'books', 'books.author')
@@ -85,7 +91,7 @@ type ContextRelationKeys<Context> = Context[keyof Context] extends infer Join ?
 export type QBField<Entity, RootAlias extends string, Context> = EntityRelations<Entity> | `${RootAlias}.${EntityRelations<Entity>}` | ([Context] extends [never] ? never : ContextRelationKeys<Context>);
 type ContextFieldKeys<Context> = Context[keyof Context] extends infer Join ? Join extends any ? Join extends [string, infer Alias, infer Type, any] ? `${Alias & string}.${keyof Type & string}` : never : never : never;
 type WithAlias<T extends string> = T | `${T} as ${string}`;
-export type Field<Entity, RootAlias extends string = never, Context = never> = WithAlias<EntityKey<Entity>> | (IsNever<RootAlias> extends true ? never : WithAlias<`${RootAlias}.${EntityKey<Entity>}`> | `${RootAlias}.*`) | ([Context] extends [never] ? never : WithAlias<ContextFieldKeys<Context>> | `${AliasNames<Context>}.*`) | '*' | QueryBuilder<any> | NativeQueryBuilder | RawQueryFragment<any> | (RawQueryFragment & symbol);
+export type Field<Entity, RootAlias extends string = never, Context = never> = WithAlias<EntityKey<Entity>> | (IsNever<RootAlias> extends true ? never : WithAlias<`${RootAlias}.${EntityKey<Entity>}`> | `${RootAlias}.*`) | ([Context] extends [never] ? never : WithAlias<ContextFieldKeys<Context>> | `${AliasNames<Context>}.*`) | '*' | AnyQueryBuilder | NativeQueryBuilder | RawQueryFragment<any> | (RawQueryFragment & symbol);
 type RootAliasOrderKeys<RootAlias extends string, Entity> = {
     [K in `${RootAlias}.${EntityKey<Entity>}`]?: QueryOrderKeysFlat;
 };
@@ -146,11 +152,10 @@ type ContextFilterKeys<Context> = {
 type RawFilterKeys<RawAliases extends string> = {
     [K in RawAliases]?: AliasedFilterValue;
 };
-type NestedFilterCondition<Entity, RootAlias extends string, Context, RawAliases extends string> = ObjectQuery<Entity> & (IsNever<RootAlias> extends true ? {} : string extends RootAlias ? {} : RootAliasFilterKeys<RootAlias, Entity>) & ([Context] extends [never] ? {} : ContextFilterKeys<Context>) & (IsNever<RawAliases> extends true ? {} : string extends RawAliases ? {} : RawFilterKeys<RawAliases>);
 type GroupOperators<RootAlias extends string, Context, Entity, RawAliases extends string> = {
-    $and?: NestedFilterCondition<Entity, RootAlias, Context, RawAliases>[];
-    $or?: NestedFilterCondition<Entity, RootAlias, Context, RawAliases>[];
-    $not?: NestedFilterCondition<Entity, RootAlias, Context, RawAliases>;
+    $and?: QBFilterQuery<Entity, RootAlias, Context, RawAliases>[];
+    $or?: QBFilterQuery<Entity, RootAlias, Context, RawAliases>[];
+    $not?: QBFilterQuery<Entity, RootAlias, Context, RawAliases>;
 };
 export type AliasedFilterCondition<RootAlias extends string, Context, Entity, RawAliases extends string = never> = (IsNever<RootAlias> extends true ? {} : string extends RootAlias ? {} : RootAliasFilterKeys<RootAlias, Entity>) & ([Context] extends [never] ? {} : ContextFilterKeys<Context>) & (IsNever<RawAliases> extends true ? {} : string extends RawAliases ? {} : RawFilterKeys<RawAliases>) & GroupOperators<RootAlias, Context, Entity, RawAliases>;
 export type QBFilterQuery<Entity, RootAlias extends string = never, Context = never, RawAliases extends string = never> = FilterObject<Entity> & AliasedFilterCondition<RootAlias, Context, Entity, RawAliases>;
@@ -432,29 +437,29 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      *   .where({ 'a.name': 'John' });
      * ```
      */
-    join<Field extends QBField<Entity, RootAlias, Context>, Alias extends string>(field: Field, alias: Alias, cond?: JoinCondition<JoinedEntityType<Entity, Context, Field & string>, Alias>, type?: JoinType, path?: string, schema?: string): SelectQueryBuilder<Entity, RootAlias, ModifyHint<RootAlias, Context, Hint, Field> & {}, ModifyContext<Entity, Context, Field, Alias>, RawAliases, '*', CTEs>;
+    join<Field extends QBField<Entity, RootAlias, Context>, Alias extends string>(field: Field, alias: Alias, cond?: JoinCondition<JoinedEntityType<Entity, Context, Field & string>, Alias>, type?: JoinType, path?: string, schema?: string): SelectQueryBuilder<Entity, RootAlias, ModifyHint<RootAlias, Context, Hint, Field> & {}, ModifyContext<Entity, Context, Field, Alias>, RawAliases, Fields, CTEs>;
     /**
      * Adds a JOIN clause to the query for a subquery.
      */
-    join<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, type?: JoinType, path?: string, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, '*', CTEs>;
+    join<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, type?: JoinType, path?: string, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, Fields, CTEs>;
     /**
      * Adds an INNER JOIN clause to the query for an entity relation.
      */
-    innerJoin<Field extends QBField<Entity, RootAlias, Context>, Alias extends string>(field: Field, alias: Alias, cond?: JoinCondition<JoinedEntityType<Entity, Context, Field & string>, Alias>, schema?: string): SelectQueryBuilder<Entity, RootAlias, ModifyHint<RootAlias, Context, Hint, Field> & {}, ModifyContext<Entity, Context, Field, Alias>, RawAliases, '*', CTEs>;
+    innerJoin<Field extends QBField<Entity, RootAlias, Context>, Alias extends string>(field: Field, alias: Alias, cond?: JoinCondition<JoinedEntityType<Entity, Context, Field & string>, Alias>, schema?: string): SelectQueryBuilder<Entity, RootAlias, ModifyHint<RootAlias, Context, Hint, Field> & {}, ModifyContext<Entity, Context, Field, Alias>, RawAliases, Fields, CTEs>;
     /**
      * Adds an INNER JOIN clause to the query for a subquery.
      */
-    innerJoin<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, '*', CTEs>;
-    innerJoinLateral<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, '*', CTEs>;
+    innerJoin<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, Fields, CTEs>;
+    innerJoinLateral<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, Fields, CTEs>;
     /**
      * Adds a LEFT JOIN clause to the query for an entity relation.
      */
-    leftJoin<Field extends QBField<Entity, RootAlias, Context>, Alias extends string>(field: Field, alias: Alias, cond?: JoinCondition<JoinedEntityType<Entity, Context, Field & string>, Alias>, schema?: string): SelectQueryBuilder<Entity, RootAlias, ModifyHint<RootAlias, Context, Hint, Field> & {}, ModifyContext<Entity, Context, Field, Alias>, RawAliases, '*', CTEs>;
+    leftJoin<Field extends QBField<Entity, RootAlias, Context>, Alias extends string>(field: Field, alias: Alias, cond?: JoinCondition<JoinedEntityType<Entity, Context, Field & string>, Alias>, schema?: string): SelectQueryBuilder<Entity, RootAlias, ModifyHint<RootAlias, Context, Hint, Field> & {}, ModifyContext<Entity, Context, Field, Alias>, RawAliases, Fields, CTEs>;
     /**
      * Adds a LEFT JOIN clause to the query for a subquery.
      */
-    leftJoin<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, '*', CTEs>;
-    leftJoinLateral<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, '*', CTEs>;
+    leftJoin<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, Fields, CTEs>;
+    leftJoinLateral<Alias extends string>(field: RawQueryFragment | QueryBuilder<any>, alias: Alias, cond?: RawJoinCondition, schema?: string): SelectQueryBuilder<Entity, RootAlias, Hint, ModifyContext<Entity, Context, string, Alias>, RawAliases, Fields, CTEs>;
     /**
      * Adds a JOIN clause and automatically selects the joined entity's fields.
      * This is useful for eager loading related entities.
@@ -500,6 +505,17 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * @internal
      */
     applyJoinedFilters(em: EntityManager, filterOptions: FilterOptions | undefined): Promise<void>;
+    /**
+     * The `on` clause of `condJoin` — its explicit join condition or a filter condition merged into
+     * it — can reference the alias of any join in its subtree, both auto-joins created while
+     * processing the condition and pre-existing joined paths, all of which render after `condJoin`
+     * and would be forward alias references (issues #7681, #8090, #8099). When that happens, fold the
+     * subtree into `condJoin`, so it renders as a single parenthesized join group and every alias
+     * shares the scope of the outer `on` clause.
+     */
+    private nestReferencedJoins;
+    private getJoinSubtree;
+    private condReferencesAlias;
     withSubQuery(subQuery: RawQueryFragment | NativeQueryBuilder, alias: string): this;
     /**
      * Adds a WHERE clause to the query using an object condition.
@@ -723,7 +739,9 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * Specifies FROM which entity's table select/update/delete will be executed, removing all previously set FROM-s.
      * Allows setting a main string alias of the selection data.
      */
-    from<Entity extends object>(target: QueryBuilder<Entity>, aliasName?: string): SelectQueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs>;
+    from<Entity extends object>(target: Subquery & {
+        readonly mainAlias: Alias<Entity>;
+    }, aliasName?: string): SelectQueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs>;
     /**
      * Specifies FROM which entity's table select/update/delete will be executed, removing all previously set FROM-s.
      * Allows setting a main string alias of the selection data.
@@ -733,7 +751,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * Specifies a CTE name as the FROM source, with full type safety.
      * The entity type is inferred from the CTE definition passed to `.with()`.
      */
-    from<Name extends string & keyof CTEs, Alias extends string = Name>(target: Name, aliasName?: Alias): SelectQueryBuilder<CTEs[Name], Alias, never, never, never, '*', CTEs>;
+    from<Name extends string & keyof CTEs, Alias extends string = Name>(target: Name, aliasName?: Alias): SelectQueryBuilder<CTEs[Name], Alias, never, never, never, Fields, CTEs>;
     getNativeQuery(processVirtualEntity?: boolean): NativeQueryBuilder;
     protected processReturningStatement(qb: NativeQueryBuilder, meta?: EntityMetadata, data?: Dictionary, returning?: Field<any>[]): void;
     /**
@@ -849,7 +867,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * const results = await em.find(Employee, { id: { $in: subquery } });
      * ```
      */
-    unionAll(...others: (QueryBuilder<any> | NativeQueryBuilder)[]): QueryBuilder<Entity>;
+    unionAll(...others: (QueryBuilder<any> | NativeQueryBuilder)[]): QueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs>;
     /**
      * Combines the current query with one or more other queries using `UNION` (with deduplication).
      * All queries must select the same columns. Returns a `QueryBuilder` that
@@ -864,7 +882,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * const results = await em.find(Employee, { id: { $in: subquery } });
      * ```
      */
-    union(...others: (QueryBuilder<any> | NativeQueryBuilder)[]): QueryBuilder<Entity>;
+    union(...others: (QueryBuilder<any> | NativeQueryBuilder)[]): QueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs>;
     private buildUnionQuery;
     /**
      * Adds a Common Table Expression (CTE) to the query.
@@ -879,7 +897,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      *   .from('recent_books', 'rb'); // entity type inferred as Book
      * ```
      */
-    with<Name extends string, Q extends QueryBuilder<any>>(name: Name, query: Q, options?: CteOptions): QueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs & Record<Name, Q extends QueryBuilder<infer T> ? T : object>>;
+    with<Name extends string, Q extends QueryBuilder<any>>(name: Name, query: Q, options?: CteOptions): QueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs & Record<Name, QueryBuilderEntity<Q>>>;
     /**
      * Adds a Common Table Expression (CTE) to the query using a `NativeQueryBuilder` or raw SQL fragment.
      * The CTE name is tracked but without entity type inference — use `from()` to query from it.
@@ -900,7 +918,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      *   .from('category_tree', 'ct'); // entity type inferred as Category
      * ```
      */
-    withRecursive<Name extends string, Q extends QueryBuilder<any>>(name: Name, query: Q, options?: CteOptions): QueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs & Record<Name, Q extends QueryBuilder<infer T> ? T : object>>;
+    withRecursive<Name extends string, Q extends QueryBuilder<any>>(name: Name, query: Q, options?: CteOptions): QueryBuilder<Entity, RootAlias, Hint, Context, RawAliases, Fields, CTEs & Record<Name, QueryBuilderEntity<Q>>>;
     /**
      * Adds a recursive Common Table Expression (CTE) to the query using a `NativeQueryBuilder` or raw SQL fragment.
      * The CTE name is tracked but without entity type inference — use `from()` to query from it.

package/query/QueryBuilder.js

@@ -433,6 +433,7 @@ export class QueryBuilder {
                 else {
                     join.cond = { ...cond };
                 }
+                this.nestReferencedJoins(join);
                 // For polymorphic LEFT JOIN filters, add a WHERE condition to enforce the filter
                 // only for rows matching this target's discriminator value. This ensures rows pointing
                 // to other polymorphic targets are not excluded.
@@ -456,6 +457,45 @@ export class QueryBuilder {
             }
         }
     }
+    /**
+     * The `on` clause of `condJoin` — its explicit join condition or a filter condition merged into
+     * it — can reference the alias of any join in its subtree, both auto-joins created while
+     * processing the condition and pre-existing joined paths, all of which render after `condJoin`
+     * and would be forward alias references (issues #7681, #8090, #8099). When that happens, fold the
+     * subtree into `condJoin`, so it renders as a single parenthesized join group and every alias
+     * shares the scope of the outer `on` clause.
+     */
+    nestReferencedJoins(condJoin) {
+        // m:n pivot joins might not have the target join entry created
+        if (!condJoin) {
+            return;
+        }
+        const subtree = this.getJoinSubtree(condJoin);
+        if (!subtree.some(j => this.condReferencesAlias(condJoin.cond, j.alias))) {
+            return;
+        }
+        for (const j of subtree) {
+            const parent = j.ownerAlias === condJoin.alias ? condJoin : subtree.find(p => p.alias === j.ownerAlias);
+            if (!parent.nested?.has(j)) {
+                const nested = (parent.nested ??= new Set());
+                j.type = j.type === JoinType.innerJoin ? JoinType.nestedInnerJoin : JoinType.nestedLeftJoin;
+                nested.add(j);
+            }
+        }
+    }
+    getJoinSubtree(join) {
+        const children = Object.values(this.#state.joins).filter(j => j !== join && j.ownerAlias === join.alias);
+        return children.flatMap(j => [j, ...this.getJoinSubtree(j)]);
+    }
+    condReferencesAlias(cond, alias) {
+        if (Array.isArray(cond)) {
+            return cond.some(c => this.condReferencesAlias(c, alias));
+        }
+        if (Utils.isPlainObject(cond)) {
+            return Object.entries(cond).some(([key, value]) => key.startsWith(`${alias}.`) || this.condReferencesAlias(value, alias));
+        }
+        return false;
+    }
     withSubQuery(subQuery, alias) {
         this.ensureNotFinalized();
         if (isRaw(subQuery)) {
@@ -782,7 +822,9 @@ export class QueryBuilder {
             this.fromRawTable(target, aliasName);
         }
         else {
-            if (aliasName && this.#state.mainAlias && Utils.className(target) !== this.#state.mainAlias.aliasName) {
+            if (aliasName &&
+                this.#state.mainAlias &&
+                Utils.className(target) !== this.#state.mainAlias.aliasName) {
                 throw new Error(`Cannot override the alias to '${aliasName}' since a query already contains references to '${this.#state.mainAlias.aliasName}'`);
             }
             this.fromEntityName(target, aliasName);
@@ -1102,7 +1144,9 @@ export class QueryBuilder {
         }
         if (stack.length > 0) {
             const merged = this.driver.mergeJoinedResult(stack, this.mainAlias.meta, joinedProps);
-            yield this.mapResult(merged[0], options.mapResults);
+            for (const row of merged) {
+                yield this.mapResult(row, options.mapResults);
+            }
         }
     }
     /**
@@ -1410,7 +1454,6 @@ export class QueryBuilder {
             aliased: [QueryType.SELECT, QueryType.COUNT].includes(this.type),
         });
         const criteriaNode = CriteriaNodeFactory.createNode(this.metadata, prop.targetMeta.class, cond);
-        const joinCountBefore = Object.keys(this.#state.joins).length;
         cond = criteriaNode.process(this, { ignoreBranching: true, alias });
         let aliasedName = `${fromAlias}.${prop.name}#${alias}`;
         path ??= `${Object.values(this.#state.joins).find(j => j.alias === fromAlias)?.path ?? Utils.className(entityName)}.${prop.name}`;
@@ -1440,20 +1483,7 @@ export class QueryBuilder {
             this.#state.joins[aliasedName] = this.helper.joinManyToOneReference(prop, ownerAlias, alias, type, cond, schema);
             this.#state.joins[aliasedName].path ??= path;
         }
-        // auto-joins added by cond processing that depend on the new alias would otherwise produce a
-        // forward reference (the auto-join's ON refers to alias, while alias's ON refers back to it);
-        // fold them into the new join so both aliases share scope in the outer ON clause (issue #7681)
-        const condJoin = this.#state.joins[aliasedName];
-        const joinKeys = Object.keys(this.#state.joins);
-        for (let i = joinCountBefore; i < joinKeys.length; i++) {
-            const j = this.#state.joins[joinKeys[i]];
-            if (j === condJoin || j.ownerAlias !== alias) {
-                continue;
-            }
-            const nested = (condJoin.nested ??= new Set());
-            j.type = j.type === JoinType.innerJoin ? JoinType.nestedInnerJoin : JoinType.nestedLeftJoin;
-            nested.add(j);
-        }
+        this.nestReferencedJoins(this.#state.joins[aliasedName]);
         return { prop, key: aliasedName };
     }
     prepareFields(fields, type = 'where', schema) {

package/query/QueryBuilderHelper.js

@@ -414,7 +414,8 @@ export class QueryBuilderHelper {
             }
             if (k === '$not') {
                 const res = this._appendQueryCondition(type, cond[k]);
-                parts.push(`not (${res.sql})`);
+                // negating a vacuously true condition (e.g. an empty `$and`) matches nothing
+                parts.push(res.sql ? `not (${res.sql})` : '1 = 0');
                 res.params.forEach(p => params.push(p));
                 continue;
             }
@@ -785,6 +786,10 @@ export class QueryBuilderHelper {
     appendGroupCondition(type, operator, subCondition) {
         const parts = [];
         const params = [];
+        // an empty disjunction is false, same as `$in: []`, while an empty conjunction is vacuously true
+        if (operator === '$or' && subCondition.length === 0) {
+            return { sql: '1 = 0', params };
+        }
         // single sub-condition can be ignored to reduce nesting of parens
         if (subCondition.length === 1 || operator === '$and') {
             for (const sub of subCondition) {

package/schema/DatabaseTable.d.ts

@@ -49,6 +49,8 @@ export declare class DatabaseTable {
     getEntityDeclaration(namingStrategy: NamingStrategy, schemaHelper: SchemaHelper, scalarPropertiesForRelations: 'always' | 'never' | 'smart'): EntityMetadata;
     private foreignKeysToProps;
     private findFkIndex;
+    /** Advanced options require an entity-level declaration, as the property-level `index`/`unique` cannot carry them. */
+    private hasAdvancedIndexOptions;
     private getIndexProperties;
     private getSafeBaseNameForFkProp;
     /**