@casekit/orm 0.0.1-alpha.15 → 0.0.1-alpha.16
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/orm.query.test.d.ts +2 -0
- package/lib/orm.query.test.d.ts.map +1 -0
- package/lib/orm.query.test.js +22 -0
- package/lib/orm.query.test.js.map +1 -0
- package/package.json +3 -6
- package/src/Connection.ts +65 -0
- package/src/errors.ts +18 -0
- package/src/index.ts +16 -0
- package/src/logger.ts +3 -0
- package/src/migrate/commands/implode.ts +46 -0
- package/src/migrate/index.ts +1 -0
- package/src/migrate/migrator.ts +24 -0
- package/src/migrate/sql/createExtensionsSql.test.ts +26 -0
- package/src/migrate/sql/createExtensionsSql.ts +16 -0
- package/src/migrate/sql/createForeignKeyConstraintSql.test.ts +50 -0
- package/src/migrate/sql/createForeignKeyConstraintSql.ts +44 -0
- package/src/migrate/sql/createSchemasSql.test.ts +81 -0
- package/src/migrate/sql/createSchemasSql.ts +15 -0
- package/src/migrate/sql/createTableSql.properties.ts +38 -0
- package/src/migrate/sql/createTableSql.test.ts +74 -0
- package/src/migrate/sql/createTableSql.ts +53 -0
- package/src/migrate/sql/createUniqueConstraintSql.ts +27 -0
- package/src/migrate/sql/dropSchemasSql.ts +15 -0
- package/src/migrate/sql/dropTableSql.ts +13 -0
- package/src/orm.query.test.ts +28 -0
- package/src/orm.ts +370 -0
- package/src/pull/index.ts +1 -0
- package/src/pull/introspect/getForeignKeys.ts +64 -0
- package/src/pull/introspect/getPrimaryKeys.ts +26 -0
- package/src/pull/introspect/getTables.ts +51 -0
- package/src/pull/introspect/getUniqueConstraints.ts +39 -0
- package/src/pull/parse/parseCreateUniqueIndexStatement.test.ts +14 -0
- package/src/pull/parse/parseCreateUniqueIndexStatement.ts +19 -0
- package/src/pull/pull.ts +78 -0
- package/src/pull/render/renderModel.test.ts +144 -0
- package/src/pull/render/renderModel.ts +141 -0
- package/src/pull/render/renderModelsIndex.ts +24 -0
- package/src/pull/render/renderRelations.ts +77 -0
- package/src/pull/render/renderRelationsIndex.ts +24 -0
- package/src/pull/types/ColumnMeta.ts +10 -0
- package/src/pull/types/ForeignKey.ts +6 -0
- package/src/pull/types/PrimaryKey.ts +6 -0
- package/src/pull/types/UniqueConstraint.ts +8 -0
- package/src/pull/util/format.ts +17 -0
- package/src/pull/util/quote.ts +7 -0
- package/src/pull/util/unquote.ts +9 -0
- package/src/queries/clauses/IncludeClause.ts +39 -0
- package/src/queries/clauses/LateralByClause.ts +4 -0
- package/src/queries/clauses/ReturningClause.ts +7 -0
- package/src/queries/clauses/SelectClause.ts +7 -0
- package/src/queries/clauses/WhereClause.ts +16 -0
- package/src/queries/clauses/helpers/OptionalColumn.ts +18 -0
- package/src/queries/clauses/helpers/OptionalParams.ts +14 -0
- package/src/queries/clauses/helpers/RequiredColumn.ts +8 -0
- package/src/queries/clauses/helpers/RequiredParams.ts +14 -0
- package/src/queries/clauses/include/IncludedRelationModel.ts +13 -0
- package/src/queries/clauses/include/IncludedRelationName.ts +11 -0
- package/src/queries/clauses/include/IncludedRelationQuery.ts +20 -0
- package/src/queries/clauses/where/buildWhereClause.ts +121 -0
- package/src/queries/clauses/where/buildWhereClauses.test.ts +145 -0
- package/src/queries/clauses/where/buildWhereClauses.ts +45 -0
- package/src/queries/clauses/where/operators.ts +13 -0
- package/src/queries/clauses/where/types/WhereClauseValue.ts +39 -0
- package/src/queries/count/buildCount.ts +77 -0
- package/src/queries/count/countToSql.ts +66 -0
- package/src/queries/count/tests/count.test.ts +35 -0
- package/src/queries/count/types/BaseCountParams.ts +11 -0
- package/src/queries/count/types/CountBuilder.ts +45 -0
- package/src/queries/count/types/CountParams.ts +27 -0
- package/src/queries/count.ts +33 -0
- package/src/queries/create/buildCreate.ts +67 -0
- package/src/queries/create/createResultSchema.ts +24 -0
- package/src/queries/create/createToSql.ts +44 -0
- package/src/queries/create/tests/createMany.varied-keys.test.ts +28 -0
- package/src/queries/create/tests/createOne.test-d.ts +116 -0
- package/src/queries/create/tests/createOne.test.ts +197 -0
- package/src/queries/create/types/BaseCreateManyParams.ts +7 -0
- package/src/queries/create/types/BaseCreateOneParams.ts +7 -0
- package/src/queries/create/types/CreateManyParams.ts +15 -0
- package/src/queries/create/types/CreateManyResult.ts +17 -0
- package/src/queries/create/types/CreateOneParams.ts +22 -0
- package/src/queries/create/types/CreateOneResult.ts +17 -0
- package/src/queries/createMany.ts +38 -0
- package/src/queries/createOne.ts +27 -0
- package/src/queries/delete/buildDelete.ts +56 -0
- package/src/queries/delete/deleteResultSchema.ts +23 -0
- package/src/queries/delete/deleteToSql.ts +48 -0
- package/src/queries/delete/tests/deleteOne.test.ts +108 -0
- package/src/queries/delete/types/BaseDeleteParams.ts +9 -0
- package/src/queries/delete/types/DeleteManyResult.ts +16 -0
- package/src/queries/delete/types/DeleteOneResult.ts +16 -0
- package/src/queries/delete/types/DeleteParams.ts +12 -0
- package/src/queries/deleteMany.ts +33 -0
- package/src/queries/deleteOne.ts +32 -0
- package/src/queries/find/buildFind.ts +138 -0
- package/src/queries/find/findResultSchema.ts +32 -0
- package/src/queries/find/findToSql.test.ts +123 -0
- package/src/queries/find/findToSql.ts +141 -0
- package/src/queries/find/getIncludedManyToManyRelations.ts +49 -0
- package/src/queries/find/getIncludedOneToManyRelations.ts +44 -0
- package/src/queries/find/tests/findMany.include.test.ts +107 -0
- package/src/queries/find/tests/findMany.limit.test-d.ts +75 -0
- package/src/queries/find/tests/findMany.limit.test.ts +176 -0
- package/src/queries/find/tests/findMany.nullable-relations.test.ts +127 -0
- package/src/queries/find/tests/findMany.orderBy.test-d.ts +84 -0
- package/src/queries/find/tests/findMany.orderBy.test.ts +184 -0
- package/src/queries/find/tests/findMany.select.test-d.ts +117 -0
- package/src/queries/find/tests/findMany.select.test.ts +188 -0
- package/src/queries/find/tests/findMany.too-deep.test-d.ts +154 -0
- package/src/queries/find/tests/findMany.where.test-d.ts +85 -0
- package/src/queries/find/tests/findMany.where.test.ts +76 -0
- package/src/queries/find/tests/middleware.find.where.test.ts +467 -0
- package/src/queries/find/types/BaseFindParams.ts +18 -0
- package/src/queries/find/types/FindBuilder.ts +73 -0
- package/src/queries/find/types/FindManyParams.ts +24 -0
- package/src/queries/find/types/FindManyResult.ts +13 -0
- package/src/queries/find/types/FindOneParams.ts +17 -0
- package/src/queries/find/types/FindOneResult.ts +50 -0
- package/src/queries/findMany.ts +134 -0
- package/src/queries/findOne.ts +30 -0
- package/src/queries/middleware/Middleware.ts +53 -0
- package/src/queries/middleware/ValuesMiddleware.ts +9 -0
- package/src/queries/middleware/WhereMiddleware.ts +16 -0
- package/src/queries/update/buildUpdate.ts +76 -0
- package/src/queries/update/tests/updateOne.test.ts +118 -0
- package/src/queries/update/types/BaseUpdateParams.ts +10 -0
- package/src/queries/update/types/UpdateManyResult.ts +16 -0
- package/src/queries/update/types/UpdateOneResult.ts +16 -0
- package/src/queries/update/types/UpdateParams.ts +14 -0
- package/src/queries/update/types/UpdateValues.ts +12 -0
- package/src/queries/update/updateResultSchema.ts +23 -0
- package/src/queries/update/updateToSql.ts +43 -0
- package/src/queries/updateMany.ts +33 -0
- package/src/queries/updateOne.ts +33 -0
- package/src/queries/util/hasConditions.test.ts +36 -0
- package/src/queries/util/hasConditions.ts +14 -0
- package/src/queries/util/rowToObject.test.ts +76 -0
- package/src/queries/util/rowToObject.ts +13 -0
- package/src/queries/util/tableAlias.test.ts +20 -0
- package/src/queries/util/tableAlias.ts +10 -0
- package/src/schema/populate/composeMiddleware.ts +51 -0
- package/src/schema/populate/populateConfiguration.ts +48 -0
- package/src/schema/populate/populateModel.ts +98 -0
- package/src/schema/populate/suggestedColumnSchema.ts +62 -0
- package/src/schema/types/base/BaseColumn.ts +10 -0
- package/src/schema/types/base/BaseConfiguration.ts +14 -0
- package/src/schema/types/base/BaseModel.ts +12 -0
- package/src/schema/types/base/BaseModels.ts +3 -0
- package/src/schema/types/base/BaseOrm.ts +8 -0
- package/src/schema/types/base/BaseRelation.ts +19 -0
- package/src/schema/types/base/BaseRelations.ts +3 -0
- package/src/schema/types/constraints/ForeignKey.ts +13 -0
- package/src/schema/types/constraints/UniqueConstraint.ts +9 -0
- package/src/schema/types/helpers/ColumnName.ts +6 -0
- package/src/schema/types/helpers/ColumnType.ts +23 -0
- package/src/schema/types/helpers/Columns.ts +3 -0
- package/src/schema/types/helpers/HasDefault.ts +11 -0
- package/src/schema/types/helpers/IsNullable.ts +7 -0
- package/src/schema/types/helpers/IsProvided.ts +8 -0
- package/src/schema/types/helpers/IsSerial.ts +10 -0
- package/src/schema/types/helpers/ModelName.ts +6 -0
- package/src/schema/types/loose/LooseColumnDefinition.ts +80 -0
- package/src/schema/types/loose/LooseModelDefinition.ts +47 -0
- package/src/schema/types/loose/LooseModelDefinitions.ts +3 -0
- package/src/schema/types/loose/LooseRelationDefinition.ts +10 -0
- package/src/schema/types/loose/LooseRelationsDefinition.ts +8 -0
- package/src/schema/types/loose/LooseRelationsDefinitions.ts +7 -0
- package/src/schema/types/postgres/DataType.ts +65 -0
- package/src/schema/types/relations/ManyToManyRelation.ts +15 -0
- package/src/schema/types/relations/ManyToOneRelation.ts +14 -0
- package/src/schema/types/relations/OneToManyRelation.ts +12 -0
- package/src/schema/types/strict/ColumnDefinition.ts +81 -0
- package/src/schema/types/strict/ModelDefinition.ts +47 -0
- package/src/schema/types/strict/ModelDefinitions.ts +3 -0
- package/src/schema/types/strict/RelationDefinition.ts +13 -0
- package/src/schema/types/strict/RelationsDefinition.ts +8 -0
- package/src/schema/types/strict/RelationsDefinitions.ts +7 -0
- package/src/schema/validate/validateConfiguration.ts +9 -0
- package/src/schema/validate/validateModel.ts +32 -0
- package/src/sql/SQLStatement.test.ts +112 -0
- package/src/sql/SQLStatement.ts +86 -0
- package/src/sql/index.ts +2 -0
- package/src/sql/sql.ts +47 -0
- package/src/test/db/index.ts +27 -0
- package/src/test/db/models/foo.model.ts +24 -0
- package/src/test/db/models/foo.relations.ts +4 -0
- package/src/test/db/models/post.model.ts +34 -0
- package/src/test/db/models/post.relations.ts +21 -0
- package/src/test/db/models/tenant.model.ts +14 -0
- package/src/test/db/models/tenant.relations.ts +22 -0
- package/src/test/db/models/tenantUser.model.ts +23 -0
- package/src/test/db/models/tenantUser.relations.ts +15 -0
- package/src/test/db/models/user.model.ts +29 -0
- package/src/test/db/models/user.relations.ts +38 -0
- package/src/test/db/models.ts +15 -0
- package/src/test/db/relations.ts +13 -0
- package/src/test/gen/column.ts +39 -0
- package/src/test/gen/index.ts +2 -0
- package/src/test/gen/model.ts +58 -0
- package/src/test/gen/sqldate.ts +8 -0
- package/src/test/globalSetup.ts +6 -0
- package/src/test/seed/index.ts +75 -0
- package/src/test/util/withRollback.ts +18 -0
- package/src/test/util/withTransaction.ts +19 -0
- package/src/types/ColumnName.ts +6 -0
- package/src/types/ColumnType.ts +20 -0
- package/src/types/Configuration.ts +21 -0
- package/src/types/ModelType.ts +20 -0
- package/src/types/util/DeepRequired.ts +7 -0
- package/src/types/util/DisallowExtraKeys.ts +5 -0
- package/src/types/util/NonEmptyArray.ts +1 -0
- package/src/types/util/Simplify.ts +8 -0
- package/src/util/ensureArray.ts +4 -0
- package/src/util/interleave.test.ts +35 -0
- package/src/util/interleave.ts +8 -0
|
@@ -0,0 +1,467 @@
|
|
|
1
|
+
import { snakeCase } from "lodash-es";
|
|
2
|
+
import pg from "pg";
|
|
3
|
+
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
|
|
4
|
+
|
|
5
|
+
import { orm } from "../../../orm";
|
|
6
|
+
import { models, relations } from "../../../test/db";
|
|
7
|
+
import { seed } from "../../../test/seed";
|
|
8
|
+
import { $not } from "../../clauses/where/operators";
|
|
9
|
+
import { Middleware } from "../../middleware/Middleware";
|
|
10
|
+
|
|
11
|
+
export const timestamps: Middleware = {
|
|
12
|
+
create: {
|
|
13
|
+
values: (values, { model, config }) => {
|
|
14
|
+
if ("createdAt" in config.models[model].columns) {
|
|
15
|
+
return {
|
|
16
|
+
createdAt: new Date(),
|
|
17
|
+
...values,
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
return values;
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
update: {
|
|
24
|
+
set: (set, { model, config }) => {
|
|
25
|
+
if ("updatedAt" in config.models[model].columns) {
|
|
26
|
+
return {
|
|
27
|
+
updatedAt: new Date(),
|
|
28
|
+
...set,
|
|
29
|
+
};
|
|
30
|
+
} else {
|
|
31
|
+
return set;
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
export const softdelete: Middleware = {
|
|
38
|
+
where: (where, { model, config }) => {
|
|
39
|
+
if ("deletedAt" in config.models[model].columns) {
|
|
40
|
+
return {
|
|
41
|
+
deletedAt: null,
|
|
42
|
+
...where,
|
|
43
|
+
};
|
|
44
|
+
} else {
|
|
45
|
+
return where;
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
delete: {
|
|
49
|
+
deleteOne: (params, { model, config, deleteOne, updateOne }) => {
|
|
50
|
+
if ("deletedAt" in config.models[model].columns) {
|
|
51
|
+
return updateOne({
|
|
52
|
+
...params,
|
|
53
|
+
set: {
|
|
54
|
+
deletedAt: new Date(),
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
} else return deleteOne(params);
|
|
58
|
+
},
|
|
59
|
+
deleteMany: (params, { model, config, deleteMany, updateMany }) => {
|
|
60
|
+
if ("deletedAt" in config.models[model].columns) {
|
|
61
|
+
return updateMany({
|
|
62
|
+
...params,
|
|
63
|
+
set: {
|
|
64
|
+
deletedAt: new Date(),
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
} else return deleteMany(params);
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
describe("middleware.find.where", () => {
|
|
73
|
+
beforeEach(() => {
|
|
74
|
+
vi.useFakeTimers();
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
afterEach(() => {
|
|
78
|
+
vi.useRealTimers();
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
test("it allows modifying the query object before a find operation", async () => {
|
|
82
|
+
const db = orm({
|
|
83
|
+
models,
|
|
84
|
+
relations,
|
|
85
|
+
extensions: ["uuid-ossp"],
|
|
86
|
+
naming: { column: snakeCase },
|
|
87
|
+
schema: "casekit",
|
|
88
|
+
middleware: [softdelete],
|
|
89
|
+
pool: new pg.Pool(),
|
|
90
|
+
});
|
|
91
|
+
await db.transact(
|
|
92
|
+
async (db) => {
|
|
93
|
+
const { users } = await seed(db, {
|
|
94
|
+
users: [
|
|
95
|
+
{
|
|
96
|
+
username: "Lynne Tillman",
|
|
97
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
98
|
+
},
|
|
99
|
+
],
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
const lynne = users["Lynne Tillman"];
|
|
103
|
+
|
|
104
|
+
expect(
|
|
105
|
+
await db.findMany("post", {
|
|
106
|
+
select: ["title"],
|
|
107
|
+
where: { authorId: lynne.id },
|
|
108
|
+
orderBy: ["title"],
|
|
109
|
+
}),
|
|
110
|
+
).toEqual([{ title: "Post a" }, { title: "Post b" }]);
|
|
111
|
+
|
|
112
|
+
await db.updateMany("post", {
|
|
113
|
+
set: { deletedAt: new Date() },
|
|
114
|
+
where: { authorId: lynne.id },
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
expect(
|
|
118
|
+
await db.findMany("post", {
|
|
119
|
+
select: ["title"],
|
|
120
|
+
where: { authorId: lynne.id },
|
|
121
|
+
orderBy: ["title"],
|
|
122
|
+
}),
|
|
123
|
+
).toEqual([]);
|
|
124
|
+
},
|
|
125
|
+
{ rollback: true },
|
|
126
|
+
);
|
|
127
|
+
});
|
|
128
|
+
|
|
129
|
+
test("it applies to N:1 relations", async () => {
|
|
130
|
+
const db = orm({
|
|
131
|
+
models,
|
|
132
|
+
relations,
|
|
133
|
+
extensions: ["uuid-ossp"],
|
|
134
|
+
naming: { column: snakeCase },
|
|
135
|
+
schema: "casekit",
|
|
136
|
+
middleware: [softdelete],
|
|
137
|
+
pool: new pg.Pool(),
|
|
138
|
+
});
|
|
139
|
+
await db.transact(
|
|
140
|
+
async (db) => {
|
|
141
|
+
const { users } = await seed(db, {
|
|
142
|
+
users: [
|
|
143
|
+
{
|
|
144
|
+
username: "Lynne Tillman",
|
|
145
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
146
|
+
},
|
|
147
|
+
],
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
const lynne = users["Lynne Tillman"];
|
|
151
|
+
|
|
152
|
+
expect(
|
|
153
|
+
await db.findMany("post", {
|
|
154
|
+
select: ["title"],
|
|
155
|
+
where: { authorId: lynne.id },
|
|
156
|
+
orderBy: ["title"],
|
|
157
|
+
}),
|
|
158
|
+
).toEqual([{ title: "Post a" }, { title: "Post b" }]);
|
|
159
|
+
|
|
160
|
+
await db.updateOne("user", {
|
|
161
|
+
set: { deletedAt: new Date() },
|
|
162
|
+
where: { id: lynne.id },
|
|
163
|
+
});
|
|
164
|
+
|
|
165
|
+
expect(
|
|
166
|
+
await db.findMany("post", {
|
|
167
|
+
select: ["title"],
|
|
168
|
+
include: { author: { select: ["username"] } },
|
|
169
|
+
orderBy: ["title"],
|
|
170
|
+
}),
|
|
171
|
+
).toEqual([]);
|
|
172
|
+
},
|
|
173
|
+
{ rollback: true },
|
|
174
|
+
);
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
test("it applies to 1:N relations", async () => {
|
|
178
|
+
const db = orm({
|
|
179
|
+
models,
|
|
180
|
+
relations,
|
|
181
|
+
extensions: ["uuid-ossp"],
|
|
182
|
+
naming: { column: snakeCase },
|
|
183
|
+
schema: "casekit",
|
|
184
|
+
middleware: [softdelete],
|
|
185
|
+
pool: new pg.Pool(),
|
|
186
|
+
});
|
|
187
|
+
await db.transact(
|
|
188
|
+
async (db) => {
|
|
189
|
+
const { users } = await seed(db, {
|
|
190
|
+
users: [
|
|
191
|
+
{
|
|
192
|
+
username: "Lynne Tillman",
|
|
193
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
194
|
+
},
|
|
195
|
+
],
|
|
196
|
+
});
|
|
197
|
+
|
|
198
|
+
const lynne = users["Lynne Tillman"];
|
|
199
|
+
|
|
200
|
+
expect(
|
|
201
|
+
await db.findMany("post", {
|
|
202
|
+
select: ["title"],
|
|
203
|
+
where: { authorId: lynne.id },
|
|
204
|
+
orderBy: ["title"],
|
|
205
|
+
}),
|
|
206
|
+
).toEqual([{ title: "Post a" }, { title: "Post b" }]);
|
|
207
|
+
|
|
208
|
+
await db.updateOne("post", {
|
|
209
|
+
set: { deletedAt: new Date() },
|
|
210
|
+
where: { title: "Post a" },
|
|
211
|
+
});
|
|
212
|
+
|
|
213
|
+
expect(
|
|
214
|
+
await db.findOne("user", {
|
|
215
|
+
select: ["username"],
|
|
216
|
+
include: { posts: { select: ["title"] } },
|
|
217
|
+
where: { id: lynne.id },
|
|
218
|
+
}),
|
|
219
|
+
).toEqual({
|
|
220
|
+
username: "Lynne Tillman",
|
|
221
|
+
posts: [{ title: "Post b" }],
|
|
222
|
+
});
|
|
223
|
+
},
|
|
224
|
+
{ rollback: true },
|
|
225
|
+
);
|
|
226
|
+
});
|
|
227
|
+
|
|
228
|
+
test("it applies to N:N relations", async () => {
|
|
229
|
+
const db = orm({
|
|
230
|
+
models,
|
|
231
|
+
relations,
|
|
232
|
+
extensions: ["uuid-ossp"],
|
|
233
|
+
naming: { column: snakeCase },
|
|
234
|
+
schema: "casekit",
|
|
235
|
+
middleware: [softdelete],
|
|
236
|
+
pool: new pg.Pool(),
|
|
237
|
+
});
|
|
238
|
+
await db.transact(
|
|
239
|
+
async (db) => {
|
|
240
|
+
await seed(db, {
|
|
241
|
+
users: [
|
|
242
|
+
{
|
|
243
|
+
username: "Lynne Tillman",
|
|
244
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
245
|
+
},
|
|
246
|
+
],
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
expect(
|
|
250
|
+
await db.findMany("tenant", {
|
|
251
|
+
select: ["name"],
|
|
252
|
+
include: { users: { select: ["username"] } },
|
|
253
|
+
orderBy: ["name"],
|
|
254
|
+
}),
|
|
255
|
+
).toEqual([
|
|
256
|
+
{
|
|
257
|
+
name: "Popova Park",
|
|
258
|
+
users: [{ username: "Lynne Tillman" }],
|
|
259
|
+
},
|
|
260
|
+
]);
|
|
261
|
+
|
|
262
|
+
await db.updateOne("user", {
|
|
263
|
+
set: { deletedAt: new Date() },
|
|
264
|
+
where: { username: "Lynne Tillman" },
|
|
265
|
+
});
|
|
266
|
+
|
|
267
|
+
expect(
|
|
268
|
+
await db.findOne("tenant", {
|
|
269
|
+
select: ["name"],
|
|
270
|
+
include: { users: { select: ["username"] } },
|
|
271
|
+
where: { name: "Popova Park" },
|
|
272
|
+
}),
|
|
273
|
+
).toEqual({
|
|
274
|
+
name: "Popova Park",
|
|
275
|
+
users: [],
|
|
276
|
+
});
|
|
277
|
+
},
|
|
278
|
+
{ rollback: true },
|
|
279
|
+
);
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
test("it works even if there is no where clause in the original query", async () => {
|
|
283
|
+
const db = orm({
|
|
284
|
+
models,
|
|
285
|
+
relations,
|
|
286
|
+
extensions: ["uuid-ossp"],
|
|
287
|
+
naming: { column: snakeCase },
|
|
288
|
+
schema: "casekit",
|
|
289
|
+
middleware: [softdelete],
|
|
290
|
+
pool: new pg.Pool(),
|
|
291
|
+
});
|
|
292
|
+
await db.transact(
|
|
293
|
+
async (db) => {
|
|
294
|
+
const { users } = await seed(db, {
|
|
295
|
+
users: [
|
|
296
|
+
{
|
|
297
|
+
username: "Lynne Tillman",
|
|
298
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
299
|
+
},
|
|
300
|
+
],
|
|
301
|
+
});
|
|
302
|
+
|
|
303
|
+
const lynne = users["Lynne Tillman"];
|
|
304
|
+
|
|
305
|
+
expect(
|
|
306
|
+
await db.findMany("post", {
|
|
307
|
+
select: ["title"],
|
|
308
|
+
where: { authorId: lynne.id },
|
|
309
|
+
orderBy: ["title"],
|
|
310
|
+
}),
|
|
311
|
+
).toEqual([{ title: "Post a" }, { title: "Post b" }]);
|
|
312
|
+
|
|
313
|
+
await db.updateMany("post", {
|
|
314
|
+
set: { deletedAt: new Date() },
|
|
315
|
+
where: { authorId: lynne.id },
|
|
316
|
+
});
|
|
317
|
+
|
|
318
|
+
expect(
|
|
319
|
+
await db.findMany("post", { select: ["title"] }),
|
|
320
|
+
).toEqual([]);
|
|
321
|
+
},
|
|
322
|
+
{ rollback: true },
|
|
323
|
+
);
|
|
324
|
+
});
|
|
325
|
+
|
|
326
|
+
test("multilpe middlewares can be applied", async () => {
|
|
327
|
+
const db = orm({
|
|
328
|
+
models,
|
|
329
|
+
relations,
|
|
330
|
+
extensions: ["uuid-ossp"],
|
|
331
|
+
naming: { column: snakeCase },
|
|
332
|
+
schema: "casekit",
|
|
333
|
+
middleware: [softdelete, timestamps],
|
|
334
|
+
pool: new pg.Pool(),
|
|
335
|
+
});
|
|
336
|
+
|
|
337
|
+
await db.transact(
|
|
338
|
+
async (db) => {
|
|
339
|
+
const { users } = await seed(db, {
|
|
340
|
+
users: [
|
|
341
|
+
{
|
|
342
|
+
username: "Lynne Tillman",
|
|
343
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
344
|
+
},
|
|
345
|
+
],
|
|
346
|
+
});
|
|
347
|
+
|
|
348
|
+
vi.setSystemTime(new Date("2022-05-23"));
|
|
349
|
+
const lynne = users["Lynne Tillman"];
|
|
350
|
+
|
|
351
|
+
expect(
|
|
352
|
+
await db.findMany("post", {
|
|
353
|
+
select: ["title", "updatedAt"],
|
|
354
|
+
where: { authorId: lynne.id },
|
|
355
|
+
orderBy: ["title"],
|
|
356
|
+
}),
|
|
357
|
+
).toEqual([
|
|
358
|
+
{ title: "Post a", updatedAt: null },
|
|
359
|
+
{ title: "Post b", updatedAt: null },
|
|
360
|
+
]);
|
|
361
|
+
|
|
362
|
+
await db.updateMany("post", {
|
|
363
|
+
set: { title: "Post AAAAAA" },
|
|
364
|
+
where: { authorId: lynne.id, title: "Post a" },
|
|
365
|
+
});
|
|
366
|
+
await db.updateMany("post", {
|
|
367
|
+
set: { deletedAt: new Date() },
|
|
368
|
+
where: { authorId: lynne.id, title: "Post b" },
|
|
369
|
+
});
|
|
370
|
+
|
|
371
|
+
// updatedAt field has been set by the timestamps middleware
|
|
372
|
+
// and Post b is not returned by the query because of the softdelete middleware
|
|
373
|
+
expect(
|
|
374
|
+
await db.findMany("post", {
|
|
375
|
+
select: ["title", "updatedAt"],
|
|
376
|
+
}),
|
|
377
|
+
).toEqual([
|
|
378
|
+
{
|
|
379
|
+
title: "Post AAAAAA",
|
|
380
|
+
updatedAt: new Date("2022-05-23"),
|
|
381
|
+
},
|
|
382
|
+
]);
|
|
383
|
+
},
|
|
384
|
+
{ rollback: true },
|
|
385
|
+
);
|
|
386
|
+
});
|
|
387
|
+
test("it allows overriding deleteOne and deleteMany functions", async () => {
|
|
388
|
+
const db = orm({
|
|
389
|
+
models,
|
|
390
|
+
relations,
|
|
391
|
+
extensions: ["uuid-ossp"],
|
|
392
|
+
naming: { column: snakeCase },
|
|
393
|
+
schema: "casekit",
|
|
394
|
+
middleware: [softdelete, timestamps],
|
|
395
|
+
pool: new pg.Pool(),
|
|
396
|
+
});
|
|
397
|
+
await db.transact(
|
|
398
|
+
async (db) => {
|
|
399
|
+
const { users } = await seed(db, {
|
|
400
|
+
users: [
|
|
401
|
+
{
|
|
402
|
+
username: "Lynne Tillman",
|
|
403
|
+
tenants: [{ name: "Popova Park", posts: 2 }],
|
|
404
|
+
},
|
|
405
|
+
],
|
|
406
|
+
});
|
|
407
|
+
|
|
408
|
+
const lynne = users["Lynne Tillman"];
|
|
409
|
+
|
|
410
|
+
expect(
|
|
411
|
+
await db.findMany("post", {
|
|
412
|
+
select: ["title", "updatedAt"],
|
|
413
|
+
where: { authorId: lynne.id },
|
|
414
|
+
orderBy: ["title"],
|
|
415
|
+
}),
|
|
416
|
+
).toEqual([
|
|
417
|
+
{ title: "Post a", updatedAt: null },
|
|
418
|
+
{ title: "Post b", updatedAt: null },
|
|
419
|
+
]);
|
|
420
|
+
|
|
421
|
+
vi.setSystemTime(new Date("2022-05-23"));
|
|
422
|
+
|
|
423
|
+
await db.deleteMany("post", {
|
|
424
|
+
where: { authorId: lynne.id, title: "Post a" },
|
|
425
|
+
});
|
|
426
|
+
|
|
427
|
+
expect(
|
|
428
|
+
await db.findMany("post", {
|
|
429
|
+
select: ["title", "updatedAt", "deletedAt"],
|
|
430
|
+
where: { deletedAt: { [$not]: null } },
|
|
431
|
+
}),
|
|
432
|
+
).toEqual([
|
|
433
|
+
{
|
|
434
|
+
title: "Post a",
|
|
435
|
+
updatedAt: new Date("2022-05-23"),
|
|
436
|
+
deletedAt: new Date("2022-05-23"),
|
|
437
|
+
},
|
|
438
|
+
]);
|
|
439
|
+
|
|
440
|
+
vi.setSystemTime(new Date("2022-05-24"));
|
|
441
|
+
|
|
442
|
+
await db.deleteOne("post", {
|
|
443
|
+
where: { authorId: lynne.id, title: "Post b" },
|
|
444
|
+
});
|
|
445
|
+
|
|
446
|
+
expect(
|
|
447
|
+
await db.findMany("post", {
|
|
448
|
+
select: ["title", "updatedAt", "deletedAt"],
|
|
449
|
+
where: { deletedAt: { [$not]: null } },
|
|
450
|
+
}),
|
|
451
|
+
).toEqual([
|
|
452
|
+
{
|
|
453
|
+
title: "Post a",
|
|
454
|
+
updatedAt: new Date("2022-05-23"),
|
|
455
|
+
deletedAt: new Date("2022-05-23"),
|
|
456
|
+
},
|
|
457
|
+
{
|
|
458
|
+
title: "Post b",
|
|
459
|
+
updatedAt: new Date("2022-05-24"),
|
|
460
|
+
deletedAt: new Date("2022-05-24"),
|
|
461
|
+
},
|
|
462
|
+
]);
|
|
463
|
+
},
|
|
464
|
+
{ rollback: true },
|
|
465
|
+
);
|
|
466
|
+
});
|
|
467
|
+
});
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
2
|
+
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
3
|
+
import { LateralByClause } from "../../clauses/LateralByClause";
|
|
4
|
+
import { WhereClause } from "../../clauses/WhereClause";
|
|
5
|
+
|
|
6
|
+
export type BaseFindParams = {
|
|
7
|
+
select: string[];
|
|
8
|
+
include?: Partial<Record<string, Omit<BaseFindParams, "for">>>;
|
|
9
|
+
where?: WhereClause<
|
|
10
|
+
LooseModelDefinitions,
|
|
11
|
+
ModelName<LooseModelDefinitions>
|
|
12
|
+
>;
|
|
13
|
+
limit?: number;
|
|
14
|
+
offset?: number;
|
|
15
|
+
lateralBy?: LateralByClause;
|
|
16
|
+
for?: "update" | "no key update" | "share" | "key share";
|
|
17
|
+
orderBy?: (string | [string, "asc" | "desc"])[];
|
|
18
|
+
};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
2
|
+
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
3
|
+
import { WhereClause } from "../../clauses/WhereClause";
|
|
4
|
+
|
|
5
|
+
export type FindBuilder = {
|
|
6
|
+
tableIndex: number;
|
|
7
|
+
|
|
8
|
+
columns: {
|
|
9
|
+
table: string;
|
|
10
|
+
name: string;
|
|
11
|
+
alias: string;
|
|
12
|
+
path: string[];
|
|
13
|
+
}[];
|
|
14
|
+
|
|
15
|
+
table: {
|
|
16
|
+
table: string;
|
|
17
|
+
model: string;
|
|
18
|
+
schema: string;
|
|
19
|
+
alias: string;
|
|
20
|
+
joins: Join[];
|
|
21
|
+
conditions?: WhereClause<
|
|
22
|
+
LooseModelDefinitions,
|
|
23
|
+
ModelName<LooseModelDefinitions>
|
|
24
|
+
>;
|
|
25
|
+
where?: WhereClause<
|
|
26
|
+
LooseModelDefinitions,
|
|
27
|
+
ModelName<LooseModelDefinitions>
|
|
28
|
+
>;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
lateralBy?: {
|
|
32
|
+
groupTable: string;
|
|
33
|
+
itemTable: string;
|
|
34
|
+
columns: {
|
|
35
|
+
column: string;
|
|
36
|
+
type: string;
|
|
37
|
+
values: unknown[];
|
|
38
|
+
}[];
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
for?: "update" | "no key update" | "share" | "key share";
|
|
42
|
+
|
|
43
|
+
orderBy: {
|
|
44
|
+
table: string;
|
|
45
|
+
column: string;
|
|
46
|
+
direction: "asc" | "desc";
|
|
47
|
+
}[];
|
|
48
|
+
|
|
49
|
+
limit?: number;
|
|
50
|
+
|
|
51
|
+
offset?: number;
|
|
52
|
+
};
|
|
53
|
+
export type Join = {
|
|
54
|
+
from: {
|
|
55
|
+
schema: string;
|
|
56
|
+
table: string;
|
|
57
|
+
alias: string;
|
|
58
|
+
model: string;
|
|
59
|
+
columns: string[];
|
|
60
|
+
};
|
|
61
|
+
to: {
|
|
62
|
+
schema: string;
|
|
63
|
+
table: string;
|
|
64
|
+
alias: string;
|
|
65
|
+
model: string;
|
|
66
|
+
columns: string[];
|
|
67
|
+
};
|
|
68
|
+
where?: WhereClause<
|
|
69
|
+
LooseModelDefinitions,
|
|
70
|
+
ModelName<LooseModelDefinitions>
|
|
71
|
+
>;
|
|
72
|
+
type?: "inner" | "left";
|
|
73
|
+
};
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { ColumnName } from "../../../schema/types/helpers/ColumnName";
|
|
2
|
+
import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
3
|
+
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
4
|
+
import { LooseRelationsDefinitions } from "../../../schema/types/loose/LooseRelationsDefinitions";
|
|
5
|
+
import { NonEmptyArray } from "../../../types/util/NonEmptyArray";
|
|
6
|
+
import { IncludeClause } from "../../clauses/IncludeClause";
|
|
7
|
+
import { SelectClause } from "../../clauses/SelectClause";
|
|
8
|
+
import { WhereClause } from "../../clauses/WhereClause";
|
|
9
|
+
|
|
10
|
+
export type FindManyParams<
|
|
11
|
+
Models extends LooseModelDefinitions,
|
|
12
|
+
Relations extends LooseRelationsDefinitions<Models>,
|
|
13
|
+
M extends ModelName<Models>,
|
|
14
|
+
> = {
|
|
15
|
+
select: SelectClause<Models[M]>;
|
|
16
|
+
include?: IncludeClause<Models, Relations, M>;
|
|
17
|
+
where?: WhereClause<Models, M>;
|
|
18
|
+
limit?: number;
|
|
19
|
+
offset?: number;
|
|
20
|
+
orderBy?: NonEmptyArray<
|
|
21
|
+
ColumnName<Models[M]> | [ColumnName<Models[M]>, "asc" | "desc"]
|
|
22
|
+
>;
|
|
23
|
+
for?: "update" | "no key update" | "share" | "key share";
|
|
24
|
+
};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
2
|
+
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
3
|
+
import { LooseRelationsDefinitions } from "../../../schema/types/loose/LooseRelationsDefinitions";
|
|
4
|
+
import { Simplify } from "../../../types/util/Simplify";
|
|
5
|
+
import { FindManyParams } from "./FindManyParams";
|
|
6
|
+
import { FindOneResult } from "./FindOneResult";
|
|
7
|
+
|
|
8
|
+
export type FindManyResult<
|
|
9
|
+
Models extends LooseModelDefinitions,
|
|
10
|
+
Relations extends LooseRelationsDefinitions<Models>,
|
|
11
|
+
M extends ModelName<Models>,
|
|
12
|
+
Q extends FindManyParams<Models, Relations, M>,
|
|
13
|
+
> = Simplify<FindOneResult<Models, Relations, M, Q>[]>;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
2
|
+
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
3
|
+
import { LooseRelationsDefinitions } from "../../../schema/types/loose/LooseRelationsDefinitions";
|
|
4
|
+
import { IncludeClause } from "../../clauses/IncludeClause";
|
|
5
|
+
import { SelectClause } from "../../clauses/SelectClause";
|
|
6
|
+
import { WhereClause } from "../../clauses/WhereClause";
|
|
7
|
+
|
|
8
|
+
export type FindOneParams<
|
|
9
|
+
Models extends LooseModelDefinitions,
|
|
10
|
+
Relations extends LooseRelationsDefinitions<Models>,
|
|
11
|
+
M extends ModelName<Models>,
|
|
12
|
+
> = {
|
|
13
|
+
select: SelectClause<Models[M]>;
|
|
14
|
+
where?: WhereClause<Models, M>;
|
|
15
|
+
include?: IncludeClause<Models, Relations, M>;
|
|
16
|
+
for?: "update" | "no key update" | "share" | "key share";
|
|
17
|
+
};
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { ColumnType } from "../../../schema/types/helpers/ColumnType";
|
|
2
|
+
import { ModelName } from "../../../schema/types/helpers/ModelName";
|
|
3
|
+
import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
|
|
4
|
+
import { LooseRelationsDefinitions } from "../../../schema/types/loose/LooseRelationsDefinitions";
|
|
5
|
+
import { Simplify } from "../../../types/util/Simplify";
|
|
6
|
+
import { IncludedRelationModel } from "../../clauses/include/IncludedRelationModel";
|
|
7
|
+
import { IncludedRelationName } from "../../clauses/include/IncludedRelationName";
|
|
8
|
+
import { IncludedRelationQuery } from "../../clauses/include/IncludedRelationQuery";
|
|
9
|
+
import { FindManyParams } from "./FindManyParams";
|
|
10
|
+
import { FindOneParams } from "./FindOneParams";
|
|
11
|
+
|
|
12
|
+
export type FindOneResult<
|
|
13
|
+
Models extends LooseModelDefinitions,
|
|
14
|
+
Relations extends LooseRelationsDefinitions<Models>,
|
|
15
|
+
M extends ModelName<Models>,
|
|
16
|
+
Q extends
|
|
17
|
+
| FindManyParams<Models, Relations, M>
|
|
18
|
+
| FindOneParams<Models, Relations, M>,
|
|
19
|
+
> = Readonly<
|
|
20
|
+
Simplify<
|
|
21
|
+
{
|
|
22
|
+
[C in Extract<Q["select"][number], string>]: ColumnType<
|
|
23
|
+
Models,
|
|
24
|
+
M,
|
|
25
|
+
C
|
|
26
|
+
>;
|
|
27
|
+
} & (undefined extends Q["include"]
|
|
28
|
+
? unknown
|
|
29
|
+
: {
|
|
30
|
+
[R in IncludedRelationName<
|
|
31
|
+
Models,
|
|
32
|
+
Relations,
|
|
33
|
+
M,
|
|
34
|
+
Q
|
|
35
|
+
>]: Relations[M][R] extends { type: "N:1" }
|
|
36
|
+
? FindOneResult<
|
|
37
|
+
Models,
|
|
38
|
+
Relations,
|
|
39
|
+
IncludedRelationModel<Models, Relations, M, R>,
|
|
40
|
+
IncludedRelationQuery<Models, Relations, M, R, Q>
|
|
41
|
+
>
|
|
42
|
+
: FindOneResult<
|
|
43
|
+
Models,
|
|
44
|
+
Relations,
|
|
45
|
+
IncludedRelationModel<Models, Relations, M, R>,
|
|
46
|
+
IncludedRelationQuery<Models, Relations, M, R, Q>
|
|
47
|
+
>[];
|
|
48
|
+
})
|
|
49
|
+
>
|
|
50
|
+
>;
|