@payloadcms/db-postgres 0.7.0 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/deleteOne.d.ts.map +1 -1
- package/dist/deleteOne.js +42 -15
- package/dist/find/chainMethods.d.ts +3 -2
- package/dist/find/chainMethods.d.ts.map +1 -1
- package/dist/find/chainMethods.js +1 -1
- package/dist/find/findMany.d.ts.map +1 -1
- package/dist/find/findMany.js +32 -54
- package/dist/queries/selectDistinct.d.ts +23 -0
- package/dist/queries/selectDistinct.d.ts.map +1 -0
- package/dist/queries/selectDistinct.js +49 -0
- package/dist/update.d.ts.map +1 -1
- package/dist/update.js +21 -46
- package/package.json +8 -4
package/dist/deleteOne.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
1
|
+
{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAajD,eAAO,MAAM,SAAS,EAAE,SAsDvB,CAAA"}
|
package/dist/deleteOne.js
CHANGED
@@ -8,40 +8,67 @@ Object.defineProperty(exports, "deleteOne", {
|
|
8
8
|
return deleteOne;
|
9
9
|
}
|
10
10
|
});
|
11
|
+
const _drizzleorm = require("drizzle-orm");
|
11
12
|
const _tosnakecase = /*#__PURE__*/ _interop_require_default(require("to-snake-case"));
|
12
13
|
const _buildFindManyArgs = require("./find/buildFindManyArgs");
|
13
14
|
const _buildQuery = /*#__PURE__*/ _interop_require_default(require("./queries/buildQuery"));
|
15
|
+
const _selectDistinct = require("./queries/selectDistinct");
|
14
16
|
const _read = require("./transform/read");
|
15
17
|
function _interop_require_default(obj) {
|
16
18
|
return obj && obj.__esModule ? obj : {
|
17
19
|
default: obj
|
18
20
|
};
|
19
21
|
}
|
20
|
-
const deleteOne = async function deleteOne({ collection, req = {}, where:
|
22
|
+
const deleteOne = async function deleteOne({ collection: collectionSlug, req = {}, where: whereArg }) {
|
21
23
|
const db = this.sessions[req.transactionID]?.db || this.drizzle;
|
22
|
-
const
|
23
|
-
const tableName = (0, _tosnakecase.default)(
|
24
|
-
|
24
|
+
const collection = this.payload.collections[collectionSlug].config;
|
25
|
+
const tableName = (0, _tosnakecase.default)(collectionSlug);
|
26
|
+
let docToDelete;
|
27
|
+
const { joinAliases, joins, selectFields, where } = await (0, _buildQuery.default)({
|
25
28
|
adapter: this,
|
26
|
-
fields:
|
29
|
+
fields: collection.fields,
|
30
|
+
locale: req.locale,
|
27
31
|
tableName,
|
28
|
-
where:
|
32
|
+
where: whereArg
|
29
33
|
});
|
30
|
-
const
|
34
|
+
const selectDistinctResult = await (0, _selectDistinct.selectDistinct)({
|
31
35
|
adapter: this,
|
32
|
-
|
33
|
-
|
34
|
-
|
36
|
+
chainedMethods: [
|
37
|
+
{
|
38
|
+
args: [
|
39
|
+
1
|
40
|
+
],
|
41
|
+
method: 'limit'
|
42
|
+
}
|
43
|
+
],
|
44
|
+
db,
|
45
|
+
joinAliases,
|
46
|
+
joins,
|
47
|
+
selectFields,
|
48
|
+
tableName,
|
49
|
+
where
|
35
50
|
});
|
36
|
-
|
37
|
-
|
51
|
+
if (selectDistinctResult?.[0]?.id) {
|
52
|
+
docToDelete = await db.query[tableName].findFirst({
|
53
|
+
where: (0, _drizzleorm.eq)(this.tables[tableName].id, selectDistinctResult[0].id)
|
54
|
+
});
|
55
|
+
} else {
|
56
|
+
const findManyArgs = (0, _buildFindManyArgs.buildFindManyArgs)({
|
57
|
+
adapter: this,
|
58
|
+
depth: 0,
|
59
|
+
fields: collection.fields,
|
60
|
+
tableName
|
61
|
+
});
|
62
|
+
findManyArgs.where = where;
|
63
|
+
docToDelete = await db.query[tableName].findFirst(findManyArgs);
|
64
|
+
}
|
38
65
|
const result = (0, _read.transform)({
|
39
66
|
config: this.payload.config,
|
40
67
|
data: docToDelete,
|
41
|
-
fields:
|
68
|
+
fields: collection.fields
|
42
69
|
});
|
43
|
-
await db.delete(this.tables[tableName]).where(
|
70
|
+
await db.delete(this.tables[tableName]).where((0, _drizzleorm.eq)(this.tables[tableName].id, docToDelete.id));
|
44
71
|
return result;
|
45
72
|
};
|
46
73
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9kZWxldGVPbmUudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBEZWxldGVPbmUgfSBmcm9tICdwYXlsb2FkL2RhdGFiYXNlJ1xuaW1wb3J0IHR5cGUgeyBQYXlsb2FkUmVxdWVzdCB9IGZyb20gJ3BheWxvYWQvdHlwZXMnXG5cbmltcG9ydCB7IGVxIH0gZnJvbSAnZHJpenpsZS1vcm0nXG5pbXBvcnQgdG9TbmFrZUNhc2UgZnJvbSAndG8tc25ha2UtY2FzZSdcblxuaW1wb3J0IHR5cGUgeyBQb3N0Z3Jlc0FkYXB0ZXIgfSBmcm9tICcuL3R5cGVzJ1xuXG5pbXBvcnQgeyBidWlsZEZpbmRNYW55QXJncyB9IGZyb20gJy4vZmluZC9idWlsZEZpbmRNYW55QXJncydcbmltcG9ydCBidWlsZFF1ZXJ5IGZyb20gJy4vcXVlcmllcy9idWlsZFF1ZXJ5J1xuaW1wb3J0IHsgc2VsZWN0RGlzdGluY3QgfSBmcm9tICcuL3F1ZXJpZXMvc2VsZWN0RGlzdGluY3QnXG5pbXBvcnQgeyB0cmFuc2Zvcm0gfSBmcm9tICcuL3RyYW5zZm9ybS9yZWFkJ1xuXG5leHBvcnQgY29uc3QgZGVsZXRlT25lOiBEZWxldGVPbmUgPSBhc3luYyBmdW5jdGlvbiBkZWxldGVPbmUoXG4gIHRoaXM6IFBvc3RncmVzQWRhcHRlcixcbiAgeyBjb2xsZWN0aW9uOiBjb2xsZWN0aW9uU2x1ZywgcmVxID0ge30gYXMgUGF5bG9hZFJlcXVlc3QsIHdoZXJlOiB3aGVyZUFyZyB9LFxuKSB7XG4gIGNvbnN0IGRiID0gdGhpcy5zZXNzaW9uc1tyZXEudHJhbnNhY3Rpb25JRF0/LmRiIHx8IHRoaXMuZHJpenpsZVxuICBjb25zdCBjb2xsZWN0aW9uID0gdGhpcy5wYXlsb2FkLmNvbGxlY3Rpb25zW2NvbGxlY3Rpb25TbHVnXS5jb25maWdcbiAgY29uc3QgdGFibGVOYW1lID0gdG9TbmFrZUNhc2UoY29sbGVjdGlvblNsdWcpXG4gIGxldCBkb2NUb0RlbGV0ZTogUmVjb3JkPHN0cmluZywgdW5rbm93bj5cblxuICBjb25zdCB7IGpvaW5BbGlhc2VzLCBqb2lucywgc2VsZWN0RmllbGRzLCB3aGVyZSB9ID0gYXdhaXQgYnVpbGRRdWVyeSh7XG4gICAgYWRhcHRlcjogdGhpcyxcbiAgICBmaWVsZHM6IGNvbGxlY3Rpb24uZmllbGRzLFxuICAgIGxvY2FsZTogcmVxLmxvY2FsZSxcbiAgICB0YWJsZU5hbWUsXG4gICAgd2hlcmU6IHdoZXJlQXJnLFxuICB9KVxuXG4gIGNvbnN0IHNlbGVjdERpc3RpbmN0UmVzdWx0ID0gYXdhaXQgc2VsZWN0RGlzdGluY3Qoe1xuICAgIGFkYXB0ZXI6IHRoaXMsXG4gICAgY2hhaW5lZE1ldGhvZHM6IFt7IGFyZ3M6IFsxXSwgbWV0aG9kOiAnbGltaXQnIH1dLFxuICAgIGRiLFxuICAgIGpvaW5BbGlhc2VzLFxuICAgIGpvaW5zLFxuICAgIHNlbGVjdEZpZWxkcyxcbiAgICB0YWJsZU5hbWUsXG4gICAgd2hlcmUsXG4gIH0pXG5cbiAgaWYgKHNlbGVjdERpc3RpbmN0UmVzdWx0Py5bMF0/LmlkKSB7XG4gICAgZG9jVG9EZWxldGUgPSBhd2FpdCBkYi5xdWVyeVt0YWJsZU5hbWVdLmZpbmRGaXJzdCh7XG4gICAgICB3aGVyZTogZXEodGhpcy50YWJsZXNbdGFibGVOYW1lXS5pZCwgc2VsZWN0RGlzdGluY3RSZXN1bHRbMF0uaWQpLFxuICAgIH0pXG4gIH0gZWxzZSB7XG4gICAgY29uc3QgZmluZE1hbnlBcmdzID0gYnVpbGRGaW5kTWFueUFyZ3Moe1xuICAgICAgYWRhcHRlcjogdGhpcyxcbiAgICAgIGRlcHRoOiAwLFxuICAgICAgZmllbGRzOiBjb2xsZWN0aW9uLmZpZWxkcyxcbiAgICAgIHRhYmxlTmFtZSxcbiAgICB9KVxuXG4gICAgZmluZE1hbnlBcmdzLndoZXJlID0gd2hlcmVcblxuICAgIGRvY1RvRGVsZXRlID0gYXdhaXQgZGIucXVlcnlbdGFibGVOYW1lXS5maW5kRmlyc3QoZmluZE1hbnlBcmdzKVxuICB9XG5cbiAgY29uc3QgcmVzdWx0ID0gdHJhbnNmb3JtKHtcbiAgICBjb25maWc6IHRoaXMucGF5bG9hZC5jb25maWcsXG4gICAgZGF0YTogZG9jVG9EZWxldGUsXG4gICAgZmllbGRzOiBjb2xsZWN0aW9uLmZpZWxkcyxcbiAgfSlcblxuICBhd2FpdCBkYi5kZWxldGUodGhpcy50YWJsZXNbdGFibGVOYW1lXSkud2hlcmUoZXEodGhpcy50YWJsZXNbdGFibGVOYW1lXS5pZCwgZG9jVG9EZWxldGUuaWQpKVxuXG4gIHJldHVybiByZXN1bHRcbn1cbiJdLCJuYW1lcyI6WyJkZWxldGVPbmUiLCJjb2xsZWN0aW9uIiwiY29sbGVjdGlvblNsdWciLCJyZXEiLCJ3aGVyZSIsIndoZXJlQXJnIiwiZGIiLCJzZXNzaW9ucyIsInRyYW5zYWN0aW9uSUQiLCJkcml6emxlIiwicGF5bG9hZCIsImNvbGxlY3Rpb25zIiwiY29uZmlnIiwidGFibGVOYW1lIiwidG9TbmFrZUNhc2UiLCJkb2NUb0RlbGV0ZSIsImpvaW5BbGlhc2VzIiwiam9pbnMiLCJzZWxlY3RGaWVsZHMiLCJidWlsZFF1ZXJ5IiwiYWRhcHRlciIsImZpZWxkcyIsImxvY2FsZSIsInNlbGVjdERpc3RpbmN0UmVzdWx0Iiwic2VsZWN0RGlzdGluY3QiLCJjaGFpbmVkTWV0aG9kcyIsImFyZ3MiLCJtZXRob2QiLCJpZCIsInF1ZXJ5IiwiZmluZEZpcnN0IiwiZXEiLCJ0YWJsZXMiLCJmaW5kTWFueUFyZ3MiLCJidWlsZEZpbmRNYW55QXJncyIsImRlcHRoIiwicmVzdWx0IiwidHJhbnNmb3JtIiwiZGF0YSIsImRlbGV0ZSJdLCJtYXBwaW5ncyI6Ijs7OzsrQkFhYUE7OztlQUFBQTs7OzRCQVZNO29FQUNLO21DQUlVO21FQUNYO2dDQUNRO3NCQUNMOzs7Ozs7QUFFbkIsTUFBTUEsWUFBdUIsZUFBZUEsVUFFakQsRUFBRUMsWUFBWUMsY0FBYyxFQUFFQyxNQUFNLENBQUMsQ0FBbUIsRUFBRUMsT0FBT0MsUUFBUSxFQUFFO0lBRTNFLE1BQU1DLEtBQUssSUFBSSxDQUFDQyxRQUFRLENBQUNKLElBQUlLLGFBQWEsQ0FBQyxFQUFFRixNQUFNLElBQUksQ0FBQ0csT0FBTztJQUMvRCxNQUFNUixhQUFhLElBQUksQ0FBQ1MsT0FBTyxDQUFDQyxXQUFXLENBQUNULGVBQWUsQ0FBQ1UsTUFBTTtJQUNsRSxNQUFNQyxZQUFZQyxJQUFBQSxvQkFBVyxFQUFDWjtJQUM5QixJQUFJYTtJQUVKLE1BQU0sRUFBRUMsV0FBVyxFQUFFQyxLQUFLLEVBQUVDLFlBQVksRUFBRWQsS0FBSyxFQUFFLEdBQUcsTUFBTWUsSUFBQUEsbUJBQVUsRUFBQztRQUNuRUMsU0FBUyxJQUFJO1FBQ2JDLFFBQVFwQixXQUFXb0IsTUFBTTtRQUN6QkMsUUFBUW5CLElBQUltQixNQUFNO1FBQ2xCVDtRQUNBVCxPQUFPQztJQUNUO0lBRUEsTUFBTWtCLHVCQUF1QixNQUFNQyxJQUFBQSw4QkFBYyxFQUFDO1FBQ2hESixTQUFTLElBQUk7UUFDYkssZ0JBQWdCO1lBQUM7Z0JBQUVDLE1BQU07b0JBQUM7aUJBQUU7Z0JBQUVDLFFBQVE7WUFBUTtTQUFFO1FBQ2hEckI7UUFDQVU7UUFDQUM7UUFDQUM7UUFDQUw7UUFDQVQ7SUFDRjtJQUVBLElBQUltQixzQkFBc0IsQ0FBQyxFQUFFLEVBQUVLLElBQUk7UUFDakNiLGNBQWMsTUFBTVQsR0FBR3VCLEtBQUssQ0FBQ2hCLFVBQVUsQ0FBQ2lCLFNBQVMsQ0FBQztZQUNoRDFCLE9BQU8yQixJQUFBQSxjQUFFLEVBQUMsSUFBSSxDQUFDQyxNQUFNLENBQUNuQixVQUFVLENBQUNlLEVBQUUsRUFBRUwsb0JBQW9CLENBQUMsRUFBRSxDQUFDSyxFQUFFO1FBQ2pFO0lBQ0YsT0FBTztRQUNMLE1BQU1LLGVBQWVDLElBQUFBLG9DQUFpQixFQUFDO1lBQ3JDZCxTQUFTLElBQUk7WUFDYmUsT0FBTztZQUNQZCxRQUFRcEIsV0FBV29CLE1BQU07WUFDekJSO1FBQ0Y7UUFFQW9CLGFBQWE3QixLQUFLLEdBQUdBO1FBRXJCVyxjQUFjLE1BQU1ULEdBQUd1QixLQUFLLENBQUNoQixVQUFVLENBQUNpQixTQUFTLENBQUNHO0lBQ3BEO0lBRUEsTUFBTUcsU0FBU0MsSUFBQUEsZUFBUyxFQUFDO1FBQ3ZCekIsUUFBUSxJQUFJLENBQUNGLE9BQU8sQ0FBQ0UsTUFBTTtRQUMzQjBCLE1BQU12QjtRQUNOTSxRQUFRcEIsV0FBV29CLE1BQU07SUFDM0I7SUFFQSxNQUFNZixHQUFHaUMsTUFBTSxDQUFDLElBQUksQ0FBQ1AsTUFBTSxDQUFDbkIsVUFBVSxFQUFFVCxLQUFLLENBQUMyQixJQUFBQSxjQUFFLEVBQUMsSUFBSSxDQUFDQyxNQUFNLENBQUNuQixVQUFVLENBQUNlLEVBQUUsRUFBRWIsWUFBWWEsRUFBRTtJQUUxRixPQUFPUTtBQUNUIn0=
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import type { QueryPromise } from 'drizzle-orm';
|
1
2
|
export type ChainedMethods = {
|
2
3
|
args: unknown[];
|
3
4
|
method: string;
|
@@ -7,9 +8,9 @@ export type ChainedMethods = {
|
|
7
8
|
* @param methods
|
8
9
|
* @param query
|
9
10
|
*/
|
10
|
-
declare const chainMethods: ({ methods, query }: {
|
11
|
+
declare const chainMethods: <T>({ methods, query }: {
|
11
12
|
methods: any;
|
12
13
|
query: any;
|
13
|
-
}) =>
|
14
|
+
}) => QueryPromise<T>;
|
14
15
|
export { chainMethods };
|
15
16
|
//# sourceMappingURL=chainMethods.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"chainMethods.d.ts","sourceRoot":"","sources":["../../src/find/chainMethods.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,OAAO,EAAE,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,EAAE,CAAA;AAEH;;;;GAIG;AACH,QAAA,MAAM,YAAY;;;
|
1
|
+
{"version":3,"file":"chainMethods.d.ts","sourceRoot":"","sources":["../../src/find/chainMethods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,OAAO,EAAE,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,EAAE,CAAA;AAEH;;;;GAIG;AACH,QAAA,MAAM,YAAY;;;qBAIjB,CAAA;AAED,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
@@ -18,4 +18,4 @@ Object.defineProperty(exports, "chainMethods", {
|
|
18
18
|
}, query);
|
19
19
|
};
|
20
20
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maW5kL2NoYWluTWV0aG9kcy50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFF1ZXJ5UHJvbWlzZSB9IGZyb20gJ2RyaXp6bGUtb3JtJ1xuXG5leHBvcnQgdHlwZSBDaGFpbmVkTWV0aG9kcyA9IHtcbiAgYXJnczogdW5rbm93bltdXG4gIG1ldGhvZDogc3RyaW5nXG59W11cblxuLyoqXG4gKiBDYWxsIGFuZCByZXR1cm5pbmcgbWV0aG9kcyB0aGF0IHdvdWxkIG5vcm1hbGx5IGJlIGNoYWluZWQgdG9nZXRoZXIgYnV0IGNhbm5vdCBiZSBiZWNhdXNlIG9mIGNvbnRyb2wgbG9naWNcbiAqIEBwYXJhbSBtZXRob2RzXG4gKiBAcGFyYW0gcXVlcnlcbiAqL1xuY29uc3QgY2hhaW5NZXRob2RzID0gPFQ+KHsgbWV0aG9kcywgcXVlcnkgfSk6IFF1ZXJ5UHJvbWlzZTxUPiA9PiB7XG4gIHJldHVybiBtZXRob2RzLnJlZHVjZSgocXVlcnksIHsgYXJncywgbWV0aG9kIH0pID0+IHtcbiAgICByZXR1cm4gcXVlcnlbbWV0aG9kXSguLi5hcmdzKVxuICB9LCBxdWVyeSlcbn1cblxuZXhwb3J0IHsgY2hhaW5NZXRob2RzIH1cbiJdLCJuYW1lcyI6WyJjaGFpbk1ldGhvZHMiLCJtZXRob2RzIiwicXVlcnkiLCJyZWR1Y2UiLCJhcmdzIiwibWV0aG9kIl0sIm1hcHBpbmdzIjoiOzs7OytCQWtCU0E7OztlQUFBQTs7O0FBWFQ7Ozs7Q0FJQyxHQUNELE1BQU1BLGVBQWUsQ0FBSSxFQUFFQyxPQUFPLEVBQUVDLEtBQUssRUFBRTtJQUN6QyxPQUFPRCxRQUFRRSxNQUFNLENBQUMsQ0FBQ0QsT0FBTyxFQUFFRSxJQUFJLEVBQUVDLE1BQU0sRUFBRTtRQUM1QyxPQUFPSCxLQUFLLENBQUNHLE9BQU8sSUFBSUQ7SUFDMUIsR0FBR0Y7QUFDTCJ9
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/find/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAA8B,MAAM,eAAe,CAAA;AAItE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;
|
1
|
+
{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/find/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAA8B,MAAM,eAAe,CAAA;AAItE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAS/C,KAAK,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG;IACzC,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,QAAQ,iHAYlB,IAAI;;;;;;;;;;;EAgKN,CAAA"}
|
package/dist/find/findMany.js
CHANGED
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "findMany", {
|
|
10
10
|
});
|
11
11
|
const _drizzleorm = require("drizzle-orm");
|
12
12
|
const _buildQuery = /*#__PURE__*/ _interop_require_default(require("../queries/buildQuery"));
|
13
|
+
const _selectDistinct = require("../queries/selectDistinct");
|
13
14
|
const _read = require("../transform/read");
|
14
15
|
const _buildFindManyArgs = require("./buildFindManyArgs");
|
15
16
|
const _chainMethods = require("./chainMethods");
|
@@ -27,7 +28,6 @@ const findMany = async function find({ adapter, fields, limit: limitArg, locale,
|
|
27
28
|
let hasPrevPage;
|
28
29
|
let hasNextPage;
|
29
30
|
let pagingCounter;
|
30
|
-
let selectDistinctResult;
|
31
31
|
const { joinAliases, joins, orderBy, selectFields, where } = await (0, _buildQuery.default)({
|
32
32
|
adapter,
|
33
33
|
fields,
|
@@ -53,52 +53,29 @@ const findMany = async function find({ adapter, fields, limit: limitArg, locale,
|
|
53
53
|
fields,
|
54
54
|
tableName
|
55
55
|
});
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
adapter.tables[joinTable],
|
80
|
-
condition
|
81
|
-
],
|
82
|
-
method: 'leftJoin'
|
83
|
-
});
|
84
|
-
}
|
85
|
-
});
|
86
|
-
selectDistinctMethods.push({
|
87
|
-
args: [
|
88
|
-
skip || (page - 1) * limit
|
89
|
-
],
|
90
|
-
method: 'offset'
|
91
|
-
});
|
92
|
-
selectDistinctMethods.push({
|
93
|
-
args: [
|
94
|
-
limit === 0 ? undefined : limit
|
95
|
-
],
|
96
|
-
method: 'limit'
|
97
|
-
});
|
98
|
-
selectDistinctResult = await (0, _chainMethods.chainMethods)({
|
99
|
-
methods: selectDistinctMethods,
|
100
|
-
query: db.selectDistinct(selectFields).from(table)
|
101
|
-
});
|
56
|
+
selectDistinctMethods.push({
|
57
|
+
args: [
|
58
|
+
skip || (page - 1) * limit
|
59
|
+
],
|
60
|
+
method: 'offset'
|
61
|
+
});
|
62
|
+
selectDistinctMethods.push({
|
63
|
+
args: [
|
64
|
+
limit === 0 ? undefined : limit
|
65
|
+
],
|
66
|
+
method: 'limit'
|
67
|
+
});
|
68
|
+
const selectDistinctResult = await (0, _selectDistinct.selectDistinct)({
|
69
|
+
adapter,
|
70
|
+
chainedMethods: selectDistinctMethods,
|
71
|
+
db,
|
72
|
+
joinAliases,
|
73
|
+
joins,
|
74
|
+
selectFields,
|
75
|
+
tableName,
|
76
|
+
where
|
77
|
+
});
|
78
|
+
if (selectDistinctResult) {
|
102
79
|
if (selectDistinctResult.length === 0) {
|
103
80
|
return {
|
104
81
|
docs: [],
|
@@ -112,13 +89,14 @@ const findMany = async function find({ adapter, fields, limit: limitArg, locale,
|
|
112
89
|
totalDocs: 0,
|
113
90
|
totalPages: 0
|
114
91
|
};
|
92
|
+
} else {
|
93
|
+
// set the id in an object for sorting later
|
94
|
+
selectDistinctResult.forEach(({ id }, i)=>{
|
95
|
+
orderedIDMap[id] = i;
|
96
|
+
});
|
97
|
+
orderedIDs = Object.keys(orderedIDMap);
|
98
|
+
findManyArgs.where = (0, _drizzleorm.inArray)(adapter.tables[tableName].id, orderedIDs);
|
115
99
|
}
|
116
|
-
// set the id in an object for sorting later
|
117
|
-
selectDistinctResult.forEach(({ id }, i)=>{
|
118
|
-
orderedIDMap[id] = i;
|
119
|
-
});
|
120
|
-
orderedIDs = Object.keys(orderedIDMap);
|
121
|
-
findManyArgs.where = (0, _drizzleorm.inArray)(adapter.tables[tableName].id, orderedIDs);
|
122
100
|
} else {
|
123
101
|
findManyArgs.limit = limitArg === 0 ? undefined : limitArg;
|
124
102
|
const offset = skip || (page - 1) * limitArg;
|
@@ -197,4 +175,4 @@ const findMany = async function find({ adapter, fields, limit: limitArg, locale,
|
|
197
175
|
};
|
198
176
|
};
|
199
177
|
|
200
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { FindArgs } from 'payload/database'\nimport type { Field, PayloadRequest, TypeWithID } from 'payload/types'\n\nimport { inArray, sql } from 'drizzle-orm'\n\nimport type { PostgresAdapter } from '../types'\nimport type { ChainedMethods } from './chainMethods'\n\nimport buildQuery from '../queries/buildQuery'\nimport { transform } from '../transform/read'\nimport { buildFindManyArgs } from './buildFindManyArgs'\nimport { chainMethods } from './chainMethods'\n\ntype Args = Omit<FindArgs, 'collection'> & {\n  adapter: PostgresAdapter\n  fields: Field[]\n  tableName: string\n}\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  skip,\n  sort,\n  tableName,\n  where: whereArg,\n}: Args) {\n  const db = adapter.sessions[req.transactionID]?.db || adapter.drizzle\n  const table = adapter.tables[tableName]\n\n  const limit = limitArg ?? 10\n  let totalDocs: number\n  let totalPages: number\n  let hasPrevPage: boolean\n  let hasNextPage: boolean\n  let pagingCounter: number\n  let selectDistinctResult\n\n  const { joinAliases, joins, orderBy, selectFields, where } = await buildQuery({\n    adapter,\n    fields,\n    locale,\n    sort,\n    tableName,\n    where: whereArg,\n  })\n\n  const orderedIDMap: Record<number | string, number> = {}\n  let orderedIDs: (number | string)[]\n\n  const selectDistinctMethods: ChainedMethods = []\n\n  if (orderBy?.order && orderBy?.column) {\n    selectDistinctMethods.push({\n      args: [orderBy.order(orderBy.column)],\n      method: 'orderBy',\n    })\n  }\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    depth: 0,\n    fields,\n    tableName,\n  })\n\n  // only fetch IDs when a sort or where query is used that needs to be done on join tables, otherwise these can be done directly on the table in findMany\n  if (Object.keys(joins).length > 0 || joinAliases.length > 0) {\n    if (where) {\n      selectDistinctMethods.push({ args: [where], method: 'where' })\n    }\n\n    joinAliases.forEach(({ condition, table }) => {\n      selectDistinctMethods.push({\n        args: [table, condition],\n        method: 'leftJoin',\n      })\n    })\n\n    Object.entries(joins).forEach(([joinTable, condition]) => {\n      if (joinTable) {\n        selectDistinctMethods.push({\n          args: [adapter.tables[joinTable], condition],\n          method: 'leftJoin',\n        })\n      }\n    })\n\n    selectDistinctMethods.push({ args: [skip || (page - 1) * limit], method: 'offset' })\n    selectDistinctMethods.push({ args: [limit === 0 ? undefined : limit], method: 'limit' })\n\n    selectDistinctResult = await chainMethods({\n      methods: selectDistinctMethods,\n      query: db.selectDistinct(selectFields).from(table),\n    })\n\n    if (selectDistinctResult.length === 0) {\n      return {\n        docs: [],\n        hasNextPage: false,\n        hasPrevPage: false,\n        limit,\n        nextPage: null,\n        page: 1,\n        pagingCounter: 0,\n        prevPage: null,\n        totalDocs: 0,\n        totalPages: 0,\n      }\n    }\n    // set the id in an object for sorting later\n    selectDistinctResult.forEach(({ id }, i) => {\n      orderedIDMap[id as number | string] = i\n    })\n    orderedIDs = Object.keys(orderedIDMap)\n    findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)\n  } else {\n    findManyArgs.limit = limitArg === 0 ? undefined : limitArg\n\n    const offset = skip || (page - 1) * limitArg\n\n    if (!Number.isNaN(offset)) findManyArgs.offset = offset\n\n    if (where) {\n      findManyArgs.where = where\n    }\n    findManyArgs.orderBy = orderBy.order(orderBy.column)\n  }\n\n  const findPromise = db.query[tableName].findMany(findManyArgs)\n\n  if (pagination !== false && (orderedIDs ? orderedIDs?.length >= limit : true)) {\n    const selectCountMethods: ChainedMethods = []\n\n    joinAliases.forEach(({ condition, table }) => {\n      selectCountMethods.push({\n        args: [table, condition],\n        method: 'leftJoin',\n      })\n    })\n\n    Object.entries(joins).forEach(([joinTable, condition]) => {\n      if (joinTable) {\n        selectCountMethods.push({\n          args: [adapter.tables[joinTable], condition],\n          method: 'leftJoin',\n        })\n      }\n    })\n\n    const countResult = await chainMethods({\n      methods: selectCountMethods,\n      query: db\n        .select({\n          count: sql<number>`count\n              (DISTINCT ${adapter.tables[tableName].id})`,\n        })\n        .from(table)\n        .where(where),\n    })\n    totalDocs = Number(countResult[0].count)\n    totalPages = typeof limit === 'number' && limit !== 0 ? Math.ceil(totalDocs / limit) : 1\n    hasPrevPage = page > 1\n    hasNextPage = totalPages > page\n    pagingCounter = (page - 1) * limit + 1\n  }\n\n  const rawDocs = await findPromise\n  // sort rawDocs from selectQuery\n  if (Object.keys(orderedIDMap).length > 0) {\n    rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])\n  }\n\n  if (pagination === false || !totalDocs) {\n    totalDocs = rawDocs.length\n    totalPages = 1\n    pagingCounter = 1\n    hasPrevPage = false\n    hasNextPage = false\n  }\n\n  const docs = rawDocs.map((data: TypeWithID) => {\n    return transform({\n      config: adapter.payload.config,\n      data,\n      fields,\n    })\n  })\n\n  return {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs,\n    totalPages,\n  }\n}\n"],"names":["findMany","find","adapter","fields","limit","limitArg","locale","page","pagination","req","skip","sort","tableName","where","whereArg","db","sessions","transactionID","drizzle","table","tables","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","selectDistinctResult","joinAliases","joins","orderBy","selectFields","buildQuery","orderedIDMap","orderedIDs","selectDistinctMethods","order","column","push","args","method","findManyArgs","buildFindManyArgs","depth","Object","keys","length","forEach","condition","entries","joinTable","undefined","chainMethods","methods","query","selectDistinct","from","docs","nextPage","prevPage","id","i","inArray","offset","Number","isNaN","findPromise","selectCountMethods","countResult","select","count","sql","Math","ceil","rawDocs","a","b","map","data","transform","config","payload"],"mappings":"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"}
|
178
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/find/findMany.ts"],"sourcesContent":["import type { FindArgs } from 'payload/database'\nimport type { Field, PayloadRequest, TypeWithID } from 'payload/types'\n\nimport { inArray, sql } from 'drizzle-orm'\n\nimport type { PostgresAdapter } from '../types'\nimport type { ChainedMethods } from './chainMethods'\n\nimport buildQuery from '../queries/buildQuery'\nimport { selectDistinct } from '../queries/selectDistinct'\nimport { transform } from '../transform/read'\nimport { buildFindManyArgs } from './buildFindManyArgs'\nimport { chainMethods } from './chainMethods'\n\ntype Args = Omit<FindArgs, 'collection'> & {\n  adapter: PostgresAdapter\n  fields: Field[]\n  tableName: string\n}\n\nexport const findMany = async function find({\n  adapter,\n  fields,\n  limit: limitArg,\n  locale,\n  page = 1,\n  pagination,\n  req = {} as PayloadRequest,\n  skip,\n  sort,\n  tableName,\n  where: whereArg,\n}: Args) {\n  const db = adapter.sessions[req.transactionID]?.db || adapter.drizzle\n  const table = adapter.tables[tableName]\n\n  const limit = limitArg ?? 10\n  let totalDocs: number\n  let totalPages: number\n  let hasPrevPage: boolean\n  let hasNextPage: boolean\n  let pagingCounter: number\n\n  const { joinAliases, joins, orderBy, selectFields, where } = await buildQuery({\n    adapter,\n    fields,\n    locale,\n    sort,\n    tableName,\n    where: whereArg,\n  })\n\n  const orderedIDMap: Record<number | string, number> = {}\n  let orderedIDs: (number | string)[]\n\n  const selectDistinctMethods: ChainedMethods = []\n\n  if (orderBy?.order && orderBy?.column) {\n    selectDistinctMethods.push({\n      args: [orderBy.order(orderBy.column)],\n      method: 'orderBy',\n    })\n  }\n\n  const findManyArgs = buildFindManyArgs({\n    adapter,\n    depth: 0,\n    fields,\n    tableName,\n  })\n\n  selectDistinctMethods.push({ args: [skip || (page - 1) * limit], method: 'offset' })\n  selectDistinctMethods.push({ args: [limit === 0 ? undefined : limit], method: 'limit' })\n\n  const selectDistinctResult = await selectDistinct({\n    adapter,\n    chainedMethods: selectDistinctMethods,\n    db,\n    joinAliases,\n    joins,\n    selectFields,\n    tableName,\n    where,\n  })\n\n  if (selectDistinctResult) {\n    if (selectDistinctResult.length === 0) {\n      return {\n        docs: [],\n        hasNextPage: false,\n        hasPrevPage: false,\n        limit,\n        nextPage: null,\n        page: 1,\n        pagingCounter: 0,\n        prevPage: null,\n        totalDocs: 0,\n        totalPages: 0,\n      }\n    } else {\n      // set the id in an object for sorting later\n      selectDistinctResult.forEach(({ id }, i) => {\n        orderedIDMap[id] = i\n      })\n      orderedIDs = Object.keys(orderedIDMap)\n      findManyArgs.where = inArray(adapter.tables[tableName].id, orderedIDs)\n    }\n  } else {\n    findManyArgs.limit = limitArg === 0 ? undefined : limitArg\n\n    const offset = skip || (page - 1) * limitArg\n\n    if (!Number.isNaN(offset)) findManyArgs.offset = offset\n\n    if (where) {\n      findManyArgs.where = where\n    }\n    findManyArgs.orderBy = orderBy.order(orderBy.column)\n  }\n\n  const findPromise = db.query[tableName].findMany(findManyArgs)\n\n  if (pagination !== false && (orderedIDs ? orderedIDs?.length >= limit : true)) {\n    const selectCountMethods: ChainedMethods = []\n\n    joinAliases.forEach(({ condition, table }) => {\n      selectCountMethods.push({\n        args: [table, condition],\n        method: 'leftJoin',\n      })\n    })\n\n    Object.entries(joins).forEach(([joinTable, condition]) => {\n      if (joinTable) {\n        selectCountMethods.push({\n          args: [adapter.tables[joinTable], condition],\n          method: 'leftJoin',\n        })\n      }\n    })\n\n    const countResult = await chainMethods({\n      methods: selectCountMethods,\n      query: db\n        .select({\n          count: sql<number>`count\n              (DISTINCT ${adapter.tables[tableName].id})`,\n        })\n        .from(table)\n        .where(where),\n    })\n    totalDocs = Number(countResult[0].count)\n    totalPages = typeof limit === 'number' && limit !== 0 ? Math.ceil(totalDocs / limit) : 1\n    hasPrevPage = page > 1\n    hasNextPage = totalPages > page\n    pagingCounter = (page - 1) * limit + 1\n  }\n\n  const rawDocs = await findPromise\n  // sort rawDocs from selectQuery\n  if (Object.keys(orderedIDMap).length > 0) {\n    rawDocs.sort((a, b) => orderedIDMap[a.id] - orderedIDMap[b.id])\n  }\n\n  if (pagination === false || !totalDocs) {\n    totalDocs = rawDocs.length\n    totalPages = 1\n    pagingCounter = 1\n    hasPrevPage = false\n    hasNextPage = false\n  }\n\n  const docs = rawDocs.map((data: TypeWithID) => {\n    return transform({\n      config: adapter.payload.config,\n      data,\n      fields,\n    })\n  })\n\n  return {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs,\n    totalPages,\n  }\n}\n"],"names":["findMany","find","adapter","fields","limit","limitArg","locale","page","pagination","req","skip","sort","tableName","where","whereArg","db","sessions","transactionID","drizzle","table","tables","totalDocs","totalPages","hasPrevPage","hasNextPage","pagingCounter","joinAliases","joins","orderBy","selectFields","buildQuery","orderedIDMap","orderedIDs","selectDistinctMethods","order","column","push","args","method","findManyArgs","buildFindManyArgs","depth","undefined","selectDistinctResult","selectDistinct","chainedMethods","length","docs","nextPage","prevPage","forEach","id","i","Object","keys","inArray","offset","Number","isNaN","findPromise","query","selectCountMethods","condition","entries","joinTable","countResult","chainMethods","methods","select","count","sql","from","Math","ceil","rawDocs","a","b","map","data","transform","config","payload"],"mappings":"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"}
|
@@ -0,0 +1,23 @@
|
|
1
|
+
import type { QueryPromise, SQL } from 'drizzle-orm';
|
2
|
+
import type { ChainedMethods } from '../find/chainMethods';
|
3
|
+
import type { DrizzleDB, PostgresAdapter } from '../types';
|
4
|
+
import type { BuildQueryJoinAliases, BuildQueryJoins } from './buildQuery';
|
5
|
+
import { type GenericColumn } from '../types';
|
6
|
+
type Args = {
|
7
|
+
adapter: PostgresAdapter;
|
8
|
+
chainedMethods?: ChainedMethods;
|
9
|
+
db: DrizzleDB;
|
10
|
+
joinAliases: BuildQueryJoinAliases;
|
11
|
+
joins: BuildQueryJoins;
|
12
|
+
selectFields: Record<string, GenericColumn>;
|
13
|
+
tableName: string;
|
14
|
+
where: SQL;
|
15
|
+
};
|
16
|
+
/**
|
17
|
+
* Selects distinct records from a table only if there are joins that need to be used, otherwise return null
|
18
|
+
*/
|
19
|
+
export declare const selectDistinct: ({ adapter, chainedMethods, db, joinAliases, joins, selectFields, tableName, where, }: Args) => QueryPromise<Record<string, GenericColumn> & {
|
20
|
+
id: number | string;
|
21
|
+
}[]>;
|
22
|
+
export {};
|
23
|
+
//# sourceMappingURL=selectDistinct.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"selectDistinct.d.ts","sourceRoot":"","sources":["../../src/queries/selectDistinct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG1E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,EAAE,EAAE,SAAS,CAAA;IACb,WAAW,EAAE,qBAAqB,CAAA;IAClC,KAAK,EAAE,eAAe,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,yFASxB,IAAI,KAAG,aAAa,OAAO,MAAM,EAAE,aAAa,CAAC,GAAG;IAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAAE,CA2B/E,CAAA"}
|
@@ -0,0 +1,49 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
3
|
+
value: true
|
4
|
+
});
|
5
|
+
Object.defineProperty(exports, "selectDistinct", {
|
6
|
+
enumerable: true,
|
7
|
+
get: function() {
|
8
|
+
return selectDistinct;
|
9
|
+
}
|
10
|
+
});
|
11
|
+
const _chainMethods = require("../find/chainMethods");
|
12
|
+
const selectDistinct = ({ adapter, chainedMethods = [], db, joinAliases, joins, selectFields, tableName, where })=>{
|
13
|
+
if (Object.keys(joins).length > 0 || joinAliases.length > 0) {
|
14
|
+
if (where) {
|
15
|
+
chainedMethods.push({
|
16
|
+
args: [
|
17
|
+
where
|
18
|
+
],
|
19
|
+
method: 'where'
|
20
|
+
});
|
21
|
+
}
|
22
|
+
joinAliases.forEach(({ condition, table })=>{
|
23
|
+
chainedMethods.push({
|
24
|
+
args: [
|
25
|
+
table,
|
26
|
+
condition
|
27
|
+
],
|
28
|
+
method: 'leftJoin'
|
29
|
+
});
|
30
|
+
});
|
31
|
+
Object.entries(joins).forEach(([joinTable, condition])=>{
|
32
|
+
if (joinTable) {
|
33
|
+
chainedMethods.push({
|
34
|
+
args: [
|
35
|
+
adapter.tables[joinTable],
|
36
|
+
condition
|
37
|
+
],
|
38
|
+
method: 'leftJoin'
|
39
|
+
});
|
40
|
+
}
|
41
|
+
});
|
42
|
+
return (0, _chainMethods.chainMethods)({
|
43
|
+
methods: chainedMethods,
|
44
|
+
query: db.selectDistinct(selectFields).from(adapter.tables[tableName])
|
45
|
+
});
|
46
|
+
}
|
47
|
+
};
|
48
|
+
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWVyaWVzL3NlbGVjdERpc3RpbmN0LnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUXVlcnlQcm9taXNlLCBTUUwgfSBmcm9tICdkcml6emxlLW9ybSdcblxuaW1wb3J0IHR5cGUgeyBDaGFpbmVkTWV0aG9kcyB9IGZyb20gJy4uL2ZpbmQvY2hhaW5NZXRob2RzJ1xuaW1wb3J0IHR5cGUgeyBEcml6emxlREIsIFBvc3RncmVzQWRhcHRlciB9IGZyb20gJy4uL3R5cGVzJ1xuaW1wb3J0IHR5cGUgeyBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXMsIEJ1aWxkUXVlcnlKb2lucyB9IGZyb20gJy4vYnVpbGRRdWVyeSdcblxuaW1wb3J0IHsgY2hhaW5NZXRob2RzIH0gZnJvbSAnLi4vZmluZC9jaGFpbk1ldGhvZHMnXG5pbXBvcnQgeyB0eXBlIEdlbmVyaWNDb2x1bW4gfSBmcm9tICcuLi90eXBlcydcblxudHlwZSBBcmdzID0ge1xuICBhZGFwdGVyOiBQb3N0Z3Jlc0FkYXB0ZXJcbiAgY2hhaW5lZE1ldGhvZHM/OiBDaGFpbmVkTWV0aG9kc1xuICBkYjogRHJpenpsZURCXG4gIGpvaW5BbGlhc2VzOiBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXNcbiAgam9pbnM6IEJ1aWxkUXVlcnlKb2luc1xuICBzZWxlY3RGaWVsZHM6IFJlY29yZDxzdHJpbmcsIEdlbmVyaWNDb2x1bW4+XG4gIHRhYmxlTmFtZTogc3RyaW5nXG4gIHdoZXJlOiBTUUxcbn1cblxuLyoqXG4gKiBTZWxlY3RzIGRpc3RpbmN0IHJlY29yZHMgZnJvbSBhIHRhYmxlIG9ubHkgaWYgdGhlcmUgYXJlIGpvaW5zIHRoYXQgbmVlZCB0byBiZSB1c2VkLCBvdGhlcndpc2UgcmV0dXJuIG51bGxcbiAqL1xuZXhwb3J0IGNvbnN0IHNlbGVjdERpc3RpbmN0ID0gKHtcbiAgYWRhcHRlcixcbiAgY2hhaW5lZE1ldGhvZHMgPSBbXSxcbiAgZGIsXG4gIGpvaW5BbGlhc2VzLFxuICBqb2lucyxcbiAgc2VsZWN0RmllbGRzLFxuICB0YWJsZU5hbWUsXG4gIHdoZXJlLFxufTogQXJncyk6IFF1ZXJ5UHJvbWlzZTxSZWNvcmQ8c3RyaW5nLCBHZW5lcmljQ29sdW1uPiAmIHsgaWQ6IG51bWJlciB8IHN0cmluZyB9W10+ID0+IHtcbiAgaWYgKE9iamVjdC5rZXlzKGpvaW5zKS5sZW5ndGggPiAwIHx8IGpvaW5BbGlhc2VzLmxlbmd0aCA+IDApIHtcbiAgICBpZiAod2hlcmUpIHtcbiAgICAgIGNoYWluZWRNZXRob2RzLnB1c2goeyBhcmdzOiBbd2hlcmVdLCBtZXRob2Q6ICd3aGVyZScgfSlcbiAgICB9XG5cbiAgICBqb2luQWxpYXNlcy5mb3JFYWNoKCh7IGNvbmRpdGlvbiwgdGFibGUgfSkgPT4ge1xuICAgICAgY2hhaW5lZE1ldGhvZHMucHVzaCh7XG4gICAgICAgIGFyZ3M6IFt0YWJsZSwgY29uZGl0aW9uXSxcbiAgICAgICAgbWV0aG9kOiAnbGVmdEpvaW4nLFxuICAgICAgfSlcbiAgICB9KVxuXG4gICAgT2JqZWN0LmVudHJpZXMoam9pbnMpLmZvckVhY2goKFtqb2luVGFibGUsIGNvbmRpdGlvbl0pID0+IHtcbiAgICAgIGlmIChqb2luVGFibGUpIHtcbiAgICAgICAgY2hhaW5lZE1ldGhvZHMucHVzaCh7XG4gICAgICAgICAgYXJnczogW2FkYXB0ZXIudGFibGVzW2pvaW5UYWJsZV0sIGNvbmRpdGlvbl0sXG4gICAgICAgICAgbWV0aG9kOiAnbGVmdEpvaW4nLFxuICAgICAgICB9KVxuICAgICAgfVxuICAgIH0pXG5cbiAgICByZXR1cm4gY2hhaW5NZXRob2RzKHtcbiAgICAgIG1ldGhvZHM6IGNoYWluZWRNZXRob2RzLFxuICAgICAgcXVlcnk6IGRiLnNlbGVjdERpc3RpbmN0KHNlbGVjdEZpZWxkcykuZnJvbShhZGFwdGVyLnRhYmxlc1t0YWJsZU5hbWVdKSxcbiAgICB9KVxuICB9XG59XG4iXSwibmFtZXMiOlsic2VsZWN0RGlzdGluY3QiLCJhZGFwdGVyIiwiY2hhaW5lZE1ldGhvZHMiLCJkYiIsImpvaW5BbGlhc2VzIiwiam9pbnMiLCJzZWxlY3RGaWVsZHMiLCJ0YWJsZU5hbWUiLCJ3aGVyZSIsIk9iamVjdCIsImtleXMiLCJsZW5ndGgiLCJwdXNoIiwiYXJncyIsIm1ldGhvZCIsImZvckVhY2giLCJjb25kaXRpb24iLCJ0YWJsZSIsImVudHJpZXMiLCJqb2luVGFibGUiLCJ0YWJsZXMiLCJjaGFpbk1ldGhvZHMiLCJtZXRob2RzIiwicXVlcnkiLCJmcm9tIl0sIm1hcHBpbmdzIjoiOzs7OytCQXVCYUE7OztlQUFBQTs7OzhCQWpCZ0I7QUFpQnRCLE1BQU1BLGlCQUFpQixDQUFDLEVBQzdCQyxPQUFPLEVBQ1BDLGlCQUFpQixFQUFFLEVBQ25CQyxFQUFFLEVBQ0ZDLFdBQVcsRUFDWEMsS0FBSyxFQUNMQyxZQUFZLEVBQ1pDLFNBQVMsRUFDVEMsS0FBSyxFQUNBO0lBQ0wsSUFBSUMsT0FBT0MsSUFBSSxDQUFDTCxPQUFPTSxNQUFNLEdBQUcsS0FBS1AsWUFBWU8sTUFBTSxHQUFHLEdBQUc7UUFDM0QsSUFBSUgsT0FBTztZQUNUTixlQUFlVSxJQUFJLENBQUM7Z0JBQUVDLE1BQU07b0JBQUNMO2lCQUFNO2dCQUFFTSxRQUFRO1lBQVE7UUFDdkQ7UUFFQVYsWUFBWVcsT0FBTyxDQUFDLENBQUMsRUFBRUMsU0FBUyxFQUFFQyxLQUFLLEVBQUU7WUFDdkNmLGVBQWVVLElBQUksQ0FBQztnQkFDbEJDLE1BQU07b0JBQUNJO29CQUFPRDtpQkFBVTtnQkFDeEJGLFFBQVE7WUFDVjtRQUNGO1FBRUFMLE9BQU9TLE9BQU8sQ0FBQ2IsT0FBT1UsT0FBTyxDQUFDLENBQUMsQ0FBQ0ksV0FBV0gsVUFBVTtZQUNuRCxJQUFJRyxXQUFXO2dCQUNiakIsZUFBZVUsSUFBSSxDQUFDO29CQUNsQkMsTUFBTTt3QkFBQ1osUUFBUW1CLE1BQU0sQ0FBQ0QsVUFBVTt3QkFBRUg7cUJBQVU7b0JBQzVDRixRQUFRO2dCQUNWO1lBQ0Y7UUFDRjtRQUVBLE9BQU9PLElBQUFBLDBCQUFZLEVBQUM7WUFDbEJDLFNBQVNwQjtZQUNUcUIsT0FBT3BCLEdBQUdILGNBQWMsQ0FBQ00sY0FBY2tCLElBQUksQ0FBQ3ZCLFFBQVFtQixNQUFNLENBQUNiLFVBQVU7UUFDdkU7SUFDRjtBQUNGIn0=
|
package/dist/update.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAUjD,eAAO,MAAM,SAAS,EAAE,
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../src/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAUjD,eAAO,MAAM,SAAS,EAAE,SA6CvB,CAAA"}
|
package/dist/update.js
CHANGED
@@ -9,8 +9,8 @@ Object.defineProperty(exports, "updateOne", {
|
|
9
9
|
}
|
10
10
|
});
|
11
11
|
const _tosnakecase = /*#__PURE__*/ _interop_require_default(require("to-snake-case"));
|
12
|
-
const _chainMethods = require("./find/chainMethods");
|
13
12
|
const _buildQuery = /*#__PURE__*/ _interop_require_default(require("./queries/buildQuery"));
|
13
|
+
const _selectDistinct = require("./queries/selectDistinct");
|
14
14
|
const _upsertRow = require("./upsertRow");
|
15
15
|
function _interop_require_default(obj) {
|
16
16
|
return obj && obj.__esModule ? obj : {
|
@@ -26,6 +26,7 @@ const updateOne = async function updateOne({ id, collection: collectionSlug, dat
|
|
26
26
|
equals: id
|
27
27
|
}
|
28
28
|
};
|
29
|
+
let idToUpdate = id;
|
29
30
|
const { joinAliases, joins, selectFields, where } = await (0, _buildQuery.default)({
|
30
31
|
adapter: this,
|
31
32
|
fields: collection.fields,
|
@@ -33,51 +34,25 @@ const updateOne = async function updateOne({ id, collection: collectionSlug, dat
|
|
33
34
|
tableName,
|
34
35
|
where: whereToUse
|
35
36
|
});
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
if (where) {
|
41
|
-
selectDistinctMethods.push({
|
42
|
-
args: [
|
43
|
-
where
|
44
|
-
],
|
45
|
-
method: 'where'
|
46
|
-
});
|
47
|
-
}
|
48
|
-
joinAliases.forEach(({ condition, table })=>{
|
49
|
-
selectDistinctMethods.push({
|
37
|
+
const selectDistinctResult = await (0, _selectDistinct.selectDistinct)({
|
38
|
+
adapter: this,
|
39
|
+
chainedMethods: [
|
40
|
+
{
|
50
41
|
args: [
|
51
|
-
|
52
|
-
condition
|
42
|
+
1
|
53
43
|
],
|
54
|
-
method: '
|
55
|
-
});
|
56
|
-
});
|
57
|
-
Object.entries(joins).forEach(([joinTable, condition])=>{
|
58
|
-
if (joinTable) {
|
59
|
-
selectDistinctMethods.push({
|
60
|
-
args: [
|
61
|
-
this.tables[joinTable],
|
62
|
-
condition
|
63
|
-
],
|
64
|
-
method: 'leftJoin'
|
65
|
-
});
|
44
|
+
method: 'limit'
|
66
45
|
}
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
});
|
78
|
-
if (selectDistinctResult?.[0]?.id) {
|
79
|
-
idToUpdate = selectDistinctResult?.[0]?.id;
|
80
|
-
}
|
46
|
+
],
|
47
|
+
db,
|
48
|
+
joinAliases,
|
49
|
+
joins,
|
50
|
+
selectFields,
|
51
|
+
tableName,
|
52
|
+
where
|
53
|
+
});
|
54
|
+
if (selectDistinctResult?.[0]?.id) {
|
55
|
+
idToUpdate = selectDistinctResult?.[0]?.id;
|
81
56
|
}
|
82
57
|
const result = await (0, _upsertRow.upsertRow)({
|
83
58
|
id: idToUpdate,
|
@@ -86,10 +61,10 @@ const updateOne = async function updateOne({ id, collection: collectionSlug, dat
|
|
86
61
|
db,
|
87
62
|
fields: collection.fields,
|
88
63
|
operation: 'update',
|
89
|
-
|
90
|
-
|
64
|
+
req,
|
65
|
+
tableName: (0, _tosnakecase.default)(collectionSlug)
|
91
66
|
});
|
92
67
|
return result;
|
93
68
|
};
|
94
69
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy91cGRhdGUudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBVcGRhdGVPbmUgfSBmcm9tICdwYXlsb2FkL2RhdGFiYXNlJ1xuXG5pbXBvcnQgdG9TbmFrZUNhc2UgZnJvbSAndG8tc25ha2UtY2FzZSdcblxuaW1wb3J0IHR5cGUgeyBQb3N0Z3Jlc0FkYXB0ZXIgfSBmcm9tICcuL3R5cGVzJ1xuXG5pbXBvcnQgYnVpbGRRdWVyeSBmcm9tICcuL3F1ZXJpZXMvYnVpbGRRdWVyeSdcbmltcG9ydCB7IHNlbGVjdERpc3RpbmN0IH0gZnJvbSAnLi9xdWVyaWVzL3NlbGVjdERpc3RpbmN0J1xuaW1wb3J0IHsgdXBzZXJ0Um93IH0gZnJvbSAnLi91cHNlcnRSb3cnXG5cbmV4cG9ydCBjb25zdCB1cGRhdGVPbmU6IFVwZGF0ZU9uZSA9IGFzeW5jIGZ1bmN0aW9uIHVwZGF0ZU9uZShcbiAgdGhpczogUG9zdGdyZXNBZGFwdGVyLFxuICB7IGlkLCBjb2xsZWN0aW9uOiBjb2xsZWN0aW9uU2x1ZywgZGF0YSwgZHJhZnQsIGxvY2FsZSwgcmVxLCB3aGVyZTogd2hlcmVBcmcgfSxcbikge1xuICBjb25zdCBkYiA9IHRoaXMuc2Vzc2lvbnNbcmVxLnRyYW5zYWN0aW9uSURdPy5kYiB8fCB0aGlzLmRyaXp6bGVcbiAgY29uc3QgY29sbGVjdGlvbiA9IHRoaXMucGF5bG9hZC5jb2xsZWN0aW9uc1tjb2xsZWN0aW9uU2x1Z10uY29uZmlnXG4gIGNvbnN0IHRhYmxlTmFtZSA9IHRvU25ha2VDYXNlKGNvbGxlY3Rpb25TbHVnKVxuICBjb25zdCB3aGVyZVRvVXNlID0gd2hlcmVBcmcgfHwgeyBpZDogeyBlcXVhbHM6IGlkIH0gfVxuICBsZXQgaWRUb1VwZGF0ZSA9IGlkXG5cbiAgY29uc3QgeyBqb2luQWxpYXNlcywgam9pbnMsIHNlbGVjdEZpZWxkcywgd2hlcmUgfSA9IGF3YWl0IGJ1aWxkUXVlcnkoe1xuICAgIGFkYXB0ZXI6IHRoaXMsXG4gICAgZmllbGRzOiBjb2xsZWN0aW9uLmZpZWxkcyxcbiAgICBsb2NhbGUsXG4gICAgdGFibGVOYW1lLFxuICAgIHdoZXJlOiB3aGVyZVRvVXNlLFxuICB9KVxuXG4gIGNvbnN0IHNlbGVjdERpc3RpbmN0UmVzdWx0ID0gYXdhaXQgc2VsZWN0RGlzdGluY3Qoe1xuICAgIGFkYXB0ZXI6IHRoaXMsXG4gICAgY2hhaW5lZE1ldGhvZHM6IFt7IGFyZ3M6IFsxXSwgbWV0aG9kOiAnbGltaXQnIH1dLFxuICAgIGRiLFxuICAgIGpvaW5BbGlhc2VzLFxuICAgIGpvaW5zLFxuICAgIHNlbGVjdEZpZWxkcyxcbiAgICB0YWJsZU5hbWUsXG4gICAgd2hlcmUsXG4gIH0pXG5cbiAgaWYgKHNlbGVjdERpc3RpbmN0UmVzdWx0Py5bMF0/LmlkKSB7XG4gICAgaWRUb1VwZGF0ZSA9IHNlbGVjdERpc3RpbmN0UmVzdWx0Py5bMF0/LmlkXG4gIH1cblxuICBjb25zdCByZXN1bHQgPSBhd2FpdCB1cHNlcnRSb3coe1xuICAgIGlkOiBpZFRvVXBkYXRlLFxuICAgIGFkYXB0ZXI6IHRoaXMsXG4gICAgZGF0YSxcbiAgICBkYixcbiAgICBmaWVsZHM6IGNvbGxlY3Rpb24uZmllbGRzLFxuICAgIG9wZXJhdGlvbjogJ3VwZGF0ZScsXG4gICAgcmVxLFxuICAgIHRhYmxlTmFtZTogdG9TbmFrZUNhc2UoY29sbGVjdGlvblNsdWcpLFxuICB9KVxuXG4gIHJldHVybiByZXN1bHRcbn1cbiJdLCJuYW1lcyI6WyJ1cGRhdGVPbmUiLCJpZCIsImNvbGxlY3Rpb24iLCJjb2xsZWN0aW9uU2x1ZyIsImRhdGEiLCJkcmFmdCIsImxvY2FsZSIsInJlcSIsIndoZXJlIiwid2hlcmVBcmciLCJkYiIsInNlc3Npb25zIiwidHJhbnNhY3Rpb25JRCIsImRyaXp6bGUiLCJwYXlsb2FkIiwiY29sbGVjdGlvbnMiLCJjb25maWciLCJ0YWJsZU5hbWUiLCJ0b1NuYWtlQ2FzZSIsIndoZXJlVG9Vc2UiLCJlcXVhbHMiLCJpZFRvVXBkYXRlIiwiam9pbkFsaWFzZXMiLCJqb2lucyIsInNlbGVjdEZpZWxkcyIsImJ1aWxkUXVlcnkiLCJhZGFwdGVyIiwiZmllbGRzIiwic2VsZWN0RGlzdGluY3RSZXN1bHQiLCJzZWxlY3REaXN0aW5jdCIsImNoYWluZWRNZXRob2RzIiwiYXJncyIsIm1ldGhvZCIsInJlc3VsdCIsInVwc2VydFJvdyIsIm9wZXJhdGlvbiJdLCJtYXBwaW5ncyI6Ijs7OzsrQkFVYUE7OztlQUFBQTs7O29FQVJXO21FQUlEO2dDQUNROzJCQUNMOzs7Ozs7QUFFbkIsTUFBTUEsWUFBdUIsZUFBZUEsVUFFakQsRUFBRUMsRUFBRSxFQUFFQyxZQUFZQyxjQUFjLEVBQUVDLElBQUksRUFBRUMsS0FBSyxFQUFFQyxNQUFNLEVBQUVDLEdBQUcsRUFBRUMsT0FBT0MsUUFBUSxFQUFFO0lBRTdFLE1BQU1DLEtBQUssSUFBSSxDQUFDQyxRQUFRLENBQUNKLElBQUlLLGFBQWEsQ0FBQyxFQUFFRixNQUFNLElBQUksQ0FBQ0csT0FBTztJQUMvRCxNQUFNWCxhQUFhLElBQUksQ0FBQ1ksT0FBTyxDQUFDQyxXQUFXLENBQUNaLGVBQWUsQ0FBQ2EsTUFBTTtJQUNsRSxNQUFNQyxZQUFZQyxJQUFBQSxvQkFBVyxFQUFDZjtJQUM5QixNQUFNZ0IsYUFBYVYsWUFBWTtRQUFFUixJQUFJO1lBQUVtQixRQUFRbkI7UUFBRztJQUFFO0lBQ3BELElBQUlvQixhQUFhcEI7SUFFakIsTUFBTSxFQUFFcUIsV0FBVyxFQUFFQyxLQUFLLEVBQUVDLFlBQVksRUFBRWhCLEtBQUssRUFBRSxHQUFHLE1BQU1pQixJQUFBQSxtQkFBVSxFQUFDO1FBQ25FQyxTQUFTLElBQUk7UUFDYkMsUUFBUXpCLFdBQVd5QixNQUFNO1FBQ3pCckI7UUFDQVc7UUFDQVQsT0FBT1c7SUFDVDtJQUVBLE1BQU1TLHVCQUF1QixNQUFNQyxJQUFBQSw4QkFBYyxFQUFDO1FBQ2hESCxTQUFTLElBQUk7UUFDYkksZ0JBQWdCO1lBQUM7Z0JBQUVDLE1BQU07b0JBQUM7aUJBQUU7Z0JBQUVDLFFBQVE7WUFBUTtTQUFFO1FBQ2hEdEI7UUFDQVk7UUFDQUM7UUFDQUM7UUFDQVA7UUFDQVQ7SUFDRjtJQUVBLElBQUlvQixzQkFBc0IsQ0FBQyxFQUFFLEVBQUUzQixJQUFJO1FBQ2pDb0IsYUFBYU8sc0JBQXNCLENBQUMsRUFBRSxFQUFFM0I7SUFDMUM7SUFFQSxNQUFNZ0MsU0FBUyxNQUFNQyxJQUFBQSxvQkFBUyxFQUFDO1FBQzdCakMsSUFBSW9CO1FBQ0pLLFNBQVMsSUFBSTtRQUNidEI7UUFDQU07UUFDQWlCLFFBQVF6QixXQUFXeUIsTUFBTTtRQUN6QlEsV0FBVztRQUNYNUI7UUFDQVUsV0FBV0MsSUFBQUEsb0JBQVcsRUFBQ2Y7SUFDekI7SUFFQSxPQUFPOEI7QUFDVCJ9
|
package/package.json
CHANGED
@@ -1,8 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@payloadcms/db-postgres",
|
3
|
-
"version": "0.7.
|
3
|
+
"version": "0.7.1",
|
4
4
|
"description": "The officially supported Postgres database adapter for Payload",
|
5
|
-
"repository":
|
5
|
+
"repository": {
|
6
|
+
"type": "git",
|
7
|
+
"url": "https://github.com/payloadcms/payload.git",
|
8
|
+
"directory": "packages/db-postgres"
|
9
|
+
},
|
6
10
|
"license": "MIT",
|
7
11
|
"homepage": "https://payloadcms.com",
|
8
12
|
"author": {
|
@@ -25,8 +29,8 @@
|
|
25
29
|
"devDependencies": {
|
26
30
|
"@types/pg": "8.10.2",
|
27
31
|
"@types/to-snake-case": "1.0.0",
|
28
|
-
"
|
29
|
-
"
|
32
|
+
"@payloadcms/eslint-config": "1.1.1",
|
33
|
+
"payload": "2.12.0"
|
30
34
|
},
|
31
35
|
"peerDependencies": {
|
32
36
|
"payload": "^2.0.0"
|