@payloadcms/drizzle 4.0.0-internal.f851106 → 4.0.0-internal.f980c7c
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/dist/createTableName.d.ts.map +1 -1
- package/dist/createTableName.js +2 -7
- package/dist/createTableName.js.map +1 -1
- package/dist/exports/postgres.d.ts +4 -1
- package/dist/exports/postgres.d.ts.map +1 -1
- package/dist/exports/postgres.js +4 -1
- package/dist/exports/postgres.js.map +1 -1
- package/dist/exports/sqlite.d.ts +2 -1
- package/dist/exports/sqlite.d.ts.map +1 -1
- package/dist/exports/sqlite.js +2 -1
- package/dist/exports/sqlite.js.map +1 -1
- package/dist/find/buildPolymorphicJoinQuery.d.ts +39 -0
- package/dist/find/buildPolymorphicJoinQuery.d.ts.map +1 -0
- package/dist/find/buildPolymorphicJoinQuery.js +146 -0
- package/dist/find/buildPolymorphicJoinQuery.js.map +1 -0
- package/dist/find/buildPolymorphicJoinWhere.d.ts +20 -0
- package/dist/find/buildPolymorphicJoinWhere.d.ts.map +1 -0
- package/dist/find/buildPolymorphicJoinWhere.js +301 -0
- package/dist/find/buildPolymorphicJoinWhere.js.map +1 -0
- package/dist/find/createPolymorphicJoinWherePlan.d.ts +38 -0
- package/dist/find/createPolymorphicJoinWherePlan.d.ts.map +1 -0
- package/dist/find/createPolymorphicJoinWherePlan.js +200 -0
- package/dist/find/createPolymorphicJoinWherePlan.js.map +1 -0
- package/dist/find/traverseFields.d.ts.map +1 -1
- package/dist/find/traverseFields.js +20 -191
- package/dist/find/traverseFields.js.map +1 -1
- package/dist/index.d.ts +4 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -8
- package/dist/index.js.map +1 -1
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +41 -15
- package/dist/migrate.js.map +1 -1
- package/dist/migrateDown.d.ts +2 -1
- package/dist/migrateDown.d.ts.map +1 -1
- package/dist/migrateDown.js +17 -4
- package/dist/migrateDown.js.map +1 -1
- package/dist/migrateFresh.d.ts +4 -2
- package/dist/migrateFresh.d.ts.map +1 -1
- package/dist/migrateFresh.js +26 -9
- package/dist/migrateFresh.js.map +1 -1
- package/dist/migrateRefresh.d.ts +2 -1
- package/dist/migrateRefresh.d.ts.map +1 -1
- package/dist/migrateRefresh.js +20 -5
- package/dist/migrateRefresh.js.map +1 -1
- package/dist/migrateReset.d.ts +2 -1
- package/dist/migrateReset.d.ts.map +1 -1
- package/dist/migrateReset.js +18 -4
- package/dist/migrateReset.js.map +1 -1
- package/dist/migrateStatus.d.ts +2 -1
- package/dist/migrateStatus.d.ts.map +1 -1
- package/dist/migrateStatus.js +11 -6
- package/dist/migrateStatus.js.map +1 -1
- package/dist/postgres/createJSONQuery/index.js +3 -3
- package/dist/postgres/createJSONQuery/index.js.map +1 -1
- package/dist/postgres/init.d.ts.map +1 -1
- package/dist/postgres/init.js +6 -0
- package/dist/postgres/init.js.map +1 -1
- package/dist/postgres/predefinedMigrations/sizes-to-variants/index.d.ts +35 -0
- package/dist/postgres/predefinedMigrations/sizes-to-variants/index.d.ts.map +1 -0
- package/dist/postgres/predefinedMigrations/sizes-to-variants/index.js +185 -0
- package/dist/postgres/predefinedMigrations/sizes-to-variants/index.js.map +1 -0
- package/dist/postgres/predefinedMigrations/v2-v3/fetchAndResave/index.d.ts.map +1 -1
- package/dist/postgres/predefinedMigrations/v2-v3/fetchAndResave/index.js +8 -4
- package/dist/postgres/predefinedMigrations/v2-v3/fetchAndResave/index.js.map +1 -1
- package/dist/postgres/predefinedMigrations/v2-v3/index.js +2 -2
- package/dist/postgres/predefinedMigrations/v2-v3/index.js.map +1 -1
- package/dist/postgres/query/assertOperatorHandlerExtensionsInstalled.d.ts +15 -0
- package/dist/postgres/query/assertOperatorHandlerExtensionsInstalled.d.ts.map +1 -0
- package/dist/postgres/query/assertOperatorHandlerExtensionsInstalled.js +25 -0
- package/dist/postgres/query/assertOperatorHandlerExtensionsInstalled.js.map +1 -0
- package/dist/postgres/query/postgresUnaccent.d.ts +13 -0
- package/dist/postgres/query/postgresUnaccent.d.ts.map +1 -0
- package/dist/postgres/query/postgresUnaccent.js +40 -0
- package/dist/postgres/query/postgresUnaccent.js.map +1 -0
- package/dist/postgres/requireDrizzleKit.d.ts +4 -0
- package/dist/postgres/requireDrizzleKit.d.ts.map +1 -1
- package/dist/postgres/requireDrizzleKit.js +16 -10
- package/dist/postgres/requireDrizzleKit.js.map +1 -1
- package/dist/postgres/types.d.ts +13 -2
- package/dist/postgres/types.d.ts.map +1 -1
- package/dist/postgres/types.js.map +1 -1
- package/dist/queries/buildOperatorConstraint.d.ts +22 -0
- package/dist/queries/buildOperatorConstraint.d.ts.map +1 -0
- package/dist/queries/buildOperatorConstraint.js +63 -0
- package/dist/queries/buildOperatorConstraint.js.map +1 -0
- package/dist/queries/getTableColumnFromPath.d.ts +12 -3
- package/dist/queries/getTableColumnFromPath.d.ts.map +1 -1
- package/dist/queries/getTableColumnFromPath.js +65 -28
- package/dist/queries/getTableColumnFromPath.js.map +1 -1
- package/dist/queries/operatorMap.d.ts +7 -3
- package/dist/queries/operatorMap.d.ts.map +1 -1
- package/dist/queries/operatorMap.js.map +1 -1
- package/dist/queries/parseParams.d.ts.map +1 -1
- package/dist/queries/parseParams.js +262 -10
- package/dist/queries/parseParams.js.map +1 -1
- package/dist/queries/resolveRelationshipPath.d.ts +36 -0
- package/dist/queries/resolveRelationshipPath.d.ts.map +1 -0
- package/dist/queries/resolveRelationshipPath.js +66 -0
- package/dist/queries/resolveRelationshipPath.js.map +1 -0
- package/dist/queries/validateOperatorHandlers.d.ts +8 -0
- package/dist/queries/validateOperatorHandlers.d.ts.map +1 -0
- package/dist/queries/validateOperatorHandlers.js +30 -0
- package/dist/queries/validateOperatorHandlers.js.map +1 -0
- package/dist/schema/build.js +3 -3
- package/dist/schema/build.js.map +1 -1
- package/dist/schema/traverseFields.js +5 -5
- package/dist/schema/traverseFields.js.map +1 -1
- package/dist/sqlite/createJSONQuery/convertPathToJSONTraversal.js +3 -2
- package/dist/sqlite/createJSONQuery/convertPathToJSONTraversal.js.map +1 -1
- package/dist/sqlite/createJSONQuery/index.d.ts.map +1 -1
- package/dist/sqlite/createJSONQuery/index.js +6 -5
- package/dist/sqlite/createJSONQuery/index.js.map +1 -1
- package/dist/sqlite/createRequireDrizzleKit.d.ts +6 -0
- package/dist/sqlite/createRequireDrizzleKit.d.ts.map +1 -0
- package/dist/sqlite/createRequireDrizzleKit.js +15 -0
- package/dist/sqlite/createRequireDrizzleKit.js.map +1 -0
- package/dist/sqlite/execute.js.map +1 -1
- package/dist/sqlite/insert.d.ts.map +1 -1
- package/dist/sqlite/insert.js +4 -1
- package/dist/sqlite/insert.js.map +1 -1
- package/dist/sqlite/predefinedMigrations/sizes-to-variants/index.d.ts +15 -0
- package/dist/sqlite/predefinedMigrations/sizes-to-variants/index.d.ts.map +1 -0
- package/dist/sqlite/predefinedMigrations/sizes-to-variants/index.js +114 -0
- package/dist/sqlite/predefinedMigrations/sizes-to-variants/index.js.map +1 -0
- package/dist/transform/read/traverseFields.d.ts.map +1 -1
- package/dist/transform/read/traverseFields.js +11 -3
- package/dist/transform/read/traverseFields.js.map +1 -1
- package/dist/transform/write/blocks.d.ts.map +1 -1
- package/dist/transform/write/blocks.js +3 -1
- package/dist/transform/write/blocks.js.map +1 -1
- package/dist/transform/write/traverseFields.d.ts.map +1 -1
- package/dist/transform/write/traverseFields.js +9 -15
- package/dist/transform/write/traverseFields.js.map +1 -1
- package/dist/types.d.ts +52 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/updateJobs.d.ts.map +1 -1
- package/dist/updateJobs.js +37 -0
- package/dist/updateJobs.js.map +1 -1
- package/dist/updateOne.d.ts.map +1 -1
- package/dist/updateOne.js +41 -1
- package/dist/updateOne.js.map +1 -1
- package/dist/upsertRow/index.d.ts +1 -1
- package/dist/upsertRow/index.d.ts.map +1 -1
- package/dist/upsertRow/index.js +25 -5
- package/dist/upsertRow/index.js.map +1 -1
- package/dist/utilities/blocksToJsonMigrator.d.ts.map +1 -1
- package/dist/utilities/blocksToJsonMigrator.js +7 -18
- package/dist/utilities/blocksToJsonMigrator.js.map +1 -1
- package/dist/utilities/buildCreateMigration.d.ts.map +1 -1
- package/dist/utilities/buildCreateMigration.js +13 -9
- package/dist/utilities/buildCreateMigration.js.map +1 -1
- package/dist/utilities/buildDynamicPredefinedSizesToVariantsMigration.d.ts +15 -0
- package/dist/utilities/buildDynamicPredefinedSizesToVariantsMigration.d.ts.map +1 -0
- package/dist/utilities/buildDynamicPredefinedSizesToVariantsMigration.js +110 -0
- package/dist/utilities/buildDynamicPredefinedSizesToVariantsMigration.js.map +1 -0
- package/dist/utilities/buildForeignKeyName.d.ts.map +1 -1
- package/dist/utilities/buildForeignKeyName.js +3 -2
- package/dist/utilities/buildForeignKeyName.js.map +1 -1
- package/dist/utilities/buildIndexName.d.ts.map +1 -1
- package/dist/utilities/buildIndexName.js +3 -2
- package/dist/utilities/buildIndexName.js.map +1 -1
- package/dist/utilities/checkTruncatedIdentifiers.d.ts +13 -0
- package/dist/utilities/checkTruncatedIdentifiers.d.ts.map +1 -0
- package/dist/utilities/checkTruncatedIdentifiers.js +56 -0
- package/dist/utilities/checkTruncatedIdentifiers.js.map +1 -0
- package/dist/utilities/createSchemaGenerator.d.ts.map +1 -1
- package/dist/utilities/createSchemaGenerator.js +10 -12
- package/dist/utilities/createSchemaGenerator.js.map +1 -1
- package/dist/utilities/executeSchemaHooks.js +1 -1
- package/dist/utilities/executeSchemaHooks.js.map +1 -1
- package/dist/utilities/formatGeneratedFile.d.ts +10 -0
- package/dist/utilities/formatGeneratedFile.d.ts.map +1 -0
- package/dist/utilities/formatGeneratedFile.js +58 -0
- package/dist/utilities/formatGeneratedFile.js.map +1 -0
- package/dist/utilities/getSizesToVariantsRenames.d.ts +54 -0
- package/dist/utilities/getSizesToVariantsRenames.d.ts.map +1 -0
- package/dist/utilities/getSizesToVariantsRenames.js +251 -0
- package/dist/utilities/getSizesToVariantsRenames.js.map +1 -0
- package/dist/utilities/getTransaction.js.map +1 -1
- package/dist/utilities/parseJSONPathSegment.d.ts +9 -0
- package/dist/utilities/parseJSONPathSegment.d.ts.map +1 -0
- package/dist/utilities/parseJSONPathSegment.js +17 -0
- package/dist/utilities/parseJSONPathSegment.js.map +1 -0
- package/dist/utilities/pushDevSchema.js +1 -1
- package/dist/utilities/pushDevSchema.js.map +1 -1
- package/dist/utilities/validateExistingBlockIsIdentical.d.ts +1 -5
- package/dist/utilities/validateExistingBlockIsIdentical.d.ts.map +1 -1
- package/dist/utilities/validateExistingBlockIsIdentical.js.map +1 -1
- package/dist/utilities/validateIdentifierLength.d.ts +12 -0
- package/dist/utilities/validateIdentifierLength.d.ts.map +1 -0
- package/dist/utilities/validateIdentifierLength.js +18 -0
- package/dist/utilities/validateIdentifierLength.js.map +1 -0
- package/package.json +17 -19
- package/dist/sqlite/requireDrizzleKit.d.ts +0 -3
- package/dist/sqlite/requireDrizzleKit.d.ts.map +0 -1
- package/dist/sqlite/requireDrizzleKit.js +0 -12
- package/dist/sqlite/requireDrizzleKit.js.map +0 -1
- package/dist/upsertRow/handleUpsertError.spec.js +0 -42
- package/dist/upsertRow/handleUpsertError.spec.js.map +0 -1
- package/dist/utilities/isValidStringID.spec.js +0 -15
- package/dist/utilities/isValidStringID.spec.js.map +0 -1
|
@@ -0,0 +1,301 @@
|
|
|
1
|
+
import { and, getTableName, isNotNull, isNull, or, sql } from 'drizzle-orm';
|
|
2
|
+
import { QueryError } from 'payload';
|
|
3
|
+
import toSnakeCase from 'to-snake-case';
|
|
4
|
+
import { buildOperatorConstraint } from '../queries/buildOperatorConstraint.js';
|
|
5
|
+
import { sanitizeQueryValue } from '../queries/sanitizeQueryValue.js';
|
|
6
|
+
const supportedJSONQueryOperators = new Set([
|
|
7
|
+
'contains',
|
|
8
|
+
'equals',
|
|
9
|
+
'exists',
|
|
10
|
+
'in',
|
|
11
|
+
'like'
|
|
12
|
+
]);
|
|
13
|
+
/**
|
|
14
|
+
* Builds a where clause for one collection before the polymorphic branches are combined. A field
|
|
15
|
+
* that is absent from this collection resolves to SQL NULL, and relationTo resolves to the current
|
|
16
|
+
* collection slug.
|
|
17
|
+
*/ export const buildPolymorphicJoinWhere = ({ adapter, collection, locale, table, where, wherePlan })=>{
|
|
18
|
+
const constraints = [];
|
|
19
|
+
for(const key in where){
|
|
20
|
+
if ([
|
|
21
|
+
'AND',
|
|
22
|
+
'OR'
|
|
23
|
+
].includes(key.toUpperCase())) {
|
|
24
|
+
if (!Array.isArray(where[key])) {
|
|
25
|
+
throw new QueryError([
|
|
26
|
+
{
|
|
27
|
+
path: key
|
|
28
|
+
}
|
|
29
|
+
]);
|
|
30
|
+
}
|
|
31
|
+
const combine = key.toUpperCase() === 'AND' ? and : or;
|
|
32
|
+
const nestedConstraints = where[key].map((nestedWhere)=>buildPolymorphicJoinWhere({
|
|
33
|
+
adapter,
|
|
34
|
+
collection,
|
|
35
|
+
locale,
|
|
36
|
+
table,
|
|
37
|
+
where: nestedWhere,
|
|
38
|
+
wherePlan
|
|
39
|
+
}));
|
|
40
|
+
const nestedCondition = combine(...nestedConstraints);
|
|
41
|
+
if (nestedCondition) {
|
|
42
|
+
constraints.push(nestedCondition);
|
|
43
|
+
}
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
const resolvedPath = resolveWherePath({
|
|
47
|
+
adapter,
|
|
48
|
+
collection,
|
|
49
|
+
schemaPath: key,
|
|
50
|
+
table,
|
|
51
|
+
wherePlan
|
|
52
|
+
});
|
|
53
|
+
for (let payloadOperator of Object.keys(where[key])){
|
|
54
|
+
const originalOperator = payloadOperator;
|
|
55
|
+
let value = where[key][payloadOperator];
|
|
56
|
+
if (resolvedPath.type === 'invalid') {
|
|
57
|
+
throw new QueryError([
|
|
58
|
+
{
|
|
59
|
+
path: `${key}.${payloadOperator}`
|
|
60
|
+
}
|
|
61
|
+
]);
|
|
62
|
+
}
|
|
63
|
+
if (resolvedPath.type === 'hasManySelect') {
|
|
64
|
+
if (!supportedJSONQueryOperators.has(payloadOperator)) {
|
|
65
|
+
throw new QueryError([
|
|
66
|
+
{
|
|
67
|
+
path: `${key}.${payloadOperator}`
|
|
68
|
+
}
|
|
69
|
+
]);
|
|
70
|
+
}
|
|
71
|
+
const sanitizedQueryValue = sanitizeQueryValue({
|
|
72
|
+
adapter,
|
|
73
|
+
field: resolvedPath.fieldContext,
|
|
74
|
+
isUUID: false,
|
|
75
|
+
operator: payloadOperator,
|
|
76
|
+
relationOrPath: key,
|
|
77
|
+
val: value
|
|
78
|
+
});
|
|
79
|
+
if (sanitizedQueryValue === null) {
|
|
80
|
+
throw new QueryError([
|
|
81
|
+
{
|
|
82
|
+
path: `${key}.${originalOperator}`
|
|
83
|
+
}
|
|
84
|
+
]);
|
|
85
|
+
}
|
|
86
|
+
if (sanitizedQueryValue.columns) {
|
|
87
|
+
throw new QueryError([
|
|
88
|
+
{
|
|
89
|
+
path: `${key}.${originalOperator}`
|
|
90
|
+
}
|
|
91
|
+
]);
|
|
92
|
+
}
|
|
93
|
+
value = sanitizedQueryValue.value;
|
|
94
|
+
if (payloadOperator === 'in' && Array.isArray(value) && value.length === 0) {
|
|
95
|
+
constraints.push(sql.raw('false'));
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
const jsonQueryOperator = payloadOperator === 'exists' ? 'exists' : sanitizedQueryValue.operator;
|
|
99
|
+
constraints.push(sql.raw(adapter.createJSONQuery({
|
|
100
|
+
column: resolvedPath.jsonExpression,
|
|
101
|
+
operator: jsonQueryOperator,
|
|
102
|
+
pathSegments: [
|
|
103
|
+
resolvedPath.pathPlan.columnPath
|
|
104
|
+
],
|
|
105
|
+
value
|
|
106
|
+
})));
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
if (payloadOperator === '$raw') {
|
|
110
|
+
if (typeof value !== 'string') {
|
|
111
|
+
throw new QueryError([
|
|
112
|
+
{
|
|
113
|
+
path: `${key}.${payloadOperator}`
|
|
114
|
+
}
|
|
115
|
+
]);
|
|
116
|
+
}
|
|
117
|
+
constraints.push(sql.raw(value));
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
const { column, fieldContext, queryValueContext } = resolvedPath;
|
|
121
|
+
if (payloadOperator === 'like' && (queryValueContext.field.type === 'number' || queryValueContext.field.type === 'relationship' || queryValueContext.field.type === 'upload' || queryValueContext.isUUID)) {
|
|
122
|
+
payloadOperator = 'equals';
|
|
123
|
+
}
|
|
124
|
+
const sanitizedQueryValue = sanitizeQueryValue({
|
|
125
|
+
adapter,
|
|
126
|
+
field: queryValueContext.field,
|
|
127
|
+
isUUID: queryValueContext.isUUID,
|
|
128
|
+
operator: payloadOperator,
|
|
129
|
+
relationOrPath: key,
|
|
130
|
+
val: value
|
|
131
|
+
});
|
|
132
|
+
if (sanitizedQueryValue === null) {
|
|
133
|
+
throw new QueryError([
|
|
134
|
+
{
|
|
135
|
+
path: `${key}.${originalOperator}`
|
|
136
|
+
}
|
|
137
|
+
]);
|
|
138
|
+
}
|
|
139
|
+
if (sanitizedQueryValue.columns) {
|
|
140
|
+
throw new QueryError([
|
|
141
|
+
{
|
|
142
|
+
path: `${key}.${originalOperator}`
|
|
143
|
+
}
|
|
144
|
+
]);
|
|
145
|
+
}
|
|
146
|
+
payloadOperator = sanitizedQueryValue.operator;
|
|
147
|
+
value = sanitizedQueryValue.value;
|
|
148
|
+
if (!(payloadOperator in adapter.operators)) {
|
|
149
|
+
throw new QueryError([
|
|
150
|
+
{
|
|
151
|
+
path: `${key}.${originalOperator}`
|
|
152
|
+
}
|
|
153
|
+
]);
|
|
154
|
+
}
|
|
155
|
+
const resolvedOperator = payloadOperator;
|
|
156
|
+
const operator = adapter.operators[resolvedOperator];
|
|
157
|
+
const buildColumnConstraint = (constraintValue)=>{
|
|
158
|
+
if (!fieldContext) {
|
|
159
|
+
return operator(column, constraintValue);
|
|
160
|
+
}
|
|
161
|
+
return buildOperatorConstraint({
|
|
162
|
+
adapter,
|
|
163
|
+
column,
|
|
164
|
+
field: fieldContext.field,
|
|
165
|
+
locale,
|
|
166
|
+
originalOperator,
|
|
167
|
+
path: key,
|
|
168
|
+
resolvedOperator,
|
|
169
|
+
value: constraintValue
|
|
170
|
+
});
|
|
171
|
+
};
|
|
172
|
+
if (originalOperator === 'equals' && value === null) {
|
|
173
|
+
constraints.push(isNull(column));
|
|
174
|
+
continue;
|
|
175
|
+
}
|
|
176
|
+
if (originalOperator === 'not_equals') {
|
|
177
|
+
if (value === null) {
|
|
178
|
+
constraints.push(isNotNull(column));
|
|
179
|
+
} else {
|
|
180
|
+
const notEqualsConstraint = or(isNull(column), buildColumnConstraint(value));
|
|
181
|
+
if (notEqualsConstraint) {
|
|
182
|
+
constraints.push(notEqualsConstraint);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
if (originalOperator === 'in' && Array.isArray(value) && value.includes(null)) {
|
|
188
|
+
const nonNullValues = value.filter((item)=>item !== null);
|
|
189
|
+
const inConstraint = buildColumnConstraint(nonNullValues);
|
|
190
|
+
const nullAwareInConstraint = or(isNull(column), inConstraint);
|
|
191
|
+
if (nullAwareInConstraint) {
|
|
192
|
+
constraints.push(nullAwareInConstraint);
|
|
193
|
+
}
|
|
194
|
+
continue;
|
|
195
|
+
}
|
|
196
|
+
if (payloadOperator === 'like' && typeof value === 'string') {
|
|
197
|
+
const wordConstraints = value.split(' ').map((word)=>buildColumnConstraint(`%${word}%`));
|
|
198
|
+
const wordCondition = and(...wordConstraints);
|
|
199
|
+
if (wordCondition) {
|
|
200
|
+
constraints.push(wordCondition);
|
|
201
|
+
}
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
constraints.push(buildColumnConstraint(value));
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
return and(...constraints);
|
|
208
|
+
};
|
|
209
|
+
const resolveWherePath = ({ adapter, collection, schemaPath, table, wherePlan })=>{
|
|
210
|
+
const pathPlan = wherePlan.get(schemaPath);
|
|
211
|
+
if (!pathPlan) {
|
|
212
|
+
throw new QueryError([
|
|
213
|
+
{
|
|
214
|
+
path: schemaPath
|
|
215
|
+
}
|
|
216
|
+
]);
|
|
217
|
+
}
|
|
218
|
+
if (pathPlan.type === 'invalid') {
|
|
219
|
+
return {
|
|
220
|
+
type: 'invalid',
|
|
221
|
+
pathPlan
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
if (schemaPath === 'relationTo') {
|
|
225
|
+
return {
|
|
226
|
+
type: 'scalar',
|
|
227
|
+
column: sql`${collection}`,
|
|
228
|
+
pathPlan,
|
|
229
|
+
queryValueContext: {
|
|
230
|
+
type: 'scalar',
|
|
231
|
+
field: {
|
|
232
|
+
name: 'relationTo',
|
|
233
|
+
type: 'text'
|
|
234
|
+
},
|
|
235
|
+
isUUID: false
|
|
236
|
+
}
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
if (pathPlan.type === 'hasManySelect') {
|
|
240
|
+
const fieldContext = [
|
|
241
|
+
...pathPlan.fieldsByCollection.values()
|
|
242
|
+
].find((field)=>field.type === 'hasManySelect')?.field;
|
|
243
|
+
if (!fieldContext) {
|
|
244
|
+
return {
|
|
245
|
+
type: 'invalid',
|
|
246
|
+
pathPlan
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
return {
|
|
250
|
+
type: 'hasManySelect',
|
|
251
|
+
fieldContext,
|
|
252
|
+
jsonExpression: getHasManySelectExpression({
|
|
253
|
+
adapter,
|
|
254
|
+
collection,
|
|
255
|
+
pathPlan,
|
|
256
|
+
table
|
|
257
|
+
}),
|
|
258
|
+
pathPlan
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
const collectionField = pathPlan.fieldsByCollection.get(collection);
|
|
262
|
+
const fieldContext = collectionField?.type === 'scalar' ? collectionField : undefined;
|
|
263
|
+
const queryValueContext = fieldContext ?? [
|
|
264
|
+
...pathPlan.fieldsByCollection.values()
|
|
265
|
+
].find((field)=>field.type === 'scalar');
|
|
266
|
+
if (!queryValueContext) {
|
|
267
|
+
return {
|
|
268
|
+
type: 'invalid',
|
|
269
|
+
pathPlan
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
return {
|
|
273
|
+
type: 'scalar',
|
|
274
|
+
column: fieldContext ? fieldContext.isLocalized ? adapter.tables[`${getTableName(table)}${adapter.localesSuffix}`][pathPlan.columnPath] : table[pathPlan.columnPath] : sql`null`,
|
|
275
|
+
fieldContext,
|
|
276
|
+
pathPlan,
|
|
277
|
+
queryValueContext
|
|
278
|
+
};
|
|
279
|
+
};
|
|
280
|
+
const getHasManySelectExpression = ({ adapter, collection, pathPlan, table })=>{
|
|
281
|
+
if (pathPlan.fieldsByCollection.get(collection)?.type !== 'hasManySelect') {
|
|
282
|
+
return adapter.name === 'postgres' ? `'[]'::jsonb` : `'[]'`;
|
|
283
|
+
}
|
|
284
|
+
const selectTablePath = pathPlan.schemaPath.split('.').map((pathSegment)=>toSnakeCase(pathSegment)).join('_');
|
|
285
|
+
const valuesTableName = adapter.tableNameMap.get(`${toSnakeCase(collection)}_${selectTablePath}`);
|
|
286
|
+
if (!valuesTableName) {
|
|
287
|
+
throw new Error(`Polymorphic join collection "${collection}" has no value table for "${pathPlan.schemaPath}"`);
|
|
288
|
+
}
|
|
289
|
+
let qualifiedValuesTableName = valuesTableName;
|
|
290
|
+
let parentTableName = getTableName(table);
|
|
291
|
+
if (adapter.schemaName) {
|
|
292
|
+
qualifiedValuesTableName = `"${adapter.schemaName}"."${valuesTableName}"`;
|
|
293
|
+
parentTableName = `"${adapter.schemaName}"."${parentTableName}"`;
|
|
294
|
+
}
|
|
295
|
+
if (adapter.name === 'postgres') {
|
|
296
|
+
return `(select coalesce(jsonb_agg(${qualifiedValuesTableName}.value), '[]'::jsonb) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`;
|
|
297
|
+
}
|
|
298
|
+
return `(select json_group_array(${qualifiedValuesTableName}.value) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`;
|
|
299
|
+
};
|
|
300
|
+
|
|
301
|
+
//# sourceMappingURL=buildPolymorphicJoinWhere.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/find/buildPolymorphicJoinWhere.ts"],"sourcesContent":["import type { Column, SQL } from 'drizzle-orm'\n\nimport { and, getTableName, isNotNull, isNull, or, sql } from 'drizzle-orm'\nimport { type FlattenedField, type Operator, QueryError, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleResolvedOperator } from '../queries/operatorMap.js'\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\nimport type {\n PolymorphicJoinWherePlan,\n ScalarWhereField,\n WherePathPlan,\n} from './createPolymorphicJoinWherePlan.js'\n\nimport { buildOperatorConstraint } from '../queries/buildOperatorConstraint.js'\nimport { sanitizeQueryValue } from '../queries/sanitizeQueryValue.js'\n\nconst supportedJSONQueryOperators = new Set(['contains', 'equals', 'exists', 'in', 'like'])\n\ntype BuildPolymorphicJoinWhereArgs = {\n adapter: DrizzleAdapter\n collection: string\n locale?: string\n table: GenericTable\n where: Where\n wherePlan: PolymorphicJoinWherePlan\n}\n\ntype ResolvedWherePath =\n | {\n column: Column | SQL\n fieldContext?: ScalarWhereField\n pathPlan: WherePathPlan\n queryValueContext: ScalarWhereField\n type: 'scalar'\n }\n | {\n fieldContext: FlattenedField\n jsonExpression: string\n pathPlan: WherePathPlan\n type: 'hasManySelect'\n }\n | {\n pathPlan: WherePathPlan\n type: 'invalid'\n }\n\n/**\n * Builds a where clause for one collection before the polymorphic branches are combined. A field\n * that is absent from this collection resolves to SQL NULL, and relationTo resolves to the current\n * collection slug.\n */\nexport const buildPolymorphicJoinWhere = ({\n adapter,\n collection,\n locale,\n table,\n where,\n wherePlan,\n}: BuildPolymorphicJoinWhereArgs): SQL | undefined => {\n const constraints: SQL[] = []\n\n for (const key in where) {\n if (['AND', 'OR'].includes(key.toUpperCase())) {\n if (!Array.isArray(where[key])) {\n throw new QueryError([{ path: key }])\n }\n\n const combine = key.toUpperCase() === 'AND' ? and : or\n const nestedConstraints = where[key].map((nestedWhere) =>\n buildPolymorphicJoinWhere({\n adapter,\n collection,\n locale,\n table,\n where: nestedWhere,\n wherePlan,\n }),\n )\n const nestedCondition = combine(...nestedConstraints)\n\n if (nestedCondition) {\n constraints.push(nestedCondition)\n }\n\n continue\n }\n\n const resolvedPath = resolveWherePath({\n adapter,\n collection,\n schemaPath: key,\n table,\n wherePlan,\n })\n\n for (let payloadOperator of Object.keys(where[key])) {\n const originalOperator = payloadOperator as Operator\n let value = where[key][payloadOperator]\n\n if (resolvedPath.type === 'invalid') {\n throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n }\n\n if (resolvedPath.type === 'hasManySelect') {\n if (!supportedJSONQueryOperators.has(payloadOperator)) {\n throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n }\n\n const sanitizedQueryValue = sanitizeQueryValue({\n adapter,\n field: resolvedPath.fieldContext,\n isUUID: false,\n operator: payloadOperator,\n relationOrPath: key,\n val: value,\n })\n\n if (sanitizedQueryValue === null) {\n throw new QueryError([{ path: `${key}.${originalOperator}` }])\n }\n\n if (sanitizedQueryValue.columns) {\n throw new QueryError([{ path: `${key}.${originalOperator}` }])\n }\n\n value = sanitizedQueryValue.value\n\n if (payloadOperator === 'in' && Array.isArray(value) && value.length === 0) {\n constraints.push(sql.raw('false'))\n continue\n }\n\n const jsonQueryOperator =\n payloadOperator === 'exists' ? 'exists' : sanitizedQueryValue.operator\n\n constraints.push(\n sql.raw(\n adapter.createJSONQuery({\n column: resolvedPath.jsonExpression,\n operator: jsonQueryOperator,\n pathSegments: [resolvedPath.pathPlan.columnPath],\n value,\n }),\n ),\n )\n continue\n }\n\n if (payloadOperator === '$raw') {\n if (typeof value !== 'string') {\n throw new QueryError([{ path: `${key}.${payloadOperator}` }])\n }\n\n constraints.push(sql.raw(value))\n continue\n }\n\n const { column, fieldContext, queryValueContext } = resolvedPath\n\n if (\n payloadOperator === 'like' &&\n (queryValueContext.field.type === 'number' ||\n queryValueContext.field.type === 'relationship' ||\n queryValueContext.field.type === 'upload' ||\n queryValueContext.isUUID)\n ) {\n payloadOperator = 'equals'\n }\n\n const sanitizedQueryValue = sanitizeQueryValue({\n adapter,\n field: queryValueContext.field,\n isUUID: queryValueContext.isUUID,\n operator: payloadOperator,\n relationOrPath: key,\n val: value,\n })\n\n if (sanitizedQueryValue === null) {\n throw new QueryError([{ path: `${key}.${originalOperator}` }])\n }\n\n if (sanitizedQueryValue.columns) {\n throw new QueryError([{ path: `${key}.${originalOperator}` }])\n }\n\n payloadOperator = sanitizedQueryValue.operator\n value = sanitizedQueryValue.value\n\n if (!(payloadOperator in adapter.operators)) {\n throw new QueryError([{ path: `${key}.${originalOperator}` }])\n }\n\n const resolvedOperator = payloadOperator as DrizzleResolvedOperator\n const operator = adapter.operators[resolvedOperator]\n const buildColumnConstraint = (constraintValue: unknown) => {\n if (!fieldContext) {\n return operator(column, constraintValue)\n }\n\n return buildOperatorConstraint({\n adapter,\n column,\n field: fieldContext.field,\n locale,\n originalOperator,\n path: key,\n resolvedOperator,\n value: constraintValue,\n })\n }\n\n if (originalOperator === 'equals' && value === null) {\n constraints.push(isNull(column))\n continue\n }\n\n if (originalOperator === 'not_equals') {\n if (value === null) {\n constraints.push(isNotNull(column))\n } else {\n const notEqualsConstraint = or(isNull(column), buildColumnConstraint(value))\n\n if (notEqualsConstraint) {\n constraints.push(notEqualsConstraint)\n }\n }\n continue\n }\n\n if (originalOperator === 'in' && Array.isArray(value) && value.includes(null)) {\n const nonNullValues = value.filter((item) => item !== null)\n const inConstraint = buildColumnConstraint(nonNullValues)\n const nullAwareInConstraint = or(isNull(column), inConstraint)\n\n if (nullAwareInConstraint) {\n constraints.push(nullAwareInConstraint)\n }\n continue\n }\n\n if (payloadOperator === 'like' && typeof value === 'string') {\n const wordConstraints = value.split(' ').map((word) => buildColumnConstraint(`%${word}%`))\n const wordCondition = and(...wordConstraints)\n\n if (wordCondition) {\n constraints.push(wordCondition)\n }\n continue\n }\n\n constraints.push(buildColumnConstraint(value))\n }\n }\n\n return and(...constraints)\n}\n\nconst resolveWherePath = ({\n adapter,\n collection,\n schemaPath,\n table,\n wherePlan,\n}: {\n schemaPath: string\n} & Omit<BuildPolymorphicJoinWhereArgs, 'locale' | 'where'>): ResolvedWherePath => {\n const pathPlan = wherePlan.get(schemaPath)\n\n if (!pathPlan) {\n throw new QueryError([{ path: schemaPath }])\n }\n\n if (pathPlan.type === 'invalid') {\n return { type: 'invalid', pathPlan }\n }\n\n if (schemaPath === 'relationTo') {\n return {\n type: 'scalar',\n column: sql`${collection}`,\n pathPlan,\n queryValueContext: {\n type: 'scalar',\n field: { name: 'relationTo', type: 'text' },\n isUUID: false,\n },\n }\n }\n\n if (pathPlan.type === 'hasManySelect') {\n const fieldContext = [...pathPlan.fieldsByCollection.values()].find(\n (field) => field.type === 'hasManySelect',\n )?.field\n\n if (!fieldContext) {\n return { type: 'invalid', pathPlan }\n }\n\n return {\n type: 'hasManySelect',\n fieldContext,\n jsonExpression: getHasManySelectExpression({\n adapter,\n collection,\n pathPlan,\n table,\n }),\n pathPlan,\n }\n }\n\n const collectionField = pathPlan.fieldsByCollection.get(collection)\n const fieldContext = collectionField?.type === 'scalar' ? collectionField : undefined\n const queryValueContext =\n fieldContext ??\n [...pathPlan.fieldsByCollection.values()].find(\n (field): field is ScalarWhereField => field.type === 'scalar',\n )\n\n if (!queryValueContext) {\n return { type: 'invalid', pathPlan }\n }\n\n return {\n type: 'scalar',\n column: fieldContext\n ? fieldContext.isLocalized\n ? adapter.tables[`${getTableName(table)}${adapter.localesSuffix}`][pathPlan.columnPath]\n : table[pathPlan.columnPath]\n : sql`null`,\n fieldContext,\n pathPlan,\n queryValueContext,\n }\n}\n\nconst getHasManySelectExpression = ({\n adapter,\n collection,\n pathPlan,\n table,\n}: {\n adapter: DrizzleAdapter\n collection: string\n pathPlan: WherePathPlan\n table: GenericTable\n}): string => {\n if (pathPlan.fieldsByCollection.get(collection)?.type !== 'hasManySelect') {\n return adapter.name === 'postgres' ? `'[]'::jsonb` : `'[]'`\n }\n\n const selectTablePath = pathPlan.schemaPath\n .split('.')\n .map((pathSegment) => toSnakeCase(pathSegment))\n .join('_')\n const valuesTableName = adapter.tableNameMap.get(`${toSnakeCase(collection)}_${selectTablePath}`)\n\n if (!valuesTableName) {\n throw new Error(\n `Polymorphic join collection \"${collection}\" has no value table for \"${pathPlan.schemaPath}\"`,\n )\n }\n\n let qualifiedValuesTableName = valuesTableName\n let parentTableName = getTableName(table)\n\n if (adapter.schemaName) {\n qualifiedValuesTableName = `\"${adapter.schemaName}\".\"${valuesTableName}\"`\n parentTableName = `\"${adapter.schemaName}\".\"${parentTableName}\"`\n }\n\n if (adapter.name === 'postgres') {\n return `(select coalesce(jsonb_agg(${qualifiedValuesTableName}.value), '[]'::jsonb) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`\n }\n\n return `(select json_group_array(${qualifiedValuesTableName}.value) from ${qualifiedValuesTableName} where ${qualifiedValuesTableName}.parent_id = ${parentTableName}.id)`\n}\n"],"names":["and","getTableName","isNotNull","isNull","or","sql","QueryError","toSnakeCase","buildOperatorConstraint","sanitizeQueryValue","supportedJSONQueryOperators","Set","buildPolymorphicJoinWhere","adapter","collection","locale","table","where","wherePlan","constraints","key","includes","toUpperCase","Array","isArray","path","combine","nestedConstraints","map","nestedWhere","nestedCondition","push","resolvedPath","resolveWherePath","schemaPath","payloadOperator","Object","keys","originalOperator","value","type","has","sanitizedQueryValue","field","fieldContext","isUUID","operator","relationOrPath","val","columns","length","raw","jsonQueryOperator","createJSONQuery","column","jsonExpression","pathSegments","pathPlan","columnPath","queryValueContext","operators","resolvedOperator","buildColumnConstraint","constraintValue","notEqualsConstraint","nonNullValues","filter","item","inConstraint","nullAwareInConstraint","wordConstraints","split","word","wordCondition","get","name","fieldsByCollection","values","find","getHasManySelectExpression","collectionField","undefined","isLocalized","tables","localesSuffix","selectTablePath","pathSegment","join","valuesTableName","tableNameMap","Error","qualifiedValuesTableName","parentTableName","schemaName"],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type FlattenedField, type Where } from 'payload';
|
|
2
|
+
import type { DrizzleAdapter } from '../types.js';
|
|
3
|
+
export type ScalarWhereField = {
|
|
4
|
+
field: FlattenedField;
|
|
5
|
+
isLocalized?: boolean;
|
|
6
|
+
isUUID: boolean;
|
|
7
|
+
type: 'scalar';
|
|
8
|
+
};
|
|
9
|
+
type CollectionWhereField = {
|
|
10
|
+
field: FlattenedField;
|
|
11
|
+
type: 'hasManySelect';
|
|
12
|
+
} | ScalarWhereField;
|
|
13
|
+
export type WherePathPlan = {
|
|
14
|
+
columnPath: string;
|
|
15
|
+
fieldsByCollection: Map<string, CollectionWhereField>;
|
|
16
|
+
schemaPath: string;
|
|
17
|
+
type: 'hasManySelect' | 'invalid' | 'scalar';
|
|
18
|
+
};
|
|
19
|
+
export type PolymorphicJoinWherePlan = Map<string, WherePathPlan>;
|
|
20
|
+
/**
|
|
21
|
+
* Analyzes every leaf path in a polymorphic join where clause before SQL is built. Each plan entry
|
|
22
|
+
* records the flattened column path, the compatible field shape for each target collection, and
|
|
23
|
+
* whether the path uses a scalar column or a has-many select value table. A field may be absent
|
|
24
|
+
* from some target collections; those branches compare against SQL NULL or an empty JSON array.
|
|
25
|
+
*
|
|
26
|
+
* Paths are marked as invalid when their storage shapes conflict, require separate-row
|
|
27
|
+
* traversal, have no matching field, lack a required column, or collide after path flattening.
|
|
28
|
+
*
|
|
29
|
+
* @returns A plan keyed by each unique schema path in `where`.
|
|
30
|
+
* @throws If a target collection or its mapped database table is not available in the adapter.
|
|
31
|
+
*/
|
|
32
|
+
export declare const createPolymorphicJoinWherePlan: ({ adapter, collections, where, }: {
|
|
33
|
+
adapter: DrizzleAdapter;
|
|
34
|
+
collections: string[];
|
|
35
|
+
where: Where;
|
|
36
|
+
}) => PolymorphicJoinWherePlan;
|
|
37
|
+
export {};
|
|
38
|
+
//# sourceMappingURL=createPolymorphicJoinWherePlan.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createPolymorphicJoinWherePlan.d.ts","sourceRoot":"","sources":["../../src/find/createPolymorphicJoinWherePlan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAkB,KAAK,KAAK,EAAE,MAAM,SAAS,CAAA;AAGzE,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,aAAa,CAAA;AAK/D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,cAAc,CAAA;IACrB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,KAAK,oBAAoB,GAAG;IAAE,KAAK,EAAE,cAAc,CAAC;IAAC,IAAI,EAAE,eAAe,CAAA;CAAE,GAAG,gBAAgB,CAAA;AAE/F,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;IACrD,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,eAAe,GAAG,SAAS,GAAG,QAAQ,CAAA;CAC7C,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAEjE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,8BAA8B,qCAIxC;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,KAAK,EAAE,KAAK,CAAA;CACb,KAAG,wBA0IH,CAAA"}
|
|
@@ -0,0 +1,200 @@
|
|
|
1
|
+
import { getFieldByPath } from 'payload';
|
|
2
|
+
import toSnakeCase from 'to-snake-case';
|
|
3
|
+
import { isUUIDType } from '../utilities/isUUIDType.js';
|
|
4
|
+
import { sanitizePathSegment } from '../utilities/sanitizePathSegment.js';
|
|
5
|
+
/**
|
|
6
|
+
* Analyzes every leaf path in a polymorphic join where clause before SQL is built. Each plan entry
|
|
7
|
+
* records the flattened column path, the compatible field shape for each target collection, and
|
|
8
|
+
* whether the path uses a scalar column or a has-many select value table. A field may be absent
|
|
9
|
+
* from some target collections; those branches compare against SQL NULL or an empty JSON array.
|
|
10
|
+
*
|
|
11
|
+
* Paths are marked as invalid when their storage shapes conflict, require separate-row
|
|
12
|
+
* traversal, have no matching field, lack a required column, or collide after path flattening.
|
|
13
|
+
*
|
|
14
|
+
* @returns A plan keyed by each unique schema path in `where`.
|
|
15
|
+
* @throws If a target collection or its mapped database table is not available in the adapter.
|
|
16
|
+
*/ export const createPolymorphicJoinWherePlan = ({ adapter, collections, where })=>{
|
|
17
|
+
const collectionContexts = collections.map((collection)=>{
|
|
18
|
+
const collectionConfig = adapter.payload.collections[collection]?.config;
|
|
19
|
+
if (!collectionConfig) {
|
|
20
|
+
throw new Error(`Unknown polymorphic join collection "${collection}"`);
|
|
21
|
+
}
|
|
22
|
+
const tableName = adapter.tableNameMap.get(toSnakeCase(collection));
|
|
23
|
+
const table = tableName ? adapter.tables[tableName] : undefined;
|
|
24
|
+
if (!table) {
|
|
25
|
+
throw new Error(`Polymorphic join collection "${collection}" has no database table`);
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
collection,
|
|
29
|
+
collectionConfig,
|
|
30
|
+
table,
|
|
31
|
+
tableName
|
|
32
|
+
};
|
|
33
|
+
});
|
|
34
|
+
const schemaPathsByColumnPath = new Map();
|
|
35
|
+
const schemaPaths = new Set(getWhereSchemaPaths(where));
|
|
36
|
+
for (const schemaPath of schemaPaths){
|
|
37
|
+
const columnPath = getColumnPath(schemaPath);
|
|
38
|
+
const paths = schemaPathsByColumnPath.get(columnPath) ?? new Set();
|
|
39
|
+
paths.add(schemaPath);
|
|
40
|
+
schemaPathsByColumnPath.set(columnPath, paths);
|
|
41
|
+
}
|
|
42
|
+
const plan = new Map();
|
|
43
|
+
for (const schemaPath of schemaPaths){
|
|
44
|
+
const columnPath = getColumnPath(schemaPath);
|
|
45
|
+
const fieldsByCollection = new Map();
|
|
46
|
+
let isFieldPresent = schemaPath === 'id' || schemaPath === 'relationTo';
|
|
47
|
+
let hasManySelect = false;
|
|
48
|
+
let hasUnsupportedFieldShape = false;
|
|
49
|
+
const scalarQueryValueSignatures = new Set();
|
|
50
|
+
for (const { collection, collectionConfig, table, tableName } of collectionContexts){
|
|
51
|
+
const fieldAtPath = getFieldByPath({
|
|
52
|
+
fields: collectionConfig.flattenedFields,
|
|
53
|
+
path: schemaPath
|
|
54
|
+
});
|
|
55
|
+
if (schemaPath === 'id') {
|
|
56
|
+
const idColumn = table['id'];
|
|
57
|
+
if (!idColumn) {
|
|
58
|
+
hasUnsupportedFieldShape = true;
|
|
59
|
+
} else {
|
|
60
|
+
scalarQueryValueSignatures.add(`id:${idColumn.getSQLType()}`);
|
|
61
|
+
fieldsByCollection.set(collection, {
|
|
62
|
+
type: 'scalar',
|
|
63
|
+
field: fieldAtPath?.field ?? {
|
|
64
|
+
name: 'id',
|
|
65
|
+
type: isUUIDType(adapter.idType) ? 'text' : 'number'
|
|
66
|
+
},
|
|
67
|
+
isUUID: !fieldAtPath && isUUIDType(adapter.idType)
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
if (!fieldAtPath) {
|
|
73
|
+
if (pathHasUnsupportedNestedContainer({
|
|
74
|
+
fields: collectionConfig.flattenedFields,
|
|
75
|
+
path: schemaPath
|
|
76
|
+
})) {
|
|
77
|
+
hasUnsupportedFieldShape = true;
|
|
78
|
+
}
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
isFieldPresent = true;
|
|
82
|
+
if (pathHasSeparateRows({
|
|
83
|
+
fields: collectionConfig.flattenedFields,
|
|
84
|
+
path: schemaPath
|
|
85
|
+
})) {
|
|
86
|
+
hasUnsupportedFieldShape = true;
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
if (fieldAtPath.field.type === 'select' && fieldAtPath.field.hasMany) {
|
|
90
|
+
if (fieldAtPath.pathHasLocalized) {
|
|
91
|
+
hasUnsupportedFieldShape = true;
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
hasManySelect = true;
|
|
95
|
+
fieldsByCollection.set(collection, {
|
|
96
|
+
type: 'hasManySelect',
|
|
97
|
+
field: fieldAtPath.field
|
|
98
|
+
});
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
const fieldTable = fieldAtPath.pathHasLocalized ? adapter.tables[`${tableName}${adapter.localesSuffix}`] : table;
|
|
102
|
+
const fieldColumn = fieldTable?.[columnPath];
|
|
103
|
+
if (!fieldColumn) {
|
|
104
|
+
hasUnsupportedFieldShape = true;
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
fieldsByCollection.set(collection, {
|
|
108
|
+
type: 'scalar',
|
|
109
|
+
field: fieldAtPath.field,
|
|
110
|
+
...fieldAtPath.pathHasLocalized && {
|
|
111
|
+
isLocalized: true
|
|
112
|
+
},
|
|
113
|
+
isUUID: fieldColumn.columnType === 'PgUUID'
|
|
114
|
+
});
|
|
115
|
+
scalarQueryValueSignatures.add(getScalarQueryValueSignature({
|
|
116
|
+
column: fieldColumn,
|
|
117
|
+
field: fieldAtPath.field
|
|
118
|
+
}));
|
|
119
|
+
}
|
|
120
|
+
const hasColumnPathCollision = (schemaPathsByColumnPath.get(columnPath)?.size ?? 0) > 1;
|
|
121
|
+
const isInvalid = hasColumnPathCollision || !isFieldPresent || hasUnsupportedFieldShape || hasManySelect && scalarQueryValueSignatures.size > 0 || scalarQueryValueSignatures.size > 1;
|
|
122
|
+
plan.set(schemaPath, {
|
|
123
|
+
type: isInvalid ? 'invalid' : hasManySelect ? 'hasManySelect' : 'scalar',
|
|
124
|
+
columnPath,
|
|
125
|
+
fieldsByCollection,
|
|
126
|
+
schemaPath
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
return plan;
|
|
130
|
+
};
|
|
131
|
+
const textQueryFieldTypes = new Set([
|
|
132
|
+
'code',
|
|
133
|
+
'email',
|
|
134
|
+
'slug',
|
|
135
|
+
'text',
|
|
136
|
+
'textarea'
|
|
137
|
+
]);
|
|
138
|
+
const getScalarQueryValueSignature = ({ column, field })=>{
|
|
139
|
+
if (field.type === 'select' || field.type === 'radio') {
|
|
140
|
+
const optionValues = field.options.map((option)=>typeof option === 'string' ? option : option.value);
|
|
141
|
+
return `${field.type}:${JSON.stringify(optionValues)}`;
|
|
142
|
+
}
|
|
143
|
+
if (textQueryFieldTypes.has(field.type)) {
|
|
144
|
+
return 'text';
|
|
145
|
+
}
|
|
146
|
+
return `${field.type}:${column.getSQLType()}`;
|
|
147
|
+
};
|
|
148
|
+
const getWhereSchemaPaths = (where)=>{
|
|
149
|
+
const paths = [];
|
|
150
|
+
for(const key in where){
|
|
151
|
+
if ([
|
|
152
|
+
'AND',
|
|
153
|
+
'OR'
|
|
154
|
+
].includes(key.toUpperCase())) {
|
|
155
|
+
if (Array.isArray(where[key])) {
|
|
156
|
+
for (const nestedWhere of where[key]){
|
|
157
|
+
paths.push(...getWhereSchemaPaths(nestedWhere));
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
} else {
|
|
161
|
+
paths.push(key);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return paths;
|
|
165
|
+
};
|
|
166
|
+
const getColumnPath = (schemaPath)=>schemaPath.split('.').map((segment)=>sanitizePathSegment(segment)).join('_');
|
|
167
|
+
const pathHasSeparateRows = ({ fields, path })=>{
|
|
168
|
+
const pathSegments = path.split('.');
|
|
169
|
+
for(let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++){
|
|
170
|
+
const fieldAtParentPath = getFieldByPath({
|
|
171
|
+
fields,
|
|
172
|
+
path: pathSegments.slice(0, segmentIndex).join('.')
|
|
173
|
+
});
|
|
174
|
+
if (fieldAtParentPath?.field.type === 'array' || fieldAtParentPath?.field.type === 'blocks') {
|
|
175
|
+
return true;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
return false;
|
|
179
|
+
};
|
|
180
|
+
const pathHasUnsupportedNestedContainer = ({ fields, path })=>{
|
|
181
|
+
const pathSegments = path.split('.');
|
|
182
|
+
for(let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++){
|
|
183
|
+
const fieldAtParentPath = getFieldByPath({
|
|
184
|
+
fields,
|
|
185
|
+
path: pathSegments.slice(0, segmentIndex).join('.')
|
|
186
|
+
});
|
|
187
|
+
if (!fieldAtParentPath) {
|
|
188
|
+
return false;
|
|
189
|
+
}
|
|
190
|
+
if (![
|
|
191
|
+
'group',
|
|
192
|
+
'tab'
|
|
193
|
+
].includes(fieldAtParentPath.field.type)) {
|
|
194
|
+
return true;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
return false;
|
|
198
|
+
};
|
|
199
|
+
|
|
200
|
+
//# sourceMappingURL=createPolymorphicJoinWherePlan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/find/createPolymorphicJoinWherePlan.ts"],"sourcesContent":["import type { Column } from 'drizzle-orm'\n\nimport { type FlattenedField, getFieldByPath, type Where } from 'payload'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter, GenericTable } from '../types.js'\n\nimport { isUUIDType } from '../utilities/isUUIDType.js'\nimport { sanitizePathSegment } from '../utilities/sanitizePathSegment.js'\n\nexport type ScalarWhereField = {\n field: FlattenedField\n isLocalized?: boolean\n isUUID: boolean\n type: 'scalar'\n}\n\ntype CollectionWhereField = { field: FlattenedField; type: 'hasManySelect' } | ScalarWhereField\n\nexport type WherePathPlan = {\n columnPath: string\n fieldsByCollection: Map<string, CollectionWhereField>\n schemaPath: string\n type: 'hasManySelect' | 'invalid' | 'scalar'\n}\n\nexport type PolymorphicJoinWherePlan = Map<string, WherePathPlan>\n\n/**\n * Analyzes every leaf path in a polymorphic join where clause before SQL is built. Each plan entry\n * records the flattened column path, the compatible field shape for each target collection, and\n * whether the path uses a scalar column or a has-many select value table. A field may be absent\n * from some target collections; those branches compare against SQL NULL or an empty JSON array.\n *\n * Paths are marked as invalid when their storage shapes conflict, require separate-row\n * traversal, have no matching field, lack a required column, or collide after path flattening.\n *\n * @returns A plan keyed by each unique schema path in `where`.\n * @throws If a target collection or its mapped database table is not available in the adapter.\n */\nexport const createPolymorphicJoinWherePlan = ({\n adapter,\n collections,\n where,\n}: {\n adapter: DrizzleAdapter\n collections: string[]\n where: Where\n}): PolymorphicJoinWherePlan => {\n const collectionContexts = collections.map((collection) => {\n const collectionConfig = adapter.payload.collections[collection]?.config\n\n if (!collectionConfig) {\n throw new Error(`Unknown polymorphic join collection \"${collection}\"`)\n }\n\n const tableName = adapter.tableNameMap.get(toSnakeCase(collection))\n const table = tableName ? (adapter.tables[tableName] as GenericTable | undefined) : undefined\n\n if (!table) {\n throw new Error(`Polymorphic join collection \"${collection}\" has no database table`)\n }\n\n return { collection, collectionConfig, table, tableName }\n })\n const schemaPathsByColumnPath = new Map<string, Set<string>>()\n const schemaPaths = new Set(getWhereSchemaPaths(where))\n\n for (const schemaPath of schemaPaths) {\n const columnPath = getColumnPath(schemaPath)\n const paths = schemaPathsByColumnPath.get(columnPath) ?? new Set<string>()\n\n paths.add(schemaPath)\n schemaPathsByColumnPath.set(columnPath, paths)\n }\n\n const plan: PolymorphicJoinWherePlan = new Map()\n\n for (const schemaPath of schemaPaths) {\n const columnPath = getColumnPath(schemaPath)\n const fieldsByCollection = new Map<string, CollectionWhereField>()\n let isFieldPresent = schemaPath === 'id' || schemaPath === 'relationTo'\n let hasManySelect = false\n let hasUnsupportedFieldShape = false\n const scalarQueryValueSignatures = new Set<string>()\n\n for (const { collection, collectionConfig, table, tableName } of collectionContexts) {\n const fieldAtPath = getFieldByPath({\n fields: collectionConfig.flattenedFields,\n path: schemaPath,\n })\n\n if (schemaPath === 'id') {\n const idColumn = table['id'] as Column | undefined\n\n if (!idColumn) {\n hasUnsupportedFieldShape = true\n } else {\n scalarQueryValueSignatures.add(`id:${idColumn.getSQLType()}`)\n fieldsByCollection.set(collection, {\n type: 'scalar',\n field:\n fieldAtPath?.field ??\n ({\n name: 'id',\n type: isUUIDType(adapter.idType) ? 'text' : 'number',\n } as FlattenedField),\n isUUID: !fieldAtPath && isUUIDType(adapter.idType),\n })\n }\n\n continue\n }\n\n if (!fieldAtPath) {\n if (\n pathHasUnsupportedNestedContainer({\n fields: collectionConfig.flattenedFields,\n path: schemaPath,\n })\n ) {\n hasUnsupportedFieldShape = true\n }\n\n continue\n }\n\n isFieldPresent = true\n\n if (pathHasSeparateRows({ fields: collectionConfig.flattenedFields, path: schemaPath })) {\n hasUnsupportedFieldShape = true\n continue\n }\n\n if (fieldAtPath.field.type === 'select' && fieldAtPath.field.hasMany) {\n if (fieldAtPath.pathHasLocalized) {\n hasUnsupportedFieldShape = true\n continue\n }\n\n hasManySelect = true\n fieldsByCollection.set(collection, {\n type: 'hasManySelect',\n field: fieldAtPath.field,\n })\n continue\n }\n\n const fieldTable = fieldAtPath.pathHasLocalized\n ? adapter.tables[`${tableName}${adapter.localesSuffix}`]\n : table\n const fieldColumn = fieldTable?.[columnPath] as Column | undefined\n\n if (!fieldColumn) {\n hasUnsupportedFieldShape = true\n continue\n }\n\n fieldsByCollection.set(collection, {\n type: 'scalar',\n field: fieldAtPath.field,\n ...(fieldAtPath.pathHasLocalized && { isLocalized: true }),\n isUUID: fieldColumn.columnType === 'PgUUID',\n })\n scalarQueryValueSignatures.add(\n getScalarQueryValueSignature({ column: fieldColumn, field: fieldAtPath.field }),\n )\n }\n\n const hasColumnPathCollision = (schemaPathsByColumnPath.get(columnPath)?.size ?? 0) > 1\n const isInvalid =\n hasColumnPathCollision ||\n !isFieldPresent ||\n hasUnsupportedFieldShape ||\n (hasManySelect && scalarQueryValueSignatures.size > 0) ||\n scalarQueryValueSignatures.size > 1\n\n plan.set(schemaPath, {\n type: isInvalid ? 'invalid' : hasManySelect ? 'hasManySelect' : 'scalar',\n columnPath,\n fieldsByCollection,\n schemaPath,\n })\n }\n\n return plan\n}\n\nconst textQueryFieldTypes = new Set<FlattenedField['type']>([\n 'code',\n 'email',\n 'slug',\n 'text',\n 'textarea',\n])\n\nconst getScalarQueryValueSignature = ({\n column,\n field,\n}: {\n column: Column\n field: FlattenedField\n}): string => {\n if (field.type === 'select' || field.type === 'radio') {\n const optionValues = field.options.map((option) =>\n typeof option === 'string' ? option : option.value,\n )\n\n return `${field.type}:${JSON.stringify(optionValues)}`\n }\n\n if (textQueryFieldTypes.has(field.type)) {\n return 'text'\n }\n\n return `${field.type}:${column.getSQLType()}`\n}\n\nconst getWhereSchemaPaths = (where: Where): string[] => {\n const paths: string[] = []\n\n for (const key in where) {\n if (['AND', 'OR'].includes(key.toUpperCase())) {\n if (Array.isArray(where[key])) {\n for (const nestedWhere of where[key]) {\n paths.push(...getWhereSchemaPaths(nestedWhere))\n }\n }\n } else {\n paths.push(key)\n }\n }\n\n return paths\n}\n\nconst getColumnPath = (schemaPath: string): string =>\n schemaPath\n .split('.')\n .map((segment) => sanitizePathSegment(segment))\n .join('_')\n\nconst pathHasSeparateRows = ({ fields, path }: { fields: FlattenedField[]; path: string }) => {\n const pathSegments = path.split('.')\n\n for (let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++) {\n const fieldAtParentPath = getFieldByPath({\n fields,\n path: pathSegments.slice(0, segmentIndex).join('.'),\n })\n\n if (fieldAtParentPath?.field.type === 'array' || fieldAtParentPath?.field.type === 'blocks') {\n return true\n }\n }\n\n return false\n}\n\nconst pathHasUnsupportedNestedContainer = ({\n fields,\n path,\n}: {\n fields: FlattenedField[]\n path: string\n}) => {\n const pathSegments = path.split('.')\n\n for (let segmentIndex = 1; segmentIndex < pathSegments.length; segmentIndex++) {\n const fieldAtParentPath = getFieldByPath({\n fields,\n path: pathSegments.slice(0, segmentIndex).join('.'),\n })\n\n if (!fieldAtParentPath) {\n return false\n }\n\n if (!['group', 'tab'].includes(fieldAtParentPath.field.type)) {\n return true\n }\n }\n\n return false\n}\n"],"names":["getFieldByPath","toSnakeCase","isUUIDType","sanitizePathSegment","createPolymorphicJoinWherePlan","adapter","collections","where","collectionContexts","map","collection","collectionConfig","payload","config","Error","tableName","tableNameMap","get","table","tables","undefined","schemaPathsByColumnPath","Map","schemaPaths","Set","getWhereSchemaPaths","schemaPath","columnPath","getColumnPath","paths","add","set","plan","fieldsByCollection","isFieldPresent","hasManySelect","hasUnsupportedFieldShape","scalarQueryValueSignatures","fieldAtPath","fields","flattenedFields","path","idColumn","getSQLType","type","field","name","idType","isUUID","pathHasUnsupportedNestedContainer","pathHasSeparateRows","hasMany","pathHasLocalized","fieldTable","localesSuffix","fieldColumn","isLocalized","columnType","getScalarQueryValueSignature","column","hasColumnPathCollision","size","isInvalid","textQueryFieldTypes","optionValues","options","option","value","JSON","stringify","has","key","includes","toUpperCase","Array","isArray","nestedWhere","push","split","segment","join","pathSegments","segmentIndex","length","fieldAtParentPath","slice"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/find/traverseFields.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,cAAc,EAEnB,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,UAAU,EAEhB,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAcpD,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE;QAChB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,cAAc,iSAuBxB,iBAAiB,4BA2oBnB,CAAA"}
|