@zenstackhq/orm 3.0.0-beta.31 → 3.0.0-beta.33

package/dist/index.cjs

@@ -432,15 +432,16 @@ function getManyToManyRelation(schema, model, field) {
   if (!fieldDef.array || !fieldDef.relation?.opposite) {
     return void 0;
   }
+  const realModel = fieldDef.originModel ?? model;
   const oppositeFieldDef = requireField(schema, fieldDef.type, fieldDef.relation.opposite);
   if (oppositeFieldDef.array) {
     const sortedModelNames = [
-      model,
+      realModel,
       fieldDef.type
     ].sort();
     let orderedFK;
-    if (model !== fieldDef.type) {
-      orderedFK = sortedModelNames[0] === model ? [
+    if (realModel !== fieldDef.type) {
+      orderedFK = sortedModelNames[0] === realModel ? [
         "A",
         "B"
       ] : [
@@ -460,7 +461,7 @@ function getManyToManyRelation(schema, model, field) {
         "A"
       ];
     }
-    const modelIdFields = requireIdFields(schema, model);
+    const modelIdFields = requireIdFields(schema, realModel);
     (0, import_common_helpers.invariant)(modelIdFields.length === 1, "Only single-field ID is supported for many-to-many relation");
     const otherIdFields = requireIdFields(schema, fieldDef.type);
     (0, import_common_helpers.invariant)(otherIdFields.length === 1, "Only single-field ID is supported for many-to-many relation");
@@ -6360,7 +6361,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends import_kysely7.
           parameters
         };
       }
-      return connection.executeQuery(compiled);
+      return this.internalExecuteQuery(connection, compiled);
     }
     if ((import_kysely7.InsertQueryNode.is(query) || import_kysely7.UpdateQueryNode.is(query)) && this.hasEntityMutationPluginsWithAfterMutationHooks) {
       query = {
@@ -6389,7 +6390,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends import_kysely7.
       return beforeMutationEntities;
     }, "loadBeforeMutationEntities");
     await this.callBeforeMutationHooks(finalQuery, mutationInfo, loadBeforeMutationEntities, connectionClient, queryId);
-    const result = await connection.executeQuery(compiled);
+    const result = await this.internalExecuteQuery(connection, compiled);
     if (!this.driver.isTransactionConnection(connection)) {
       await this.callAfterMutationHooks(result, finalQuery, mutationInfo, connectionClient, "all", queryId);
     } else {
@@ -6526,7 +6527,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends import_kysely7.
       where: this.andNodes(selectQueryNode.where, where)
     };
     const compiled = this.compileQuery(selectQueryNode, (0, import_kysely7.createQueryId)());
-    const result = await connection.executeQuery(compiled);
+    const result = await this.internalExecuteQuery(connection, compiled);
     return result.rows;
   }
   andNodes(condition1, condition2) {
@@ -6538,6 +6539,13 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends import_kysely7.
       return condition2;
     }
   }
+  async internalExecuteQuery(connection, compiledQuery) {
+    try {
+      return await connection.executeQuery(compiledQuery);
+    } catch (err) {
+      throw createDBQueryError("Failed to execute query", err, compiledQuery.sql, compiledQuery.parameters);
+    }
+  }
 };
 
 // src/client/functions.ts