pqb 0.3.3 → 0.3.4

package/dist/index.js

@@ -3008,14 +3008,6 @@ class ArrayOfColumnsObjects extends ColumnType {
 }
 class PluckResultColumnType extends ColumnType {
 }
-class TableSchema {
-  constructor(shape) {
-    this.shape = shape;
-    this.primaryKeys = Object.entries(this.shape).filter(([, column]) => {
-      return column.isPrimaryKey;
-    }).map(([key]) => key);
-  }
-}
 
 var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
 var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
@@ -5044,7 +5036,7 @@ class Update {
     return q._update(...args);
   }
   _update(...args) {
-    var _a, _b;
+    var _a, _b, _c;
     const { query } = this;
     const data = args[0];
     const set = __spreadValues$1({}, data);
@@ -5086,12 +5078,14 @@ class Update {
     if ((state == null ? void 0 : state.updateLater) || appendRelationKeys.length && originalReturnType !== "all") {
       query.returnType = "all";
       if (state == null ? void 0 : state.updateLater) {
-        this.schema.primaryKeys.forEach((key) => {
-          var _a2, _b2;
-          if (!((_a2 = query.select) == null ? void 0 : _a2.includes("*")) && !((_b2 = query.select) == null ? void 0 : _b2.includes(key))) {
-            this._select(key);
-          }
-        });
+        if (!((_c = query.select) == null ? void 0 : _c.includes("*"))) {
+          this.primaryKeys.forEach((key) => {
+            var _a2;
+            if (!((_a2 = query.select) == null ? void 0 : _a2.includes(key))) {
+              this._select(key);
+            }
+          });
+        }
       }
       const { handleResult } = query;
       query.handleResult = async (q, queryResult) => {
@@ -5099,7 +5093,7 @@ class Update {
         if (state == null ? void 0 : state.updateLater) {
           await Promise.all(state.updateLaterPromises);
           const t = this.__model.clone().transacting(q);
-          const keys = this.schema.primaryKeys;
+          const keys = this.primaryKeys;
           t._whereIn(
             keys,
             resultOfTypeAll.map((item) => keys.map((key) => item[key]))
@@ -5350,22 +5344,20 @@ class QueryMethods {
   _distinct(...columns) {
     return pushQueryArray(this, "distinct", columns);
   }
-  find(...args) {
-    return this.clone()._find(...args);
+  find(value) {
+    return this.clone()._find(value);
   }
-  _find(...args) {
-    const conditions = {};
-    this.schema.primaryKeys.forEach((key, i) => {
-      conditions[key] = args[i];
-    });
-    return this._where(conditions)._take();
+  _find(value) {
+    return this._where({
+      [this.singlePrimaryKey]: value
+    })._take();
   }
-  findOptional(...args) {
-    return this.clone()._findOptional(...args);
+  findOptional(value) {
+    return this.clone()._findOptional(value);
   }
-  _findOptional(...args) {
+  _findOptional(value) {
     return this._find(
-      ...args
+      value
     ).takeOptional();
   }
   findBy(...args) {
@@ -5532,7 +5524,12 @@ class Db {
     if (options == null ? void 0 : options.schema) {
       this.query.schema = options.schema;
     }
-    this.schema = new TableSchema(shape);
+    this.primaryKeys = Object.keys(shape).filter(
+      (key) => shape[key].isPrimaryKey
+    );
+    if (this.primaryKeys.length === 1) {
+      this.singlePrimaryKey = this.primaryKeys[0];
+    }
     const columns = Object.keys(
       shape
     );
@@ -5682,7 +5679,6 @@ exports.Select = Select;
 exports.SerialColumn = SerialColumn;
 exports.SmallIntColumn = SmallIntColumn;
 exports.SmallSerialColumn = SmallSerialColumn;
-exports.TableSchema = TableSchema;
 exports.TextBaseColumn = TextBaseColumn;
 exports.TextColumn = TextColumn;
 exports.Then = Then;