pqb 0.3.9 → 0.4.1

package/dist/index.js

@@ -795,8 +795,9 @@ class QueryError extends pg.DatabaseError {
     if (this.detail) {
       const list = (_a = this.detail.match(/\((.*)\)=/)) == null ? void 0 : _a[1];
       if (list) {
-        list.split(", ").forEach((column) => {
-          columns[column.startsWith('"') ? column.slice(1, -1) : column] = true;
+        list.split(", ").forEach((item) => {
+          const column = item.startsWith('"') ? item.slice(1, -1) : item;
+          columns[column] = true;
         });
       }
     }
@@ -1120,15 +1121,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;
@@ -1171,6 +1206,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)}`);
@@ -3144,33 +3184,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;
@@ -3218,7 +3231,7 @@ const queryMethodByReturnType = {
 let queryError = void 0;
 class Then {
   get then() {
-    queryError = new QueryError();
+    queryError = new Error();
     return maybeWrappedThen;
   }
   async catch(fn) {
@@ -3242,8 +3255,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;
@@ -3275,14 +3288,16 @@ const then = async (q, resolve, reject) => {
     }
     resolve == null ? void 0 : resolve(result);
   } catch (err) {
-    const error = err instanceof pg.DatabaseError ? assignError(queryError, err) : err;
+    const error = err instanceof pg.DatabaseError ? assignError(q, err) : err;
     if (q.query.log && sql && logData) {
       q.query.log.onError(error, sql, logData);
     }
     reject == null ? void 0 : reject(error);
   }
 };
-const assignError = (to, from) => {
+const assignError = (q, from) => {
+  const to = new q.error();
+  to.stack = queryError.stack;
   to.message = from.message;
   to.length = from.length;
   to.name = from.name;
@@ -3602,7 +3617,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);
@@ -3848,17 +3865,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);
@@ -3941,22 +3958,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;
   }
@@ -4154,7 +4165,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") {
@@ -4186,13 +4207,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;
@@ -4200,7 +4221,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;
@@ -4208,18 +4229,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;
@@ -4227,7 +4248,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) => {
@@ -4238,7 +4259,7 @@ const handleInsertManyData = (q, data, ctx) => {
 const insert = (self, {
   columns,
   values
-}, returnType, ctx) => {
+}, returnType, ctx, fromQuery) => {
   const q = self;
   const returning = q.query.select;
   delete q.query.and;
@@ -4246,6 +4267,7 @@ const insert = (self, {
   q.query.type = "insert";
   q.query.columns = columns;
   q.query.values = values;
+  q.query.fromQuery = fromQuery;
   if (!ctx) {
     q.query.returnType = returnType;
     return q;
@@ -4321,67 +4343,72 @@ 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) {
+    handleSelect(this);
+    const ctx = createCtx(this);
     return insert(
       this,
-      handleInsertOneData(this, data, ctx),
-      getInsertSingleReturnType(this),
+      handleOneData(this, data, ctx),
+      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) {
+    handleSelect(this);
+    return insert(this, data, getManyReturnType(this));
+  }
+  createFrom(query, data) {
+    return this.clone()._createFrom(query, data);
+  }
+  _createFrom(query, data) {
+    var _a;
+    if (!queryTypeWithLimitOne[query.query.returnType]) {
+      throw new Error(
+        "createFrom accepts only a query which returns one record"
+      );
+    }
     if (!this.query.select) {
       this.query.select = ["*"];
     }
-    return this.clone()._insertRaw(data);
+    const ctx = createCtx(this);
+    const queryColumns = [];
+    (_a = query.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));
+      }
+    });
+    const { columns, values } = handleOneData(this, data, ctx);
+    queryColumns.push(...columns);
+    return insert(
+      this,
+      { columns: queryColumns, values },
+      "one",
+      ctx,
+      query
+    );
   }
   defaults(data) {
     return this.clone()._defaults(data);
@@ -5324,7 +5351,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.`
@@ -5510,7 +5537,7 @@ applyMixins(QueryMethods, [
   With,
   Union,
   Json,
-  Insert,
+  Create,
   Update,
   Delete,
   Transaction,
@@ -5592,7 +5619,7 @@ class Db {
     const defaultSelect = this.defaultSelectColumns.length === columns.length ? void 0 : this.defaultSelectColumns;
     const columnsParsers = {};
     let hasParsers = false;
-    let modifyQuery;
+    let modifyQuery = void 0;
     for (const key in shape) {
       const column = shape[key];
       if (column.parseFn) {
@@ -5613,6 +5640,8 @@ class Db {
     } : toSql;
     this.relations = {};
     modifyQuery == null ? void 0 : modifyQuery.forEach((cb) => cb(this));
+    this.error = class extends QueryError {
+    };
   }
 }
 applyMixins(Db, [QueryMethods]);
@@ -5677,6 +5706,7 @@ exports.Clear = Clear;
 exports.ColumnInfoMethods = ColumnInfoMethods;
 exports.ColumnType = ColumnType;
 exports.ColumnsObject = ColumnsObject;
+exports.Create = Create;
 exports.DateBaseColumn = DateBaseColumn;
 exports.DateColumn = DateColumn;
 exports.DateTimeBaseClass = DateTimeBaseClass;
@@ -5692,7 +5722,6 @@ exports.For = For;
 exports.From = From;
 exports.Having = Having;
 exports.InetColumn = InetColumn;
-exports.Insert = Insert;
 exports.IntegerBaseColumn = IntegerBaseColumn;
 exports.IntegerColumn = IntegerColumn;
 exports.IntervalColumn = IntervalColumn;