pqb 0.4.0 → 0.4.2

package/dist/index.esm.js

@@ -1117,15 +1117,49 @@ const getFrom = (model, query, values) => {
   return quoteSchemaAndTable(query.schema, model.table);
 };
 
+const pushQueryArray = (q, key, value) => {
+  if (!q.query[key])
+    q.query[key] = value;
+  else
+    q.query[key].push(
+      ...value
+    );
+  return q;
+};
+const pushQueryValue = (q, key, value) => {
+  pushOrNewArrayToObject(
+    q.query,
+    key,
+    value
+  );
+  return q;
+};
+const setQueryObjectValue = (q, object, key, value) => {
+  if (!q.query[object])
+    q.query[object] = {
+      [key]: value
+    };
+  else
+    q.query[object][key] = value;
+  return q;
+};
+
 const pushInsertSql = (ctx, model, query, quotedAs) => {
   const quotedColumns = query.columns.map(q);
-  ctx.sql.push(
-    `INSERT INTO ${quotedAs}(${quotedColumns.join(", ")}) VALUES ${isRaw(query.values) ? getRaw(query.values, ctx.values) : query.values.map(
-      (row) => `(${row.map(
-        (value) => value === void 0 ? "DEFAULT" : addValue(ctx.values, value)
-      ).join(", ")})`
-    ).join(", ")}`
-  );
+  ctx.sql.push(`INSERT INTO ${quotedAs}(${quotedColumns.join(", ")})`);
+  if (query.fromQuery) {
+    const q2 = query.fromQuery.clone();
+    pushQueryValue(
+      q2,
+      "select",
+      isRaw(query.values) ? query.values : raw(encodeRow(ctx, query.values[0]))
+    );
+    ctx.sql.push(q2.toSql({ values: ctx.values }).text);
+  } else {
+    ctx.sql.push(
+      `VALUES ${isRaw(query.values) ? getRaw(query.values, ctx.values) : query.values.map((row) => `(${encodeRow(ctx, row)})`).join(", ")}`
+    );
+  }
   if (query.onConflict) {
     ctx.sql.push("ON CONFLICT");
     const { expr, type } = query.onConflict;
@@ -1168,6 +1202,11 @@ const pushInsertSql = (ctx, model, query, quotedAs) => {
   pushWhereStatementSql(ctx, model, query, quotedAs);
   pushReturningSql(ctx, model, query, quotedAs);
 };
+const encodeRow = (ctx, row) => {
+  return row.map(
+    (value) => value === void 0 ? "DEFAULT" : addValue(ctx.values, value)
+  ).join(", ");
+};
 const pushReturningSql = (ctx, model, query, quotedAs) => {
   if (query.select) {
     ctx.sql.push(`RETURNING ${selectToSql(ctx, model, query, quotedAs)}`);
@@ -3141,33 +3180,6 @@ class TransactionAdapter {
   }
 }
 
-const pushQueryArray = (q, key, value) => {
-  if (!q.query[key])
-    q.query[key] = value;
-  else
-    q.query[key].push(
-      ...value
-    );
-  return q;
-};
-const pushQueryValue = (q, key, value) => {
-  pushOrNewArrayToObject(
-    q.query,
-    key,
-    value
-  );
-  return q;
-};
-const setQueryObjectValue = (q, object, key, value) => {
-  if (!q.query[object])
-    q.query[object] = {
-      [key]: value
-    };
-  else
-    q.query[object][key] = value;
-  return q;
-};
-
 const getValueKey = Symbol("get");
 const _get = (q, returnType, arg) => {
   q.query.returnType = returnType;
@@ -3239,8 +3251,8 @@ const then = async (q, resolve, reject) => {
     let beforeCallbacks;
     let afterCallbacks;
     if (q.query.type === "insert") {
-      beforeCallbacks = q.query.beforeInsert;
-      afterCallbacks = q.query.afterInsert;
+      beforeCallbacks = q.query.beforeCreate;
+      afterCallbacks = q.query.afterCreate;
     } else if (q.query.type === "update") {
       beforeCallbacks = q.query.beforeUpdate;
       afterCallbacks = q.query.afterUpdate;
@@ -3601,7 +3613,9 @@ class Aggregate {
     return this.clone()._count(arg, options);
   }
   _count(arg = "*", options) {
-    return get(this._selectCount(arg, options));
+    return get(
+      this._selectCount(arg, options)
+    );
   }
   selectCount(arg, options) {
     return this.clone()._selectCount(arg, options);
@@ -3847,17 +3861,17 @@ class QueryCallbacks {
   _afterQuery(cb) {
     return pushQueryValue(this, "afterQuery", cb);
   }
-  beforeInsert(cb) {
-    return this.clone()._beforeInsert(cb);
+  beforeCreate(cb) {
+    return this.clone()._beforeCreate(cb);
   }
-  _beforeInsert(cb) {
-    return pushQueryValue(this, "beforeInsert", cb);
+  _beforeCreate(cb) {
+    return pushQueryValue(this, "beforeCreate", cb);
   }
-  afterInsert(cb) {
-    return this.clone()._afterInsert(cb);
+  afterCreate(cb) {
+    return this.clone()._afterCreate(cb);
   }
-  _afterInsert(cb) {
-    return pushQueryValue(this, "afterInsert", cb);
+  _afterCreate(cb) {
+    return pushQueryValue(this, "afterCreate", cb);
   }
   beforeUpdate(cb) {
     return this.clone()._beforeUpdate(cb);
@@ -3940,22 +3954,16 @@ class ColumnInfoMethods {
     if (column) {
       this.query.column = column;
     }
-    this.then = function(resolve, reject) {
-      new Then().then.call(
-        this,
-        (rows) => {
-          if (column) {
-            resolve == null ? void 0 : resolve(rowToColumnInfo(rows[0]));
-          } else {
-            const info = {};
-            rows.forEach((row) => {
-              info[row.column_name] = rowToColumnInfo(row);
-            });
-            resolve == null ? void 0 : resolve(info);
-          }
-        },
-        reject
-      );
+    this.query.handleResult = async (_, result) => {
+      if (column) {
+        return rowToColumnInfo(result.rows[0]);
+      } else {
+        const info = {};
+        result.rows.forEach((row) => {
+          info[row.column_name] = rowToColumnInfo(row);
+        });
+        return info;
+      }
     };
     return this;
   }
@@ -4153,7 +4161,17 @@ var __spreadValues$4 = (a, b) => {
     }
   return a;
 };
-const processInsertItem = (item, rowIndex, ctx, columns, columnsMap) => {
+const handleSelect = (q) => {
+  var _a;
+  const select = (_a = q.query.select) == null ? void 0 : _a[0];
+  const isCount = typeof select === "object" && "function" in select && select.function === "count";
+  if (isCount) {
+    q.query.select = void 0;
+  } else if (isCount || !q.query.select) {
+    q.query.select = ["*"];
+  }
+};
+const processCreateItem = (item, rowIndex, ctx, columns, columnsMap) => {
   Object.keys(item).forEach((key) => {
     if (ctx.relations[key]) {
       if (ctx.relations[key].type === "belongsTo") {
@@ -4185,13 +4203,13 @@ const processInsertItem = (item, rowIndex, ctx, columns, columnsMap) => {
     }
   });
 };
-const createInsertCtx = (q) => ({
+const createCtx = (q) => ({
   prependRelations: {},
   appendRelations: {},
   requiredReturning: {},
   relations: q.relations
 });
-const getInsertSingleReturnType = (q) => {
+const getSingleReturnType = (q) => {
   const { select, returnType = "all" } = q.query;
   if (select) {
     return returnType === "all" ? "one" : returnType;
@@ -4199,7 +4217,7 @@ const getInsertSingleReturnType = (q) => {
     return "rowCount";
   }
 };
-const getInsertManyReturnType = (q) => {
+const getManyReturnType = (q) => {
   const { select, returnType } = q.query;
   if (select) {
     return returnType === "one" || returnType === "oneOrThrow" ? "all" : returnType;
@@ -4207,18 +4225,18 @@ const getInsertManyReturnType = (q) => {
     return "rowCount";
   }
 };
-const handleInsertOneData = (q, data, ctx) => {
+const handleOneData = (q, data, ctx) => {
   const columns = [];
   const columnsMap = {};
   const defaults = q.query.defaults;
   if (defaults) {
     data = __spreadValues$4(__spreadValues$4({}, defaults), data);
   }
-  processInsertItem(data, 0, ctx, columns, columnsMap);
+  processCreateItem(data, 0, ctx, columns, columnsMap);
   const values = [columns.map((key) => data[key])];
   return { columns, values };
 };
-const handleInsertManyData = (q, data, ctx) => {
+const handleManyData = (q, data, ctx) => {
   const columns = [];
   const columnsMap = {};
   const defaults = q.query.defaults;
@@ -4226,7 +4244,7 @@ const handleInsertManyData = (q, data, ctx) => {
     data = data.map((item) => __spreadValues$4(__spreadValues$4({}, defaults), item));
   }
   data.forEach((item, i) => {
-    processInsertItem(item, i, ctx, columns, columnsMap);
+    processCreateItem(item, i, ctx, columns, columnsMap);
   });
   const values = Array(data.length);
   data.forEach((item, i) => {
@@ -4320,67 +4338,68 @@ const insert = (self, {
   q.query.returnType = appendRelationsKeys.length ? "all" : returnType;
   return q;
 };
-class Insert {
-  insert(data) {
-    return this.clone()._insert(data);
+class Create {
+  create(data) {
+    return this.clone()._create(data);
   }
-  _insert(data) {
-    const ctx = createInsertCtx(this);
+  _create(data) {
+    var _a;
+    handleSelect(this);
+    const ctx = createCtx(this);
+    const obj = handleOneData(this, data, ctx);
+    let { columns } = obj;
+    const { fromQuery } = this.query;
+    if (fromQuery) {
+      if (!queryTypeWithLimitOne[fromQuery.query.returnType]) {
+        throw new Error(
+          "Cannot create based on a query which returns multiple records"
+        );
+      }
+      const queryColumns = [];
+      (_a = fromQuery.query.select) == null ? void 0 : _a.forEach((item) => {
+        if (typeof item === "string") {
+          const index = item.indexOf(".");
+          queryColumns.push(index === -1 ? item : item.slice(index + 1));
+        } else if ("selectAs" in item) {
+          queryColumns.push(...Object.keys(item.selectAs));
+        }
+      });
+      queryColumns.push(...columns);
+      columns = queryColumns;
+    }
     return insert(
       this,
-      handleInsertOneData(this, data, ctx),
-      getInsertSingleReturnType(this),
+      { columns, values: obj.values },
+      getSingleReturnType(this),
       ctx
     );
   }
-  insertMany(data) {
-    return this.clone()._insertMany(data);
+  createMany(data) {
+    return this.clone()._createMany(data);
   }
-  _insertMany(data) {
-    const ctx = createInsertCtx(this);
+  _createMany(data) {
+    handleSelect(this);
+    const ctx = createCtx(this);
     return insert(
       this,
-      handleInsertManyData(this, data, ctx),
-      getInsertManyReturnType(this),
+      handleManyData(this, data, ctx),
+      getManyReturnType(this),
       ctx
     );
   }
-  insertRaw(data) {
-    return this.clone()._insertRaw(data);
-  }
-  _insertRaw(data) {
-    return insert(
-      this,
-      data,
-      getInsertManyReturnType(this)
-    );
-  }
-  create(data) {
-    return this.clone()._create(data);
-  }
-  _create(data) {
-    if (!this.query.select) {
-      this.query.select = ["*"];
-    }
-    return this.clone()._insert(data);
-  }
-  createMany(data) {
-    return this.clone()._createMany(data);
-  }
-  _createMany(data) {
-    if (!this.query.select) {
-      this.query.select = ["*"];
-    }
-    return this.clone()._insertMany(data);
-  }
   createRaw(data) {
     return this.clone()._createRaw(data);
   }
   _createRaw(data) {
-    if (!this.query.select) {
-      this.query.select = ["*"];
-    }
-    return this.clone()._insertRaw(data);
+    handleSelect(this);
+    return insert(this, data, getManyReturnType(this));
+  }
+  createFrom(query, data) {
+    return this.clone()._createFrom(query, data);
+  }
+  _createFrom(query, data) {
+    this.query.fromQuery = query;
+    return this._create(data);
   }
   defaults(data) {
     return this.clone()._defaults(data);
@@ -5323,7 +5342,7 @@ class QueryUpsert {
     const { handleResult } = this.query;
     this.query.handleResult = async (q, queryResult) => {
       if (queryResult.rowCount === 0) {
-        return q.insert(data.create);
+        return q.create(data.create);
       } else if (queryResult.rowCount > 1) {
         throw new MoreThanOneRowError(
           `Only one row was expected to find for upsert, found ${queryResult.rowCount} rows.`
@@ -5509,7 +5528,7 @@ applyMixins(QueryMethods, [
   With,
   Union,
   Json,
-  Insert,
+  Create,
   Update,
   Delete,
   Transaction,
@@ -5660,5 +5679,5 @@ const createDb = (_a) => {
 const relationQueryKey = Symbol("relationQuery");
 const isRequiredRelationKey = Symbol("isRequiredRelation");
 
-export { Adapter, Aggregate, ArrayColumn, ArrayOfColumnsObjects, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, Clear, ColumnInfoMethods, ColumnType, ColumnsObject, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DecimalBaseColumn, DecimalColumn, Delete, DoublePrecisionColumn, EMPTY_OBJECT, EnumColumn, For, From, Having, InetColumn, Insert, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, Json, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnQueryBuilder, Operators, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, PormError, PormInternalError, QueryCallbacks, QueryError, QueryGet, QueryLog, QueryMethods, QueryUpsert, RealColumn, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, Transaction, TransactionAdapter, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, Update, VarCharColumn, Where, WhereQueryBuilder, With, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, applyMixins, array, arrayToEnum, checkIfASimpleQuery, columnTypes, utils as columnUtils, constructType, createDb, createOperator, defaultsKey, discriminatedUnion, emptyObject, enumType, getClonedQueryData, getColumnTypes, getQueryAs, getQueryParsers, getRaw, getRawSql, getTableData, getValidEnumValues, getValueKey, handleResult, instanceOf, intersection, isRaw, isRequiredRelationKey, joinTruthy, jsonTypes, lazy, literal, logColors, logParamToLogObject, makeRegexToFindInSql, map, nativeEnum, newTableData, noop, notNullable, notNullish, nullable, nullish, object, optional, parseRecord, parseResult, processSelectArg, pushOrNewArray, pushOrNewArrayToObject, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, raw, record, relationQueryKey, required, resetTableData, scalarTypes, set, setQueryObjectValue, toArray, toSql, toSqlCacheKey, tuple, union };
+export { Adapter, Aggregate, ArrayColumn, ArrayOfColumnsObjects, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, Clear, ColumnInfoMethods, ColumnType, ColumnsObject, Create, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DecimalBaseColumn, DecimalColumn, Delete, DoublePrecisionColumn, EMPTY_OBJECT, EnumColumn, For, From, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, Json, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnQueryBuilder, Operators, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, PormError, PormInternalError, QueryCallbacks, QueryError, QueryGet, QueryLog, QueryMethods, QueryUpsert, RealColumn, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, Transaction, TransactionAdapter, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, Update, VarCharColumn, Where, WhereQueryBuilder, With, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, applyMixins, array, arrayToEnum, checkIfASimpleQuery, columnTypes, utils as columnUtils, constructType, createDb, createOperator, defaultsKey, discriminatedUnion, emptyObject, enumType, getClonedQueryData, getColumnTypes, getQueryAs, getQueryParsers, getRaw, getRawSql, getTableData, getValidEnumValues, getValueKey, handleResult, instanceOf, intersection, isRaw, isRequiredRelationKey, joinTruthy, jsonTypes, lazy, literal, logColors, logParamToLogObject, makeRegexToFindInSql, map, nativeEnum, newTableData, noop, notNullable, notNullish, nullable, nullish, object, optional, parseRecord, parseResult, processSelectArg, pushOrNewArray, pushOrNewArrayToObject, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, raw, record, relationQueryKey, required, resetTableData, scalarTypes, set, setQueryObjectValue, toArray, toSql, toSqlCacheKey, tuple, union };
 //# sourceMappingURL=index.esm.js.map