metal-orm 1.0.86 → 1.0.87

package/dist/index.cjs

@@ -6446,9 +6446,9 @@ var flattenResults = (results) => {
   }
   return rows;
 };
-var executeWithContexts = async (execCtx, entityCtx, qb, options) => {
+var executeWithContexts = async (execCtx, entityCtx, qb) => {
   const ast = qb.getAST();
-  const compiled = options?.allowParamOperands ? execCtx.dialect.compileSelectWithOptions(ast, { allowParams: true }) : execCtx.dialect.compileSelect(ast);
+  const compiled = execCtx.dialect.compileSelect(ast);
   const executed = await execCtx.interceptors.run({ sql: compiled.sql, params: compiled.params }, execCtx.executor);
   const rows = flattenResults(executed);
   const lazyRelations = qb.getLazyRelations();
@@ -6466,9 +6466,9 @@ var executeWithContexts = async (execCtx, entityCtx, qb, options) => {
   await preloadRelationIncludes(entities, includeTree);
   return entities;
 };
-var executePlainWithContexts = async (execCtx, qb, options) => {
+var executePlainWithContexts = async (execCtx, qb) => {
   const ast = qb.getAST();
-  const compiled = options?.allowParamOperands ? execCtx.dialect.compileSelectWithOptions(ast, { allowParams: true }) : execCtx.dialect.compileSelect(ast);
+  const compiled = execCtx.dialect.compileSelect(ast);
   const executed = await execCtx.interceptors.run({ sql: compiled.sql, params: compiled.params }, execCtx.executor);
   const rows = flattenResults(executed);
   if (ast.setOps && ast.setOps.length > 0) {
@@ -6476,21 +6476,21 @@ var executePlainWithContexts = async (execCtx, qb, options) => {
   }
   return hydrateRows(rows, qb.getHydrationPlan());
 };
-async function executeHydrated(session, qb, options) {
-  return executeWithContexts(session.getExecutionContext(), session, qb, options);
+async function executeHydrated(session, qb) {
+  return executeWithContexts(session.getExecutionContext(), session, qb);
 }
-async function executeHydratedPlain(session, qb, options) {
-  return executePlainWithContexts(session.getExecutionContext(), qb, options);
+async function executeHydratedPlain(session, qb) {
+  return executePlainWithContexts(session.getExecutionContext(), qb);
 }
-async function executeHydratedWithContexts(execCtx, hydCtx, qb, options) {
+async function executeHydratedWithContexts(execCtx, hydCtx, qb) {
   const entityCtx = hydCtx.entityContext;
   if (!entityCtx) {
     throw new Error("Hydration context is missing an EntityContext");
   }
-  return executeWithContexts(execCtx, entityCtx, qb, options);
+  return executeWithContexts(execCtx, entityCtx, qb);
 }
-async function executeHydratedPlainWithContexts(execCtx, qb, options) {
-  return executePlainWithContexts(execCtx, qb, options);
+async function executeHydratedPlainWithContexts(execCtx, qb) {
+  return executePlainWithContexts(execCtx, qb);
 }
 var loadLazyRelationsForTable = async (ctx, table, lazyRelations, lazyRelationOptions) => {
   if (!lazyRelations.length) return;
@@ -6691,7 +6691,7 @@ function applyOrderBy(context, predicateFacet, term, directionOrOptions) {
   const dir = options.direction ?? ORDER_DIRECTIONS.ASC;
   return predicateFacet.orderBy(context, term, dir, options.nulls, options.collation);
 }
-async function executeCount(context, env, session, options) {
+async function executeCount(context, env, session) {
   const unpagedAst = {
     ...context.state.ast,
     orderBy: void 0,
@@ -6711,7 +6711,7 @@ async function executeCount(context, env, session, options) {
     joins: []
   };
   const execCtx = session.getExecutionContext();
-  const compiled = options?.allowParamOperands ? execCtx.dialect.compileSelectWithOptions(countQuery, { allowParams: true }) : execCtx.dialect.compileSelect(countQuery);
+  const compiled = execCtx.dialect.compileSelect(countQuery);
   const results = await execCtx.interceptors.run({ sql: compiled.sql, params: compiled.params }, execCtx.executor);
   const value = results[0]?.values?.[0]?.[0];
   if (typeof value === "number") return value;
@@ -6719,7 +6719,7 @@ async function executeCount(context, env, session, options) {
   if (typeof value === "string") return Number(value);
   return value === null || value === void 0 ? 0 : Number(value);
 }
-async function executePagedQuery(builder, session, options, countCallback, paramOptions) {
+async function executePagedQuery(builder, session, options, countCallback) {
   const { page, pageSize } = options;
   if (!Number.isInteger(page) || page < 1) {
     throw new Error("executePaged: page must be an integer >= 1");
@@ -6729,7 +6729,7 @@ async function executePagedQuery(builder, session, options, countCallback, param
   }
   const offset = (page - 1) * pageSize;
   const totalItems = await countCallback(session);
-  const items = await builder.limit(pageSize).offset(offset).execute(session, paramOptions);
+  const items = await builder.limit(pageSize).offset(offset).execute(session);
   return { items, totalItems, page, pageSize };
 }
 function buildWhereHasPredicate(env, context, relationFacet, createChildBuilder, relationName, callbackOrOptions, maybeOptions, negate = false) {
@@ -8520,8 +8520,7 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * Validates that the query does not contain Param operands.
    * Param proxies are only for schema generation, not execution.
    */
-  validateNoParamOperands(options) {
-    if (options?.allowParamOperands) return;
+  validateNoParamOperands() {
     const ast = this.context.hydration.applyToAst(this.context.state.ast);
     const paramName = findFirstParamOperandName(ast);
     if (paramName) {
@@ -8540,13 +8539,13 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * // users is User[]
    * users[0] instanceof User; // true
    */
-  async execute(ctx, options) {
-    this.validateNoParamOperands(options);
+  async execute(ctx) {
+    this.validateNoParamOperands();
     if (this.entityConstructor) {
-      return this.executeAs(this.entityConstructor, ctx, options);
+      return this.executeAs(this.entityConstructor, ctx);
     }
     const builder = this.ensureDefaultSelection();
-    return executeHydrated(ctx, builder, options);
+    return executeHydrated(ctx, builder);
   }
   /**
    * Executes the query and returns plain row objects (POJOs), ignoring any entity materialization.
@@ -8559,10 +8558,10 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * // rows is EntityInstance<UserTable>[] (plain objects)
    * rows[0] instanceof User; // false
    */
-  async executePlain(ctx, options) {
-    this.validateNoParamOperands(options);
+  async executePlain(ctx) {
+    this.validateNoParamOperands();
     const builder = this.ensureDefaultSelection();
-    const rows = await executeHydratedPlain(ctx, builder, options);
+    const rows = await executeHydratedPlain(ctx, builder);
     return rows;
   }
   /**
@@ -8579,10 +8578,10 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * users[0] instanceof User; // true!
    * users[0].getFullName();   // works!
    */
-  async executeAs(entityClass, ctx, options) {
-    this.validateNoParamOperands(options);
+  async executeAs(entityClass, ctx) {
+    this.validateNoParamOperands();
     const builder = this.ensureDefaultSelection();
-    const results = await executeHydrated(ctx, builder, options);
+    const results = await executeHydrated(ctx, builder);
     return materializeAs(entityClass, results);
   }
   /**
@@ -8591,9 +8590,9 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * @example
    * const total = await qb.count(session);
    */
-  async count(session, options) {
-    this.validateNoParamOperands(options);
-    return executeCount(this.context, this.env, session, options);
+  async count(session) {
+    this.validateNoParamOperands();
+    return executeCount(this.context, this.env, session);
   }
   /**
    * Executes the query and returns both the paged items and the total.
@@ -8602,9 +8601,9 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * const { items, totalItems, page, pageSize } = await qb.executePaged(session, { page: 1, pageSize: 20 });
    */
   async executePaged(session, options) {
-    this.validateNoParamOperands(options);
+    this.validateNoParamOperands();
     const builder = this.ensureDefaultSelection();
-    return executePagedQuery(builder, session, options, (sess) => builder.count(sess, options), options);
+    return executePagedQuery(builder, session, options, (sess) => builder.count(sess));
   }
   /**
    * Executes the query with provided execution and hydration contexts
@@ -8616,10 +8615,10 @@ var SelectQueryBuilder = class _SelectQueryBuilder {
    * const hydCtx = new HydrationContext();
    * const users = await qb.executeWithContexts(execCtx, hydCtx);
    */
-  async executeWithContexts(execCtx, hydCtx, options) {
-    this.validateNoParamOperands(options);
+  async executeWithContexts(execCtx, hydCtx) {
+    this.validateNoParamOperands();
     const builder = this.ensureDefaultSelection();
-    const results = await executeHydratedWithContexts(execCtx, hydCtx, builder, options);
+    const results = await executeHydratedWithContexts(execCtx, hydCtx, builder);
     if (this.entityConstructor) {
       return materializeAs(this.entityConstructor, results);
     }