pqb 0.36.12 → 0.36.14

package/dist/index.mjs

@@ -1906,18 +1906,6 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   }
   return `"${tableName}"."${key}"`;
 };
-const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
-  const index = column.indexOf(".");
-  return index !== -1 ? tableColumnToSqlWithAs(
-    ctx,
-    data,
-    column,
-    column.slice(0, index),
-    column.slice(index + 1),
-    quotedAs,
-    select
-  ) : ownColumnToSqlWithAs(ctx, data, column, quotedAs, select);
-};
 const tableColumnToSqlWithAs = (ctx, data, column, table, key, quotedAs, select) => {
   var _a, _b, _c;
   if (key === "*") {
@@ -4541,11 +4529,9 @@ class SelectItemExpression extends Expression {
     if (value)
       Object.assign(this, value.operators);
   }
-  // `makeSQL` acts similarly to how select args are handled,
-  // except that it will use non-aliasing `columnToSql` when `ctx.aliasValue` is true,
-  // it is needed for relation sub-queries that returns a single column.
+  // `makeSQL` acts similarly to how select args are handled
   makeSQL(ctx, quotedAs) {
-    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.query, this.q, quotedAs) : ctx.aliasValue ? columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : columnToSqlWithAs(ctx, this.q, this.item, quotedAs, true) : selectedObjectToSQL(ctx, quotedAs, this.item);
+    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.query, this.q, quotedAs) : columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
   }
 }
 
@@ -7887,8 +7873,6 @@ const _queryDelete = (query) => {
 };
 class Delete {
   /**
-   * It is aliased to `del` because `delete` is a reserved word in JavaScript.
-   *
    * This method deletes one or more rows, based on other conditions specified in the query.
    *
    * By default, `delete` will return a count of deleted records.
@@ -9831,22 +9815,16 @@ class Where {
    *
    * ### JSONB column operators
    *
-   * For the `jsonb` column, note that the `json` type has text operators instead.
+   * JSON functions are available only for the `jsonb` column, note that the `json` type has text operators instead.
    *
-   * `jsonPath` operator: compare a column value under a given JSON path with the provided value.
+   * You can use [jsonPathQueryFirst](/guide/json.html#jsonpathqueryfirst) to filter by a JSON value, follow the link for details.
    *
-   * Value can be of any type to compare with JSON value, or it can be a sub-query or a raw SQL expression.
+   * The value can be of any type, it can also be returned from a sub-query, raw SQL expression.
    *
    * ```ts
-   * db.table.where({
-   *   jsonbColumn: {
-   *     jsonPath: [
-   *       '$.name', // first element is JSON path
-   *       '=', // second argument is comparison operator
-   *       'value', // third argument is a value to compare with
-   *     ],
-   *   },
-   * });
+   * db.table.where((q) =>
+   *   q.get('jsonbColumn').jsonPathQueryFirst('$.name').equals(value),
+   * );
    * ```
    *
    * `jsonSupersetOf`: check if the column value is a superset of provided value.
@@ -9872,7 +9850,7 @@ class Where {
    * ```ts
    * db.table.where({
    *   jsonbColumn: {
-   *     jsonSupersetOf: { a: 1 },
+   *     jsonSubsetOf: { a: 1 },
    *   },
    * });
    * ```
@@ -11288,14 +11266,14 @@ function enableSoftDelete(q, table, shape, softDelete, scopes) {
   };
   scopes.deleted = scope;
   ((_b = (_a = q.q).scopes) != null ? _b : _a.scopes = {}).nonDeleted = scope;
-  const _del = _softDelete(column);
+  const _del = _softDelete(column, q.internal.nowSQL);
   q.baseQuery.delete = function() {
     return _del.call(this.clone());
   };
 }
 const nowSql = new RawSQL("now()");
-const _softDelete = (column) => {
-  const set = { [column]: nowSql };
+const _softDelete = (column, customNowSQL) => {
+  const set = { [column]: customNowSQL ? new RawSQL(customNowSQL) : nowSql };
   return function() {
     return _queryUpdate(this, set);
   };
@@ -11690,7 +11668,7 @@ class QueryMethods {
    * Finds a single record with a given SQL, throws {@link NotFoundError} if not found:
    *
    * ```ts
-   * await db.user.find`
+   * await db.user.findBySql`
    *   age = ${age} AND
    *   name = ${name}
    * `;
@@ -11720,7 +11698,7 @@ class QueryMethods {
    * Returns `undefined` when not found.
    *
    * ```ts
-   * await db.user.find`
+   * await db.user.findBySqlOptional`
    *   age = ${age} AND
    *   name = ${name}
    * `;
@@ -12343,6 +12321,7 @@ class Db {
       snakeCase: options.snakeCase,
       noPrimaryKey: options.noPrimaryKey === "ignore",
       comment: options.comment,
+      nowSQL: options.nowSQL,
       tableData
     };
     this.baseQuery = this;
@@ -12584,14 +12563,12 @@ const createDb = (_a) => {
     log,
     logger,
     snakeCase,
-    nowSQL,
     schemaConfig = defaultSchemaConfig,
     columnTypes: ctOrFn = makeColumnTypes(schemaConfig)
   } = _b, options = __objRest(_b, [
     "log",
     "logger",
     "snakeCase",
-    "nowSQL",
     "schemaConfig",
     "columnTypes"
   ]);
@@ -12602,6 +12579,7 @@ const createDb = (_a) => {
     logger,
     autoPreparedStatements: (_a2 = options.autoPreparedStatements) != null ? _a2 : false,
     noPrimaryKey: (_b2 = options.noPrimaryKey) != null ? _b2 : "error",
+    nowSQL: options.nowSQL,
     snakeCase
   };
   const ct = typeof ctOrFn === "function" ? ctOrFn(makeColumnTypes(schemaConfig)) : ctOrFn;
@@ -12616,16 +12594,19 @@ const createDb = (_a) => {
     commonOptions,
     options
   );
-  const tableConstructor = (table, shape, dataFn, options2) => new Db(
-    adapter,
-    qb,
-    table,
-    typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2 == null ? void 0 : options2.language) : shape,
-    ct,
-    transactionStorage,
-    __spreadValues(__spreadValues({}, commonOptions), options2),
-    parseTableData(dataFn)
-  );
+  const { nowSQL } = options;
+  const tableConstructor = (table, shape, dataFn, options2) => {
+    return new Db(
+      adapter,
+      qb,
+      table,
+      typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2 == null ? void 0 : options2.language) : shape,
+      ct,
+      transactionStorage,
+      __spreadValues(__spreadValues({}, commonOptions), options2),
+      parseTableData(dataFn)
+    );
+  };
   const db = Object.assign(tableConstructor, qb, {
     adapter,
     close: () => adapter.close()