Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit 334990f

Browse files
JitPackJoyrideJitPackJoyride
committed
fix: 🐛 equality checks for uuid values was buggy
1 parent 3cf6016 commit 334990f

File tree

1 file changed

+73
-17
lines changed

1 file changed

+73
-17
lines changed

‎src/edgedb.ts‎

Lines changed: 73 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ export const edgedbAdapter = (
4343
User,
4444
(userObj: GlobalDatabaseUserAttributes) => ({
4545
...User["*"],
46-
filter_single: e.op(userObj.id, "=", e.cast(e.uuid, userId)),
46+
filter_single: e.op(
47+
e.cast(e.uuid, userObj.id),
48+
"=",
49+
e.cast(e.uuid, userId)
50+
),
4751
})
4852
);
4953

@@ -80,7 +84,11 @@ export const edgedbAdapter = (
8084
const keyInsertQuery = e.insert(Key, {
8185
...newKey,
8286
user: e.select(User, (userObj: GlobalDatabaseUserAttributes) => ({
83-
filter_single: e.op(userObj.id, "=", e.cast(e.uuid, result.id)),
87+
filter_single: e.op(
88+
e.cast(e.uuid, userObj.id),
89+
"=",
90+
e.cast(e.uuid, result.id)
91+
),
8492
})),
8593
});
8694
await keyInsertQuery.run(tx);
@@ -100,7 +108,11 @@ export const edgedbAdapter = (
100108
const query = e.delete(
101109
User,
102110
(userObj: GlobalDatabaseUserAttributes) => ({
103-
filter_single: e.op(userObj.id, "=", e.cast(e.uuid, userId)),
111+
filter_single: e.op(
112+
e.cast(e.uuid, userObj.id),
113+
"=",
114+
e.cast(e.uuid, userId)
115+
),
104116
})
105117
);
106118
await query.run(client);
@@ -109,7 +121,11 @@ export const edgedbAdapter = (
109121
const query = e.update(
110122
User,
111123
(userObj: GlobalDatabaseUserAttributes) => ({
112-
filter_single: e.op(userObj.id, "=", e.cast(e.uuid, userId)),
124+
filter_single: e.op(
125+
e.cast(e.uuid, userObj.id),
126+
"=",
127+
e.cast(e.uuid, userId)
128+
),
113129
set: partialUser,
114130
})
115131
);
@@ -126,7 +142,11 @@ export const edgedbAdapter = (
126142
(sessionObj: GlobalDatabaseSessionAttributes) => ({
127143
...Session["*"],
128144
user_id: e.cast(e.uuid, sessionObj.user.id),
129-
filter_single: e.op(sessionObj.id, "=", e.cast(e.uuid, sessionId)),
145+
filter_single: e.op(
146+
e.cast(e.uuid, sessionObj.id),
147+
"=",
148+
e.cast(e.uuid, sessionId)
149+
),
130150
})
131151
);
132152

@@ -142,7 +162,11 @@ export const edgedbAdapter = (
142162
(sessionObj: GlobalDatabaseSessionAttributes) => ({
143163
...Session["*"],
144164
user_id: e.cast(e.uuid, sessionObj.user.id),
145-
filter: e.op(sessionObj.user.id, "=", e.cast(e.uuid, userId)),
165+
filter: e.op(
166+
e.cast(e.uuid, sessionObj.user.id),
167+
"=",
168+
e.cast(e.uuid, userId)
169+
),
146170
})
147171
);
148172

@@ -166,7 +190,11 @@ export const edgedbAdapter = (
166190
const query = e.insert(Session, {
167191
...sessionWithoutUserId,
168192
user: e.select(User, (userObj: GlobalDatabaseUserAttributes) => ({
169-
filter_single: e.op(userObj.id, "=", e.cast(e.uuid, user_id)),
193+
filter_single: e.op(
194+
e.cast(e.uuid, userObj.id),
195+
"=",
196+
e.cast(e.uuid, user_id)
197+
),
170198
})),
171199
});
172200
await query.run(client);
@@ -190,7 +218,11 @@ export const edgedbAdapter = (
190218
const query = e.delete(
191219
Session,
192220
(sessionObj: GlobalDatabaseSessionAttributes) => ({
193-
filter_single: e.op(sessionObj.id, "=", e.cast(e.uuid, sessionId)),
221+
filter_single: e.op(
222+
e.cast(e.uuid, sessionObj.id),
223+
"=",
224+
e.cast(e.uuid, sessionId)
225+
),
194226
})
195227
);
196228

@@ -204,7 +236,11 @@ export const edgedbAdapter = (
204236
const query = e.delete(
205237
Session,
206238
(sessionObj: GlobalDatabaseSessionAttributes) => ({
207-
filter: e.op(sessionObj.user.id, "=", e.cast(e.uuid, userId)),
239+
filter: e.op(
240+
e.cast(e.uuid, sessionObj.user.id),
241+
"=",
242+
e.cast(e.uuid, userId)
243+
),
208244
})
209245
);
210246

@@ -218,7 +254,11 @@ export const edgedbAdapter = (
218254
const query = e.update(
219255
Session,
220256
(sessionObj: GlobalDatabaseSessionAttributes) => ({
221-
filter_single: e.op(sessionObj.id, "=", e.cast(e.uuid, sessionId)),
257+
filter_single: e.op(
258+
e.cast(e.uuid, sessionObj.id),
259+
"=",
260+
e.cast(e.uuid, sessionId)
261+
),
222262
set: partialSession,
223263
})
224264
);
@@ -229,7 +269,7 @@ export const edgedbAdapter = (
229269
const query = e.select(Key, (keyObj: any) => ({
230270
...Key["*"],
231271
user_id: e.cast(e.uuid, keyObj.user.id),
232-
filter_single: e.op(keyObj.key_id, "=", e.cast(e.uuid, keyId)),
272+
filter_single: e.op(keyObj.key_id, "=", keyId),
233273
}));
234274

235275
return await query.run(client);
@@ -238,7 +278,11 @@ export const edgedbAdapter = (
238278
const query = e.select(Key, (keyObj: any) => ({
239279
...Key["*"],
240280
user_id: e.cast(e.uuid, keyObj.user.id),
241-
filter: e.op(keyObj.user.id, "=", e.cast(e.uuid, userId)),
281+
filter: e.op(
282+
e.cast(e.uuid, keyObj.user.id),
283+
"=",
284+
e.cast(e.uuid, userId)
285+
),
242286
}));
243287

244288
return await query.run(client);
@@ -250,7 +294,11 @@ export const edgedbAdapter = (
250294
key_id,
251295
...keyWithoutUserId,
252296
user: e.select(User, (userObj: GlobalDatabaseUserAttributes) => ({
253-
filter_single: e.op(userObj.id, "=", e.cast(e.uuid, user_id)),
297+
filter_single: e.op(
298+
e.cast(e.uuid, userObj.id),
299+
"=",
300+
e.cast(e.uuid, user_id)
301+
),
254302
})),
255303
});
256304
await query.run(client);
@@ -276,21 +324,25 @@ export const edgedbAdapter = (
276324
},
277325
deleteKey: async (keyId) => {
278326
const query = e.delete(Key, (keyObj: { key_id: string }) => ({
279-
filter_single: e.op(keyObj.key_id, "=", e.cast(e.uuid, keyId)),
327+
filter_single: e.op(keyObj.key_id, "=", keyId),
280328
}));
281329

282330
await query.run(client);
283331
},
284332
deleteKeysByUserId: async (userId) => {
285333
const query = e.delete(Key, (keyObj: { user: { id: string } }) => ({
286-
filter: e.op(keyObj.user.id, "=", e.cast(e.uuid, userId)),
334+
filter: e.op(
335+
e.cast(e.uuid, keyObj.user.id),
336+
"=",
337+
e.cast(e.uuid, userId)
338+
),
287339
}));
288340

289341
await query.run(client);
290342
},
291343
updateKey: async (keyId, partialKey) => {
292344
const query = e.update(Key, (keyObj: { key_id: string }) => ({
293-
filter_single: e.op(keyObj.key_id, "=", e.cast(e.uuid, keyId)),
345+
filter_single: e.op(keyObj.key_id, "=", keyId),
294346
set: partialKey,
295347
}));
296348

@@ -308,7 +360,11 @@ export const edgedbAdapter = (
308360
user: {
309361
...User["*"],
310362
},
311-
filter_single: e.op(sessionObj.id, "=", e.cast(e.uuid, sessionId)),
363+
filter_single: e.op(
364+
e.cast(e.uuid, sessionObj.id),
365+
"=",
366+
e.cast(e.uuid, sessionId)
367+
),
312368
})
313369
);
314370

0 commit comments

Comments
 (0)