@mikro-orm/sql 7.2.7-dev.7 → 7.2.7-dev.8

package/dialects/sqlite/SqlitePlatform.d.ts

@@ -1,4 +1,4 @@
-import { type EntityProperty, type IsolationLevel } from '@mikro-orm/core';
+import { type EntityMetadata, type EntityProperty, type IsolationLevel } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '../../AbstractSqlPlatform.js';
 import { SqliteNativeQueryBuilder } from './SqliteNativeQueryBuilder.js';
 import { SqliteSchemaHelper } from './SqliteSchemaHelper.js';
@@ -74,6 +74,7 @@ export declare class SqlitePlatform extends AbstractSqlPlatform {
      */
     supportsSchemas(): boolean;
     getDefaultSchemaName(): string | undefined;
+    validateMetadata(meta: EntityMetadata): void;
     getFullTextWhereClause(): string;
     escape(value: any): string;
     convertVersionValue(value: Date | number, prop: EntityProperty): number | {

package/dialects/sqlite/SqlitePlatform.js

@@ -1,3 +1,4 @@
+import { MetadataError } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '../../AbstractSqlPlatform.js';
 import { SqliteNativeQueryBuilder } from './SqliteNativeQueryBuilder.js';
 import { SqliteSchemaHelper } from './SqliteSchemaHelper.js';
@@ -110,6 +111,14 @@ export class SqlitePlatform extends AbstractSqlPlatform {
         // Return 'main' only when schema support is active (i.e., databases are attached)
         return this.supportsSchemas() ? 'main' : undefined;
     }
+    validateMetadata(meta) {
+        super.validateMetadata(meta);
+        // `main` always exists and `*` resolves at runtime; anything else fails later as `unknown database` unless attached
+        const attached = this.config.get('attachDatabases')?.some(db => db.name === meta.schema);
+        if (meta.schema && !['main', '*'].includes(meta.schema) && !attached) {
+            throw new MetadataError(`Entity ${meta.className} declares schema '${meta.schema}', but SQLite cannot address it: attach it via \`attachDatabases\` or remove the schema in \`discovery.onMetadata\` when sharing entities between drivers`);
+        }
+    }
     getFullTextWhereClause() {
         return `:column: match :query`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.2.7-dev.7",
+  "version": "7.2.7-dev.8",
   "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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.2.6"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.7-dev.7"
+    "@mikro-orm/core": "7.2.7-dev.8"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.d.ts

@@ -821,6 +821,7 @@ export declare class QueryBuilder<Entity extends object = AnyEntity, RootAlias e
      * ```
      */
     stream(options?: QBStreamOptions): AsyncIterableIterator<Loaded<Entity, Hint, Fields>>;
+    private convertStreamExceptions;
     /**
      * Alias for `qb.getResultList()`
      */

package/query/QueryBuilder.js

@@ -1080,12 +1080,19 @@ export class QueryBuilder {
         const conn = this.getConnection();
         // outside a transaction, wrap in a short implicit one so RLS `set local` session context applies (no-op when unset)
         const sessionContext = this.context ? undefined : this.em?.getTransactionSessionContext();
-        const res = await (sessionContext
-            ? conn.transactional(trx => conn.execute(query.sql, query.params, method, trx, loggerContext), {
-                sessionContext,
-                loggerContext,
-            })
-            : conn.execute(query.sql, query.params, method, this.context, loggerContext));
+        let res;
+        // a QueryBuilder used directly must honour the same `convertException` contract as the driver methods
+        try {
+            res = await (sessionContext
+                ? conn.transactional(trx => conn.execute(query.sql, query.params, method, trx, loggerContext), {
+                    sessionContext,
+                    loggerContext,
+                })
+                : conn.execute(query.sql, query.params, method, this.context, loggerContext));
+        }
+        catch (e) {
+            throw this.driver.convertException(e);
+        }
         const meta = this.mainAlias.meta;
         if (!options.mapResults || !meta) {
             await this.em?.storeCache(this.#state.cache, cached, res);
@@ -1146,7 +1153,7 @@ export class QueryBuilder {
         const chunkSize = options.chunkSize ?? 100;
         const query = this.toQuery();
         const loggerContext = { id: this.em?.id, ...this.loggerContext, ...this.#abortOptions };
-        const res = this.getConnection().stream(query.sql, query.params, this.context, loggerContext, chunkSize);
+        const res = this.convertStreamExceptions(this.getConnection().stream(query.sql, query.params, this.context, loggerContext, chunkSize));
         const meta = this.mainAlias.meta;
         if (options.rawResults || !meta) {
             yield* res;
@@ -1180,6 +1187,14 @@ export class QueryBuilder {
             }
         }
     }
+    async *convertStreamExceptions(res) {
+        try {
+            yield* res;
+        }
+        catch (e) {
+            throw this.driver.convertException(e);
+        }
+    }
     /**
      * Alias for `qb.getResultList()`
      */