Skip to content

[Pg]: Fix unawaited promise chains in queryWithCache and bun-sql execute #5465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nathanschram wants to merge 1 commit into
base: beta
Choose a base branch
from
Open

[Pg]: Fix unawaited promise chains in queryWithCache and bun-sql execute #5465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drizzle-orm/src/bun-sql/postgres/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class BunSQLPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends
});

return await this.queryWithCache(query, params, async () => {
return client.unsafe(query, params as any[]).values();
return await client.unsafe(query, params as any[]).values();
});
});

Expand Down
19 changes: 12 additions & 7 deletions drizzle-orm/src/pg-core/async/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,26 @@ export abstract class PgAsyncPreparedQuery<T extends PreparedQueryConfig> extend
: { type: 'skip' as const };

if (cacheStrat.type === 'skip') {
return query().catch((e) => {
try {
return await query();
} catch (e) {
throw new DrizzleQueryError(queryString, params, e as Error);
});
}
}

const cache = this.cache!;

// For mutate queries, we should query the database, wait for a response, and then perform invalidation
if (cacheStrat.type === 'invalidate') {
return Promise.all([
query(),
cache.onMutate({ tables: cacheStrat.tables }),
]).then((res) => res[0]).catch((e) => {
try {
const [result] = await Promise.all([
query(),
cache.onMutate({ tables: cacheStrat.tables }),
]);
return result;
} catch (e) {
throw new DrizzleQueryError(queryString, params, e as Error);
});
}
}

if (cacheStrat.type === 'try') {
Expand Down