workers-qb 1.13.0 → 1.14.0

package/dist/index.js

@@ -122,8 +122,9 @@ var QueryBuilderError = class _QueryBuilderError extends Error {
   Hint: ${options.hint}`;
     }
     this.message = enhancedMessage;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, _QueryBuilderError);
+    const ErrorWithCapture = Error;
+    if (ErrorWithCapture.captureStackTrace) {
+      ErrorWithCapture.captureStackTrace(this, _QueryBuilderError);
     }
   }
 };
@@ -375,7 +376,13 @@ var SelectBuilder = class _SelectBuilder {
       let builtCondition = conditionParts[0] ?? "";
       for (let j = 0; j < conditionParts.length - 1; j++) {
         if (paramIndex >= currentInputParams.length) {
-          throw new Error('Mismatch between "?" placeholders and parameters in where clause.');
+          const totalPlaceholders = currentInputConditions.join(" AND ").split("?").length - 1;
+          throw new ParameterMismatchError({
+            clause: "WHERE",
+            query: currentInputConditions.join(" AND "),
+            expectedParams: totalPlaceholders,
+            receivedParams: currentInputParams.length
+          });
         }
         const currentParam = currentInputParams[paramIndex++];
         const isSubQuery = typeof currentParam === "object" && currentParam !== null && ("tableName" in currentParam || "getOptions" in currentParam) && !currentParam.hasOwnProperty("_raw") || currentParam instanceof _SelectBuilder;
@@ -394,7 +401,13 @@ var SelectBuilder = class _SelectBuilder {
       processedNewConditions.push(builtCondition);
     }
     if (paramIndex < currentInputParams.length) {
-      throw new Error('Too many parameters provided for the given "?" placeholders in where clause.');
+      const totalPlaceholders = currentInputConditions.join(" AND ").split("?").length - 1;
+      throw new ParameterMismatchError({
+        clause: "WHERE",
+        query: currentInputConditions.join(" AND "),
+        expectedParams: totalPlaceholders,
+        receivedParams: currentInputParams.length
+      });
     }
     return new _SelectBuilder(
       {
@@ -410,6 +423,62 @@ var SelectBuilder = class _SelectBuilder {
       this._fetchOne
     );
   }
+  /**
+   * Add an OR WHERE condition to the query.
+   * All previously added WHERE conditions are grouped together and ORed with the new condition.
+   * Subsequent `.where()` calls after `.orWhere()` are ANDed as independent conditions.
+   *
+   * @param conditions - The SQL condition string(s) (can use ? placeholders)
+   * @param params - The parameter(s) to bind to the ? placeholders
+   *
+   * @example
+   * // Simple OR condition
+   * qb.select('users').where('status = ?', 'active').orWhere('status = ?', 'pending').execute()
+   * // SELECT * FROM users WHERE (status = ?) OR (status = ?)
+   *
+   * @example
+   * // Multiple where conditions ORed together
+   * qb.select('users')
+   *   .where('tenant_id = ?', 1)
+   *   .where('status = ?', 'active')
+   *   .orWhere('role = ?', 'superadmin')
+   *   .execute()
+   * // SELECT * FROM users WHERE ((tenant_id = ?) AND (status = ?)) OR (role = ?)
+   */
+  orWhere(conditions, params) {
+    const existingConditions = this._options.where && typeof this._options.where === "object" && "conditions" in this._options.where ? this._options.where.conditions : [];
+    const existingParams = this._options.where && typeof this._options.where === "object" && "params" in this._options.where && this._options.where.params ? Array.isArray(this._options.where.params) ? this._options.where.params : [this._options.where.params] : [];
+    if (existingConditions.length === 0) {
+      return this.where(conditions, params);
+    }
+    const clearedBuilder = new _SelectBuilder(
+      {
+        ...this._options,
+        where: void 0
+      },
+      this._fetchAll,
+      this._fetchOne
+    );
+    const processedBuilder = clearedBuilder.where(conditions, params);
+    const processedWhere = processedBuilder._options.where;
+    const newConditions = processedWhere && typeof processedWhere === "object" && "conditions" in processedWhere ? processedWhere.conditions : [];
+    const newParams = processedWhere && typeof processedWhere === "object" && "params" in processedWhere && processedWhere.params ? Array.isArray(processedWhere.params) ? processedWhere.params : [processedWhere.params] : [];
+    const existingCombined = existingConditions.length === 1 ? existingConditions[0] : `(${existingConditions.join(") AND (")})`;
+    const newCombined = newConditions.length === 1 ? newConditions[0] : `(${newConditions.join(") AND (")})`;
+    const orCondition = `(${existingCombined}) OR (${newCombined})`;
+    return new _SelectBuilder(
+      {
+        // Spread processedBuilder._options to pick up any new subQueryPlaceholders/TokenNextId
+        ...processedBuilder._options,
+        where: {
+          conditions: [orCondition],
+          params: [...existingParams, ...newParams]
+        }
+      },
+      this._fetchAll,
+      this._fetchOne
+    );
+  }
   whereIn(fields, values) {
     let whereInCondition;
     let whereInParams;
@@ -438,6 +507,229 @@ var SelectBuilder = class _SelectBuilder {
     }
     return this.where(whereInCondition, whereInParams);
   }
+  /**
+   * Conditionally apply query modifications based on a runtime value.
+   * If condition is truthy, the callback is invoked with the current builder
+   * and its return value is used. If condition is falsy and an otherwise callback
+   * is provided, it is invoked instead. Otherwise, the builder is returned unchanged.
+   *
+   * @param condition - A value to check for truthiness
+   * @param callback - Function that receives the builder and returns a modified builder
+   * @param otherwise - Optional function applied when condition is falsy
+   *
+   * @example
+   * qb.select('users')
+   *   .when(nameFilter, q => q.where('name LIKE ?', [`%${nameFilter}%`]))
+   *   .when(sortByDate, q => q.orderBy({ created_at: 'DESC' }))
+   *   .execute()
+   *
+   * @example
+   * // With otherwise callback
+   * qb.select('products')
+   *   .when(
+   *     inStock,
+   *     q => q.where('stock > ?', 0),
+   *     q => q.where('stock = ?', 0)
+   *   )
+   *   .execute()
+   */
+  when(condition, callback, otherwise) {
+    if (condition) {
+      return callback(this);
+    }
+    if (otherwise) {
+      return otherwise(this);
+    }
+    return this;
+  }
+  /**
+   * Add a WHERE column IS NULL condition.
+   *
+   * @param column - The column name to check for NULL
+   *
+   * @example
+   * qb.select('users').whereNull('deleted_at').execute()
+   * // SELECT * FROM users WHERE deleted_at IS NULL
+   */
+  whereNull(column) {
+    return this.where(`${column} IS NULL`);
+  }
+  /**
+   * Add a WHERE column IS NOT NULL condition.
+   *
+   * @param column - The column name to check for NOT NULL
+   *
+   * @example
+   * qb.select('users').whereNotNull('email_verified_at').execute()
+   * // SELECT * FROM users WHERE email_verified_at IS NOT NULL
+   */
+  whereNotNull(column) {
+    return this.where(`${column} IS NOT NULL`);
+  }
+  /**
+   * Add a WHERE column BETWEEN min AND max condition.
+   *
+   * @param column - The column name
+   * @param range - Tuple of [min, max] values
+   *
+   * @example
+   * qb.select('products').whereBetween('price', [10, 100]).execute()
+   * // SELECT * FROM products WHERE price BETWEEN ? AND ?
+   */
+  whereBetween(column, range) {
+    return this.where(`${column} BETWEEN ? AND ?`, [range[0], range[1]]);
+  }
+  /**
+   * Add a WHERE column NOT BETWEEN min AND max condition.
+   *
+   * @param column - The column name
+   * @param range - Tuple of [min, max] values
+   *
+   * @example
+   * qb.select('products').whereNotBetween('price', [10, 100]).execute()
+   * // SELECT * FROM products WHERE price NOT BETWEEN ? AND ?
+   */
+  whereNotBetween(column, range) {
+    return this.where(`${column} NOT BETWEEN ? AND ?`, [range[0], range[1]]);
+  }
+  /**
+   * Add an OR WHERE column IS NULL condition.
+   *
+   * @param column - The column name to check for NULL
+   *
+   * @example
+   * qb.select('users').where('active = ?', true).orWhereNull('deleted_at').execute()
+   * // SELECT * FROM users WHERE (active = ?) OR (deleted_at IS NULL)
+   */
+  orWhereNull(column) {
+    return this.orWhere(`${column} IS NULL`);
+  }
+  /**
+   * Add an OR WHERE column IS NOT NULL condition.
+   *
+   * @param column - The column name to check for NOT NULL
+   *
+   * @example
+   * qb.select('users').whereNull('deleted_at').orWhereNotNull('verified_at').execute()
+   * // SELECT * FROM users WHERE (deleted_at IS NULL) OR (verified_at IS NOT NULL)
+   */
+  orWhereNotNull(column) {
+    return this.orWhere(`${column} IS NOT NULL`);
+  }
+  /**
+   * Add an OR WHERE column BETWEEN min AND max condition.
+   *
+   * @param column - The column name
+   * @param range - Tuple of [min, max] values
+   *
+   * @example
+   * qb.select('products').where('active = ?', true).orWhereBetween('price', [10, 100]).execute()
+   * // SELECT * FROM products WHERE (active = ?) OR (price BETWEEN ? AND ?)
+   */
+  orWhereBetween(column, range) {
+    return this.orWhere(`${column} BETWEEN ? AND ?`, [range[0], range[1]]);
+  }
+  /**
+   * Add an OR WHERE column NOT BETWEEN min AND max condition.
+   *
+   * @param column - The column name
+   * @param range - Tuple of [min, max] values
+   *
+   * @example
+   * qb.select('products').where('featured = ?', true).orWhereNotBetween('price', [10, 100]).execute()
+   * // SELECT * FROM products WHERE (featured = ?) OR (price NOT BETWEEN ? AND ?)
+   */
+  orWhereNotBetween(column, range) {
+    return this.orWhere(`${column} NOT BETWEEN ? AND ?`, [range[0], range[1]]);
+  }
+  /**
+   * Add a WHERE column LIKE pattern condition.
+   *
+   * @param column - The column name
+   * @param pattern - The LIKE pattern (e.g., '%search%')
+   *
+   * @example
+   * qb.select('users').whereLike('name', '%john%').execute()
+   * // SELECT * FROM users WHERE name LIKE ?
+   */
+  whereLike(column, pattern) {
+    return this.where(`${column} LIKE ?`, [pattern]);
+  }
+  /**
+   * Add a WHERE column NOT LIKE pattern condition.
+   *
+   * @param column - The column name
+   * @param pattern - The LIKE pattern
+   *
+   * @example
+   * qb.select('users').whereNotLike('email', '%@spam.com').execute()
+   * // SELECT * FROM users WHERE email NOT LIKE ?
+   */
+  whereNotLike(column, pattern) {
+    return this.where(`${column} NOT LIKE ?`, [pattern]);
+  }
+  /**
+   * Add an OR WHERE column LIKE pattern condition.
+   *
+   * @param column - The column name
+   * @param pattern - The LIKE pattern (e.g., '%search%')
+   *
+   * @example
+   * qb.select('users').whereLike('name', '%john%').orWhereLike('email', '%john%').execute()
+   * // SELECT * FROM users WHERE (name LIKE ?) OR (email LIKE ?)
+   */
+  orWhereLike(column, pattern) {
+    return this.orWhere(`${column} LIKE ?`, [pattern]);
+  }
+  /**
+   * Add an OR WHERE column NOT LIKE pattern condition.
+   *
+   * @param column - The column name
+   * @param pattern - The LIKE pattern
+   *
+   * @example
+   * qb.select('users').where('active = ?', true).orWhereNotLike('email', '%@spam.com').execute()
+   * // SELECT * FROM users WHERE (active = ?) OR (email NOT LIKE ?)
+   */
+  orWhereNotLike(column, pattern) {
+    return this.orWhere(`${column} NOT LIKE ?`, [pattern]);
+  }
+  /**
+   * Add a WHERE column NOT IN (values) condition.
+   *
+   * @param fields - Column name(s) to check
+   * @param values - Values to exclude
+   *
+   * @example
+   * qb.select('users').whereNotIn('status', ['banned', 'suspended']).execute()
+   * // SELECT * FROM users WHERE (status) NOT IN (VALUES (?), (?))
+   */
+  whereNotIn(fields, values) {
+    let whereNotInCondition;
+    let whereNotInParams;
+    const separateWithComma = (prev, next) => prev + ", " + next;
+    if (values.length === 0) {
+      return new _SelectBuilder(
+        { ...this._options },
+        this._fetchAll,
+        this._fetchOne
+      );
+    }
+    if (!Array.isArray(fields)) {
+      whereNotInCondition = `(${fields}) NOT IN (VALUES `;
+      whereNotInCondition += values.map(() => "(?)").reduce(separateWithComma);
+      whereNotInCondition += ")";
+      whereNotInParams = values;
+    } else {
+      const fieldLength = fields.length;
+      whereNotInCondition = `(${fields.map((val) => val).reduce(separateWithComma)}) NOT IN (VALUES `;
+      const valuesString = `(${[...new Array(fieldLength).keys()].map(() => "?").reduce(separateWithComma)})`;
+      whereNotInCondition += [...new Array(values.length).keys()].map(() => valuesString).reduce(separateWithComma);
+      whereNotInCondition += ")";
+      whereNotInParams = values.flat();
+    }
+    return this.where(whereNotInCondition, whereNotInParams);
+  }
   join(join) {
     const joins = Array.isArray(join) ? join : [join];
     const processedJoins = joins.map((j) => {
@@ -478,7 +770,7 @@ var SelectBuilder = class _SelectBuilder {
    * Add a CROSS JOIN to the query.
    */
   crossJoin(params) {
-    return this.join({ ...params, type: "CROSS" /* CROSS */, on: "1=1" });
+    return this.join({ ...params, type: "CROSS" /* CROSS */, on: "" });
   }
   /**
    * Add a NATURAL JOIN to the query.
@@ -635,7 +927,13 @@ var SelectBuilder = class _SelectBuilder {
       let builtCondition = conditionParts[0] ?? "";
       for (let j = 0; j < conditionParts.length - 1; j++) {
         if (paramIndex >= currentInputParams.length) {
-          throw new Error('Mismatch between "?" placeholders and parameters in having clause.');
+          const totalPlaceholders = currentInputConditions.join(" AND ").split("?").length - 1;
+          throw new ParameterMismatchError({
+            clause: "HAVING",
+            query: currentInputConditions.join(" AND "),
+            expectedParams: totalPlaceholders,
+            receivedParams: currentInputParams.length
+          });
         }
         const currentParam = currentInputParams[paramIndex++];
         const isSubQuery = typeof currentParam === "object" && currentParam !== null && ("tableName" in currentParam || "getOptions" in currentParam) && !currentParam.hasOwnProperty("_raw") || currentParam instanceof _SelectBuilder;
@@ -654,7 +952,13 @@ var SelectBuilder = class _SelectBuilder {
       processedNewConditions.push(builtCondition);
     }
     if (paramIndex < currentInputParams.length) {
-      throw new Error('Too many parameters provided for the given "?" placeholders in having clause.');
+      const totalPlaceholders = currentInputConditions.join(" AND ").split("?").length - 1;
+      throw new ParameterMismatchError({
+        clause: "HAVING",
+        query: currentInputConditions.join(" AND "),
+        expectedParams: totalPlaceholders,
+        receivedParams: currentInputParams.length
+      });
     }
     return new _SelectBuilder(
       {
@@ -766,6 +1070,18 @@ var SelectBuilder = class _SelectBuilder {
    */
   paginate(options) {
     const { page, perPage } = options;
+    if (!Number.isInteger(page) || page < 1) {
+      throw new InvalidConfigurationError(
+        `Invalid page value: ${page}. Page must be an integer >= 1.`,
+        "Pass a positive integer for the page option, e.g. paginate({ page: 1, perPage: 20 })"
+      );
+    }
+    if (!Number.isInteger(perPage) || perPage < 1) {
+      throw new InvalidConfigurationError(
+        `Invalid perPage value: ${perPage}. PerPage must be an integer >= 1.`,
+        "Pass a positive integer for the perPage option, e.g. paginate({ page: 1, perPage: 20 })"
+      );
+    }
     const offset = (page - 1) * perPage;
     const countQuery = this._fetchOne(this._options);
     const dataQuery = this._fetchAll({
@@ -1009,7 +1325,7 @@ var QueryBuilder = class {
   insert(params) {
     let args = [];
     if (typeof params.onConflict === "object") {
-      if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params) {
+      if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params != null) {
         args = args.concat(params.onConflict.where?.params);
       }
       if (params.onConflict.data) {
@@ -1037,7 +1353,7 @@ var QueryBuilder = class {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   update(params) {
     let args = this._parse_arguments(params.data);
-    if (typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params) {
+    if (typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params != null) {
       if (Array.isArray(params.where?.params)) {
         args = params.where?.params.concat(args);
       } else {
@@ -1061,7 +1377,7 @@ var QueryBuilder = class {
         return this.execute(q);
       },
       this._delete(params),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
+      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params != null ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
       "ALL" /* ALL */
     );
   }
@@ -1104,7 +1420,7 @@ var QueryBuilder = class {
     let onConflict = "";
     if (params.onConflict && typeof params.onConflict === "object") {
       onConflict = this._onConflict(params.onConflict);
-      if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params) {
+      if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params != null) {
         if (Array.isArray(params.onConflict.where?.params)) {
           index += (params.onConflict.where?.params).length;
         } else {
@@ -1132,7 +1448,7 @@ var QueryBuilder = class {
     return `INSERT ${orConflict} INTO ${params.tableName} (${columns}) VALUES ${rows.join(", ")}` + onConflict + this._returning(params.returning);
   }
   _update(params) {
-    const whereParamsLength = typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? Object.keys(params.where?.params).length : 1 : 0;
+    const whereParamsLength = typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params != null ? Array.isArray(params.where?.params) ? Object.keys(params.where?.params).length : 1 : 0;
     let whereString = this._where(params.where);
     let parameterIndex = 1;
     if (whereString && whereString.match(/(?<!\d)\?(?!\d)/)) {
@@ -1153,7 +1469,7 @@ var QueryBuilder = class {
   }
   _delete(params) {
     return `DELETE
-            FROM ${params.tableName}` + this._where(params.where) + this._returning(params.returning) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
+            FROM ${params.tableName}` + this._where(params.where) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset) + this._returning(params.returning);
   }
   _select(params, queryArgs) {
     let newQueryArgs = queryArgs;
@@ -1205,7 +1521,7 @@ var QueryBuilder = class {
     let primitiveParams = [];
     if (typeof value === "object" && !Array.isArray(value)) {
       conditionStrings = Array.isArray(value.conditions) ? value.conditions : [value.conditions];
-      if (value.params) {
+      if (value.params != null) {
         primitiveParams = Array.isArray(value.params) ? value.params : [value.params];
       }
     } else if (Array.isArray(value)) {
@@ -1297,7 +1613,7 @@ var QueryBuilder = class {
       } else {
         tableSql = `(${context.toSQLCompiler(item.table, context.queryArgs)})`;
       }
-      if (item.type === "NATURAL" /* NATURAL */ || item.type === "NATURAL") {
+      if (item.type === "NATURAL" /* NATURAL */ || item.type === "NATURAL" || !item.on) {
         joinQuery.push(`${type}JOIN ${tableSql}${item.alias ? ` AS ${item.alias}` : ""}`);
       } else {
         joinQuery.push(`${type}JOIN ${tableSql}${item.alias ? ` AS ${item.alias}` : ""} ON ${item.on}`);
@@ -1317,7 +1633,7 @@ var QueryBuilder = class {
     let primitiveParams = [];
     if (typeof value === "object" && !Array.isArray(value)) {
       conditionStrings = Array.isArray(value.conditions) ? value.conditions : [value.conditions];
-      if (value.params) {
+      if (value.params != null) {
         primitiveParams = Array.isArray(value.params) ? value.params : [value.params];
       }
     } else if (Array.isArray(value)) {
@@ -1414,11 +1730,11 @@ var QueryBuilder = class {
     return ` ORDER BY ${result.join(", ")}`;
   }
   _limit(value) {
-    if (!value) return "";
+    if (value == null) return "";
     return ` LIMIT ${value}`;
   }
   _offset(value) {
-    if (!value) return "";
+    if (value == null) return "";
     return ` OFFSET ${value}`;
   }
   _returning(value) {
@@ -1474,10 +1790,10 @@ var syncMigrationsBuilder = class {
     const appliedMigrations = [];
     for (const migration of this.getUnapplied()) {
       this._builder.raw({
-        query: `
-          ${migration.sql}
+        query: `${migration.sql}
           INSERT INTO ${this._tableName} (name)
-          values ('${migration.name}');`
+          values (?);`,
+        args: [migration.name]
       }).execute();
       appliedMigrations.push(migration);
     }
@@ -1529,10 +1845,10 @@ var asyncMigrationsBuilder = class {
     const appliedMigrations = [];
     for (const migration of await this.getUnapplied()) {
       await this._builder.raw({
-        query: `
-          ${migration.sql}
+        query: `${migration.sql}
           INSERT INTO ${this._tableName} (name)
-          values ('${migration.name}');`
+          values (?);`,
+        args: [migration.name]
       }).execute();
       appliedMigrations.push(migration);
     }
@@ -1589,7 +1905,7 @@ var D1QB = class extends QueryBuilder {
   }
   _getQueryType(sql) {
     const trimmed = sql.trim().toUpperCase();
-    if (trimmed.startsWith("SELECT")) return "SELECT";
+    if (trimmed.startsWith("SELECT") || trimmed.startsWith("WITH")) return "SELECT";
     if (trimmed.startsWith("INSERT")) return "INSERT";
     if (trimmed.startsWith("UPDATE")) return "UPDATE";
     if (trimmed.startsWith("DELETE")) return "DELETE";
@@ -1685,7 +2001,7 @@ var DOQB = class extends QueryBuilder {
       const resultArray = cursor.toArray();
       const rowsRead = cursor.rowsRead;
       const rowsWritten = cursor.rowsWritten;
-      if (query.fetchType == "ONE" /* ONE */) {
+      if (query.fetchType === "ONE" /* ONE */) {
         return {
           results: resultArray.length > 0 ? resultArray[0] : void 0,
           rowsRead,
@@ -1706,7 +2022,7 @@ var DOQB = class extends QueryBuilder {
   }
   _getQueryType(sql) {
     const trimmed = sql.trim().toUpperCase();
-    if (trimmed.startsWith("SELECT")) return "SELECT";
+    if (trimmed.startsWith("SELECT") || trimmed.startsWith("WITH")) return "SELECT";
     if (trimmed.startsWith("INSERT")) return "INSERT";
     if (trimmed.startsWith("UPDATE")) return "UPDATE";
     if (trimmed.startsWith("DELETE")) return "DELETE";
@@ -1754,15 +2070,47 @@ var DOQB = class extends QueryBuilder {
 };
 
 // src/databases/pg.ts
+var PGMigrationsBuilder = class extends asyncMigrationsBuilder {
+  async initialize() {
+    await this._builder.createTable({
+      tableName: this._tableName,
+      schema: `id         SERIAL PRIMARY KEY,
+               name       TEXT UNIQUE,
+               applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL`,
+      ifNotExists: true
+    }).execute();
+  }
+  async apply() {
+    const appliedMigrations = [];
+    for (const migration of await this.getUnapplied()) {
+      await this._builder.raw({ query: "BEGIN" }).execute();
+      try {
+        await this._builder.raw({
+          query: migration.sql
+        }).execute();
+        await this._builder.raw({
+          query: `INSERT INTO ${this._tableName} (name)
+            values (?);`,
+          args: [migration.name]
+        }).execute();
+        await this._builder.raw({ query: "COMMIT" }).execute();
+        appliedMigrations.push(migration);
+      } catch (error) {
+        await this._builder.raw({ query: "ROLLBACK" }).execute();
+        throw error;
+      }
+    }
+    return appliedMigrations;
+  }
+};
 var PGQB = class extends QueryBuilder {
   db;
-  _migrationsBuilder = asyncMigrationsBuilder;
   constructor(db, options) {
     super(options);
     this.db = db;
   }
   migrations(options) {
-    return new asyncMigrationsBuilder(options, this);
+    return new PGMigrationsBuilder(options, this);
   }
   async connect() {
     await this.db.connect();
@@ -1772,7 +2120,9 @@ var PGQB = class extends QueryBuilder {
   }
   async execute(query) {
     return await this.loggerWrapper(query, this.options.logger, async () => {
-      const queryString = query.query.replaceAll("?", "$");
+      const maxNumbered = Math.max(0, ...[...query.query.matchAll(/\?(\d+)/g)].map((m) => Number.parseInt(m[1], 10)));
+      let paramIndex = maxNumbered;
+      const queryString = query.query.replace(/\?(\d+)?/g, (_, n) => n !== void 0 ? `$${n}` : `$${++paramIndex}`);
       let result;
       if (query.arguments) {
         result = await this.db.query({