pqb 0.38.6 → 0.38.8

package/dist/index.js

@@ -7387,6 +7387,8 @@ class Create {
    * Each column may accept a specific value, a raw SQL, or a query that returns a single value.
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * const oneRecord = await db.table.create({
    *   name: 'John',
    *   password: '1234',
@@ -7398,7 +7400,7 @@ class Create {
    *
    * await db.table.create({
    *   // raw SQL
-   *   column1: (q) => q.sql`'John' || ' ' || 'Doe'`,
+   *   column1: () => sql`'John' || ' ' || 'Doe'`,
    *
    *   // query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -7872,7 +7874,7 @@ class OnConflictQueryBuilder {
    *
    * If the table has columns with **dynamic** default values, such values will be applied as well.
    *
-   * You can exclude certain columns from being merged by passing the `exclude` option.
+   * You can exclude certain columns from being merged by passing the `except` option.
    *
    * ```ts
    * // merge the full data
@@ -8113,7 +8115,9 @@ class Having {
    * Arguments of the aggregate function and of the comparison can be raw SQL:
    *
    * ```ts
-   * db.table.having((q) => q.count(q.sql('coalesce(one, two)')).gte(q.sql`2 + 2`));
+   * import { sql } from './baseTable';
+   *
+   * db.table.having((q) => q.count(sql('coalesce(one, two)')).gte(sql`2 + 2`));
    * ```
    *
    * @param args - raw SQL template string or one or multiple callbacks returning a boolean expression
@@ -9211,13 +9215,15 @@ class Union {
    * Creates a union query, takes one or more queries or SQL expressions.
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * // The first query of the union
    * db.one
    *   .select('id', 'name')
    *   // add two more queries to the union
    *   .union(
    *     db.two.select('id', 'name'),
-   *     (q = q.sql`SELECT id, name FROM "thirdTable"`),
+   *     (q = sql`SELECT id, name FROM "thirdTable"`),
    *   )
    *   // sub-sequent `union` is equivalent to passing multiple queries into a single `union`
    *   .union(db.three.select('id', 'name'));
@@ -9526,6 +9532,8 @@ class Where {
    * Constructing `WHERE` conditions:
    *
    * ```ts
+   * import { sql } from './baseTable'
+   *
    * db.table.where({
    *   // column of the current table
    *   name: 'John',
@@ -9542,8 +9550,8 @@ class Where {
    *   // where column equals to raw SQL
    *   // import `sql` from your `BaseTable`
    *   column: sql`sql expression`,
-   *   // or use `(q) => q.sql` for the same
-   *   column2: (q) => q.sql`sql expression`,
+   *   // or use `(q) => sql` for the same
+   *   column2: (q) => sql`sql expression`,
    *
    *   // reference other columns in such a way:
    *   firstName: (q) => q.ref('lastName'),
@@ -10368,6 +10376,8 @@ class Update {
    * and [jsonRemove](/guide/advanced-queries.html#jsonremove) for a JSON column (see `jsonColumn` below).
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * // returns number of updated records by default
    * const updatedCount = await db.table
    *   .where({ name: 'old name' })
@@ -10393,7 +10403,7 @@ class Update {
    *   column1: 123,
    *
    *   // use raw SQL to update the column
-   *   column2: (q) => q.sql`2 + 2`,
+   *   column2: () => sql`2 + 2`,
    *
    *   // use query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -11405,11 +11415,13 @@ class ExpressionMethods {
    * Only for referencing a column in the query's table. For referencing joined table's columns, see [ref](#ref).
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * await db.table.select({
    *   // select `("table"."id" = 1 OR "table"."name" = 'name') AS "one"`,
    *   // returns a boolean
    *   one: (q) =>
-   *     q.sql<boolean>`${q.column('id')} = ${1} OR ${q.column('name')} = ${'name'}`,
+   *     sql<boolean>`${q.column('id')} = ${1} OR ${q.column('name')} = ${'name'}`,
    *
    *   // selects the same as above, but by building a query
    *   two: (q) => q.column('id').equals(1).or(q.column('name').equals('name')),
@@ -11430,11 +11442,13 @@ class ExpressionMethods {
    * and other dynamically defined columns.
    *
    * ```ts
+   * import { sql } from './baseTable';
+   *
    * await db.table.join('otherTable').select({
    *   // select `("otherTable"."id" = 1 OR "otherTable"."name" = 'name') AS "one"`,
    *   // returns a boolean
    *   one: (q) =>
-   *     q.sql<boolean>`${q.ref('otherTable.id')} = ${1} OR ${q.ref(
+   *     sql<boolean>`${q.ref('otherTable.id')} = ${1} OR ${q.ref(
    *       'otherTable.name',
    *     )} = ${'name'}`,
    *
@@ -12657,6 +12671,11 @@ const createDb = (_a) => {
   for (const name of Object.getOwnPropertyNames(Db.prototype)) {
     db[name] = Db.prototype[name];
   }
+  db.sql = (...args) => {
+    const sql = raw(...args);
+    sql.columnTypes = ct;
+    return sql;
+  };
   return db;
 };
 const _initQueryBuilder = (adapter, columnTypes, transactionStorage, commonOptions, options) => {