pqb 0.38.5 → 0.38.7

package/dist/index.js

@@ -1097,9 +1097,9 @@ class NumberAsStringBaseColumn extends ColumnType {
     this.operators = Operators.number;
   }
 }
-class DecimalColumn extends ColumnType {
+class DecimalColumn extends NumberAsStringBaseColumn {
   constructor(schema, numericPrecision, numericScale) {
-    super(schema, schema.stringSchema());
+    super(schema);
     this.operators = Operators.number;
     this.dataType = "numeric";
     this.data.numericPrecision = numericPrecision;
@@ -4571,25 +4571,29 @@ class SelectItemExpression extends orchidCore.Expression {
   }
 }
 
-const _get = (query, returnType, arg) => {
+const _getSelectableColumn = (q, arg) => {
   var _a, _b;
+  let type = q.q.shape[arg];
+  if (!type) {
+    const index = arg.indexOf(".");
+    if (index !== -1) {
+      const table = arg.slice(0, index);
+      const column = arg.slice(index + 1);
+      if (table === (q.q.as || q.table)) {
+        type = q.shape[column];
+      } else {
+        type = (_b = (_a = q.q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
+      }
+    }
+  }
+  return type;
+};
+const _get = (query, returnType, arg) => {
   const q = query.q;
   q.returnType = returnType;
   let type;
   if (typeof arg === "string") {
-    type = q.shape[arg];
-    if (!type) {
-      const index = arg.indexOf(".");
-      if (index !== -1) {
-        const table = arg.slice(0, index);
-        const column = arg.slice(index + 1);
-        if (table === (q.as || query.table)) {
-          type = q.shape[column];
-        } else {
-          type = (_b = (_a = q.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[column];
-        }
-      }
-    }
+    type = _getSelectableColumn(query, arg);
     q.getColumn = type;
     const selected = setParserForSelectedString(
       query,
@@ -6552,6 +6556,13 @@ const nullableInt = new IntegerColumn(defaultSchemaConfig);
 nullableInt.parseItem = nullableInt.parseFn = (input) => input === null ? null : parseInt(input);
 const nullableFloat = new RealColumn(defaultSchemaConfig);
 nullableFloat.parseItem = nullableFloat.parseFn = (input) => input === null ? null : parseFloat(input);
+const stringAsNumber = new NumberAsStringBaseColumn(
+  defaultSchemaConfig
+);
+const numericResultColumn = (q, arg) => {
+  const type = typeof arg === "string" ? _getSelectableColumn(q, arg) : arg.result.value;
+  return type instanceof NumberBaseColumn ? nullableFloat : stringAsNumber;
+};
 class AggregateMethods {
   /**
    * Use `exists()` to check if there is at least one record-matching condition.
@@ -6622,7 +6633,7 @@ class AggregateMethods {
   min(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "min",
       [arg],
       options
@@ -6652,7 +6663,7 @@ class AggregateMethods {
   max(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "max",
       [arg],
       options
@@ -6681,7 +6692,7 @@ class AggregateMethods {
   sum(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "sum",
       [arg],
       options
@@ -6707,7 +6718,7 @@ class AggregateMethods {
   avg(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "avg",
       [arg],
       options
@@ -6736,7 +6747,7 @@ class AggregateMethods {
   bitAnd(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "bit_and",
       [arg],
       options
@@ -6762,7 +6773,7 @@ class AggregateMethods {
   bitOr(arg, options) {
     return makeFnExpression(
       this,
-      nullableFloat,
+      numericResultColumn(this, arg),
       "bit_or",
       [arg],
       options
@@ -7376,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',
@@ -7387,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
@@ -7861,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
@@ -8102,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
@@ -9200,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'));
@@ -9515,6 +9532,8 @@ class Where {
    * Constructing `WHERE` conditions:
    *
    * ```ts
+   * import { sql } from './baseTable'
+   *
    * db.table.where({
    *   // column of the current table
    *   name: 'John',
@@ -9531,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'),
@@ -10357,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' })
@@ -10382,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
@@ -11394,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')),
@@ -11419,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'}`,
    *
@@ -12646,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) => {
@@ -12903,6 +12933,7 @@ exports.VirtualColumn = VirtualColumn;
 exports.Where = Where;
 exports.WithMethods = WithMethods;
 exports.XMLColumn = XMLColumn;
+exports._getSelectableColumn = _getSelectableColumn;
 exports._initQueryBuilder = _initQueryBuilder;
 exports._queryAfterSaveCommit = _queryAfterSaveCommit;
 exports._queryAll = _queryAll;