Skip to content

fix(orm): respect the log option of clients derived with $setOptions #2902

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
kuldeepsinh19 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(orm): respect the log option of clients derived with $setOptions #2902

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
25 changes: 22 additions & 3 deletions packages/orm/src/client/client-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,25 @@ export class ClientImpl {

// here we use kysely's props constructor so we can pass a custom query executor
if (baseClient) {
// A derived client shares the base client's connections. If its `log` option differs, it gets a
// driver over the same connections that logs with its own log. Deliberately an identity check:
// `$use`, `$setAuth` and friends spread the options and keep the same `log`, so they keep the
// base driver.
const logChanged = options.log !== baseClient.$options.log;
const driver = logChanged
? (baseClient.kyselyProps.driver as ZenStackDriver).withLog(new Log(options.log ?? []))
: baseClient.kyselyProps.driver;
this.kyselyProps = {
...baseClient.kyselyProps,
driver,
executor:
executor ??
new ZenStackQueryExecutor(
this,
baseClient.kyselyProps.driver as ZenStackDriver,
driver as ZenStackDriver,
baseClient.kyselyProps.dialect.createQueryCompiler(),
baseClient.kyselyProps.dialect.createAdapter(),
new DefaultConnectionProvider(baseClient.kyselyProps.driver),
new DefaultConnectionProvider(driver),
[],
false,
// A name mapper is derived purely from `$schema` and `$options`, so it can be
Expand All @@ -126,7 +135,17 @@ export class ClientImpl {
: undefined,
),
};
this.kyselyRaw = baseClient.kyselyRaw;
this.kyselyRaw = logChanged
? new Kysely({
...this.kyselyProps,
executor: new DefaultQueryExecutor(
baseClient.kyselyProps.dialect.createQueryCompiler(),
baseClient.kyselyProps.dialect.createAdapter(),
new DefaultConnectionProvider(driver),
[],
),
})
: baseClient.kyselyRaw;
this.auth = baseClient.auth;
this.slowQueries = baseClient.slowQueries;
} else {
Expand Down
Loading