pqb 0.4.1 → 0.4.3

package/dist/index.js

@@ -4259,7 +4259,7 @@ const handleManyData = (q, data, ctx) => {
 const insert = (self, {
   columns,
   values
-}, returnType, ctx, fromQuery) => {
+}, returnType, ctx) => {
   const q = self;
   const returning = q.query.select;
   delete q.query.and;
@@ -4267,7 +4267,6 @@ 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;
@@ -4348,11 +4347,33 @@ class Create {
     return this.clone()._create(data);
   }
   _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,
-      handleOneData(this, data, ctx),
+      { columns, values: obj.values },
       getSingleReturnType(this),
       ctx
     );
@@ -4381,34 +4402,8 @@ class Create {
     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 = ["*"];
-    }
-    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
-    );
+    this.query.fromQuery = query;
+    return this._create(data);
   }
   defaults(data) {
     return this.clone()._defaults(data);