@casekit/orm 0.0.1-alpha.16 → 0.0.1-alpha.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/queries/find/tests/findMany.lateral.test.d.ts +2 -0
- package/lib/queries/find/tests/findMany.lateral.test.d.ts.map +1 -0
- package/lib/queries/find/tests/findMany.lateral.test.js +86 -0
- package/lib/queries/find/tests/findMany.lateral.test.js.map +1 -0
- package/lib/queries/findMany.d.ts.map +1 -1
- package/lib/queries/findMany.js +17 -5
- package/lib/queries/findMany.js.map +1 -1
- package/package.json +1 -1
- package/src/queries/find/tests/findMany.lateral.test.ts +90 -0
- package/src/queries/findMany.ts +48 -9
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"findMany.lateral.test.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.lateral.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { describe, expect, test } from "vitest";
|
|
2
|
+
import { db } from "../../../test/db";
|
|
3
|
+
import { seed } from "../../../test/seed";
|
|
4
|
+
describe("findMany", () => {
|
|
5
|
+
test("it can apply lateral clauses to queries with 1:N relations without creating duplicates", async () => {
|
|
6
|
+
await db.transact(async (db) => {
|
|
7
|
+
await seed(db, {
|
|
8
|
+
users: [
|
|
9
|
+
{
|
|
10
|
+
username: "Russell",
|
|
11
|
+
tenants: [{ name: "Popova Park", posts: 3 }],
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
username: "Eliza",
|
|
15
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
16
|
+
},
|
|
17
|
+
],
|
|
18
|
+
});
|
|
19
|
+
const result = await db.findMany("post", {
|
|
20
|
+
select: ["title"],
|
|
21
|
+
include: {
|
|
22
|
+
author: {
|
|
23
|
+
select: ["username"],
|
|
24
|
+
include: {
|
|
25
|
+
posts: {
|
|
26
|
+
select: ["title"],
|
|
27
|
+
orderBy: ["title"],
|
|
28
|
+
},
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
orderBy: ["title"],
|
|
33
|
+
});
|
|
34
|
+
expect(result).toEqual([
|
|
35
|
+
{
|
|
36
|
+
title: "Post a",
|
|
37
|
+
author: {
|
|
38
|
+
username: "Russell",
|
|
39
|
+
posts: [
|
|
40
|
+
{ title: "Post a" },
|
|
41
|
+
{ title: "Post b" },
|
|
42
|
+
{ title: "Post c" },
|
|
43
|
+
],
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
title: "Post b",
|
|
48
|
+
author: {
|
|
49
|
+
username: "Russell",
|
|
50
|
+
posts: [
|
|
51
|
+
{ title: "Post a" },
|
|
52
|
+
{ title: "Post b" },
|
|
53
|
+
{ title: "Post c" },
|
|
54
|
+
],
|
|
55
|
+
},
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
title: "Post c",
|
|
59
|
+
author: {
|
|
60
|
+
username: "Russell",
|
|
61
|
+
posts: [
|
|
62
|
+
{ title: "Post a" },
|
|
63
|
+
{ title: "Post b" },
|
|
64
|
+
{ title: "Post c" },
|
|
65
|
+
],
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
title: "Post d",
|
|
70
|
+
author: {
|
|
71
|
+
username: "Eliza",
|
|
72
|
+
posts: [{ title: "Post d" }, { title: "Post e" }],
|
|
73
|
+
},
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
title: "Post e",
|
|
77
|
+
author: {
|
|
78
|
+
username: "Eliza",
|
|
79
|
+
posts: [{ title: "Post d" }, { title: "Post e" }],
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
]);
|
|
83
|
+
}, { rollback: true });
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
//# sourceMappingURL=findMany.lateral.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"findMany.lateral.test.js","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.lateral.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACtB,IAAI,CAAC,wFAAwF,EAAE,KAAK,IAAI,EAAE;QACtG,MAAM,EAAE,CAAC,QAAQ,CACb,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,IAAI,CAAC,EAAE,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,QAAQ,EAAE,SAAS;wBACnB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;qBAC/C;oBACD;wBACI,QAAQ,EAAE,OAAO;wBACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;qBAC/C;iBACJ;aACJ,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACrC,MAAM,EAAE,CAAC,OAAO,CAAC;gBACjB,OAAO,EAAE;oBACL,MAAM,EAAE;wBACJ,MAAM,EAAE,CAAC,UAAU,CAAC;wBACpB,OAAO,EAAE;4BACL,KAAK,EAAE;gCACH,MAAM,EAAE,CAAC,OAAO,CAAC;gCACjB,OAAO,EAAE,CAAC,OAAO,CAAC;6BACrB;yBACJ;qBACJ;iBACJ;gBACD,OAAO,EAAE,CAAC,OAAO,CAAC;aACrB,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACnB;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE;4BACH,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtB;qBACJ;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE;4BACH,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtB;qBACJ;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE;4BACH,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;4BACnB,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtB;qBACJ;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,OAAO;wBACjB,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;qBACpD;iBACJ;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,MAAM,EAAE;wBACJ,QAAQ,EAAE,OAAO;wBACjB,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;qBACpD;iBACJ;aACJ,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,eAAO,MAAM,QAAQ,SACX,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,cAAc,uCAiJxB,CAAC"}
|
package/lib/queries/findMany.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { dropRight, get, groupBy, set } from "lodash-es";
|
|
1
|
+
import { dropRight, get, groupBy, isEqual, mergeWith, set, uniqWith, } from "lodash-es";
|
|
2
2
|
import hash from "object-hash";
|
|
3
3
|
import { OrmError } from "../errors";
|
|
4
4
|
import { logger } from "../logger";
|
|
@@ -26,9 +26,15 @@ export const findMany = async (conn, config, m, query) => {
|
|
|
26
26
|
const fetchIncludedOneToManyRelations = getIncludedOneToManyRelations(config, m, query).map(({ model, relation, query, path }) => {
|
|
27
27
|
const pk = config.models[model].primaryKey;
|
|
28
28
|
const fk = ensureArray(relation.foreignKey);
|
|
29
|
-
const
|
|
29
|
+
const lateralValues = mergeWith(Object.fromEntries(fk.map((c) => [c, []])), ...uniqWith(results.map((result) => {
|
|
30
|
+
return Object.fromEntries(fk.map((c, index) => [
|
|
31
|
+
c,
|
|
32
|
+
[get(result, [...dropRight(path, 1), pk[index]])],
|
|
33
|
+
]));
|
|
34
|
+
}), isEqual), (a, b) => a.concat(b));
|
|
35
|
+
const lateralBy = fk.map((c) => ({
|
|
30
36
|
column: c,
|
|
31
|
-
values:
|
|
37
|
+
values: lateralValues[c],
|
|
32
38
|
}));
|
|
33
39
|
return findMany(conn, config, relation.model, {
|
|
34
40
|
...query,
|
|
@@ -59,9 +65,15 @@ export const findMany = async (conn, config, m, query) => {
|
|
|
59
65
|
}
|
|
60
66
|
const pk = config.models[model].primaryKey;
|
|
61
67
|
const fk = ensureArray(relation.foreignKey);
|
|
62
|
-
const
|
|
68
|
+
const lateralValues = mergeWith(Object.fromEntries(fk.map((c) => [c, []])), ...uniqWith(results.map((result) => {
|
|
69
|
+
return Object.fromEntries(fk.map((c, index) => [
|
|
70
|
+
c,
|
|
71
|
+
[get(result, [...dropRight(path, 1), pk[index]])],
|
|
72
|
+
]));
|
|
73
|
+
}), isEqual), (a, b) => a.concat(b));
|
|
74
|
+
const lateralBy = fk.map((c) => ({
|
|
63
75
|
column: c,
|
|
64
|
-
values:
|
|
76
|
+
values: lateralValues[c],
|
|
65
77
|
}));
|
|
66
78
|
return findMany(conn, config, relation.through, {
|
|
67
79
|
select: ensureArray(relation.foreignKey),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findMany.js","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"findMany.js","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { describe, expect, test } from "vitest";
|
|
2
|
+
|
|
3
|
+
import { db } from "../../../test/db";
|
|
4
|
+
import { seed } from "../../../test/seed";
|
|
5
|
+
|
|
6
|
+
describe("findMany", () => {
|
|
7
|
+
test("it can apply lateral clauses to queries with 1:N relations without creating duplicates", async () => {
|
|
8
|
+
await db.transact(
|
|
9
|
+
async (db) => {
|
|
10
|
+
await seed(db, {
|
|
11
|
+
users: [
|
|
12
|
+
{
|
|
13
|
+
username: "Russell",
|
|
14
|
+
tenants: [{ name: "Popova Park", posts: 3 }],
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
username: "Eliza",
|
|
18
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
19
|
+
},
|
|
20
|
+
],
|
|
21
|
+
});
|
|
22
|
+
const result = await db.findMany("post", {
|
|
23
|
+
select: ["title"],
|
|
24
|
+
include: {
|
|
25
|
+
author: {
|
|
26
|
+
select: ["username"],
|
|
27
|
+
include: {
|
|
28
|
+
posts: {
|
|
29
|
+
select: ["title"],
|
|
30
|
+
orderBy: ["title"],
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
orderBy: ["title"],
|
|
36
|
+
});
|
|
37
|
+
expect(result).toEqual([
|
|
38
|
+
{
|
|
39
|
+
title: "Post a",
|
|
40
|
+
author: {
|
|
41
|
+
username: "Russell",
|
|
42
|
+
posts: [
|
|
43
|
+
{ title: "Post a" },
|
|
44
|
+
{ title: "Post b" },
|
|
45
|
+
{ title: "Post c" },
|
|
46
|
+
],
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
title: "Post b",
|
|
51
|
+
author: {
|
|
52
|
+
username: "Russell",
|
|
53
|
+
posts: [
|
|
54
|
+
{ title: "Post a" },
|
|
55
|
+
{ title: "Post b" },
|
|
56
|
+
{ title: "Post c" },
|
|
57
|
+
],
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
title: "Post c",
|
|
62
|
+
author: {
|
|
63
|
+
username: "Russell",
|
|
64
|
+
posts: [
|
|
65
|
+
{ title: "Post a" },
|
|
66
|
+
{ title: "Post b" },
|
|
67
|
+
{ title: "Post c" },
|
|
68
|
+
],
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
title: "Post d",
|
|
73
|
+
author: {
|
|
74
|
+
username: "Eliza",
|
|
75
|
+
posts: [{ title: "Post d" }, { title: "Post e" }],
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
title: "Post e",
|
|
80
|
+
author: {
|
|
81
|
+
username: "Eliza",
|
|
82
|
+
posts: [{ title: "Post d" }, { title: "Post e" }],
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
]);
|
|
86
|
+
},
|
|
87
|
+
{ rollback: true },
|
|
88
|
+
);
|
|
89
|
+
});
|
|
90
|
+
});
|
package/src/queries/findMany.ts
CHANGED
|
@@ -1,4 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
dropRight,
|
|
3
|
+
get,
|
|
4
|
+
groupBy,
|
|
5
|
+
isEqual,
|
|
6
|
+
mergeWith,
|
|
7
|
+
set,
|
|
8
|
+
uniqWith,
|
|
9
|
+
} from "lodash-es";
|
|
2
10
|
import hash from "object-hash";
|
|
3
11
|
import { BaseConfiguration } from "src/schema/types/base/BaseConfiguration";
|
|
4
12
|
|
|
@@ -43,12 +51,28 @@ export const findMany = async (
|
|
|
43
51
|
).map(({ model, relation, query, path }) => {
|
|
44
52
|
const pk = config.models[model].primaryKey;
|
|
45
53
|
const fk = ensureArray(relation.foreignKey);
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
54
|
+
|
|
55
|
+
const lateralValues = mergeWith(
|
|
56
|
+
Object.fromEntries(fk.map((c) => [c, []])),
|
|
57
|
+
...uniqWith(
|
|
58
|
+
results.map((result) => {
|
|
59
|
+
return Object.fromEntries(
|
|
60
|
+
fk.map((c, index) => [
|
|
61
|
+
c,
|
|
62
|
+
[get(result, [...dropRight(path, 1), pk[index]])],
|
|
63
|
+
]),
|
|
64
|
+
);
|
|
65
|
+
}),
|
|
66
|
+
isEqual,
|
|
50
67
|
),
|
|
68
|
+
(a: unknown[], b: unknown[]) => a.concat(b),
|
|
69
|
+
);
|
|
70
|
+
|
|
71
|
+
const lateralBy = fk.map((c) => ({
|
|
72
|
+
column: c,
|
|
73
|
+
values: lateralValues[c],
|
|
51
74
|
}));
|
|
75
|
+
|
|
52
76
|
return findMany(conn, config, relation.model, {
|
|
53
77
|
...query,
|
|
54
78
|
for: builder.for,
|
|
@@ -91,11 +115,26 @@ export const findMany = async (
|
|
|
91
115
|
|
|
92
116
|
const pk = config.models[model].primaryKey;
|
|
93
117
|
const fk = ensureArray(relation.foreignKey);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
118
|
+
|
|
119
|
+
const lateralValues = mergeWith(
|
|
120
|
+
Object.fromEntries(fk.map((c) => [c, []])),
|
|
121
|
+
...uniqWith(
|
|
122
|
+
results.map((result) => {
|
|
123
|
+
return Object.fromEntries(
|
|
124
|
+
fk.map((c, index) => [
|
|
125
|
+
c,
|
|
126
|
+
[get(result, [...dropRight(path, 1), pk[index]])],
|
|
127
|
+
]),
|
|
128
|
+
);
|
|
129
|
+
}),
|
|
130
|
+
isEqual,
|
|
98
131
|
),
|
|
132
|
+
(a: unknown[], b: unknown[]) => a.concat(b),
|
|
133
|
+
);
|
|
134
|
+
|
|
135
|
+
const lateralBy = fk.map((c) => ({
|
|
136
|
+
column: c,
|
|
137
|
+
values: lateralValues[c],
|
|
99
138
|
}));
|
|
100
139
|
|
|
101
140
|
return findMany(conn, config, relation.through, {
|