Skip to content

fix: ensure UTC session timezone in PrismaPg connections (#4285) #4321

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
sudoeren wants to merge 2 commits into
base: dev
Choose a base branch
from
+44 −3
Open

fix: ensure UTC session timezone in PrismaPg connections (#4285) #4321

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ea647
Ensure UTC session timezone in PrismaPg connections (#4285)
sudoeren Jun 4, 2026
99818c9
Update src/lib/prisma.ts
sudoeren Jun 4, 2026
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
8 changes: 8 additions & 0 deletions scripts/check-db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ if (process.env.SKIP_DB_CHECK) {

const url = new URL(process.env.DATABASE_URL);

const existingOptions = url.searchParams.get('options') || '';
if (!existingOptions.includes('timezone')) {
url.searchParams.set(
'options',
existingOptions ? `${existingOptions} -c timezone=UTC` : '-c timezone=UTC',
);
}

const adapter = new PrismaPg(
{ connectionString: url.toString() },
{ schema: url.searchParams.get('schema') },
Expand Down
10 changes: 9 additions & 1 deletion scripts/seed/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,15 @@ function createPrismaClient(): PrismaClient {
);
}

const adapter = new PrismaPg({ connectionString: url }, { schema });
const existingOptions = connectionUrl.searchParams.get('options') || '';
if (!existingOptions.includes('timezone')) {
connectionUrl.searchParams.set(
'options',
existingOptions ? `${existingOptions} -c timezone=UTC` : '-c timezone=UTC',
);
}

const adapter = new PrismaPg({ connectionString: connectionUrl.toString() }, { schema });

return new PrismaClient({
adapter,
Expand Down
29 changes: 27 additions & 2 deletions src/lib/prisma.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,21 @@ function getClient() {

const schema = getSchema();

const baseAdapter = new PrismaPg({ connectionString: url }, { schema });
// Ensure consistent UTC session timezone so that TIMESTAMPTZ values
// written by @prisma/adapter-pg are not mis-interpreted by PostgreSQL.
// The adapter's formatDateTime omits the timezone offset, causing
// PostgreSQL to assume the session timezone (default: server timezone).
// See https://github.com/umami-software/umami/issues/4285
const connectionUrl = new URL(url);
const existingOptions = connectionUrl.searchParams.get('options') || '';
if (!existingOptions.includes('timezone')) {
connectionUrl.searchParams.set(
'options',
existingOptions ? `${existingOptions} -c timezone=UTC` : '-c timezone=UTC',
);
}

const baseAdapter = new PrismaPg({ connectionString: connectionUrl.toString() }, { schema });
Comment thread
sudoeren marked this conversation as resolved.
Outdated

const baseClient = new PrismaClient({
adapter: baseAdapter,
Expand All @@ -569,7 +583,18 @@ function getClient() {
return baseClient;
}

const replicaAdapter = new PrismaPg({ connectionString: replicaUrl }, { schema });
const replicaConnectionUrl = new URL(replicaUrl);
const replicaExistingOptions = replicaConnectionUrl.searchParams.get('options') || '';
if (!replicaExistingOptions.includes('timezone')) {
replicaConnectionUrl.searchParams.set(
'options',
replicaExistingOptions
? `${replicaExistingOptions} -c timezone=UTC`
: '-c timezone=UTC',
);
}

const replicaAdapter = new PrismaPg({ connectionString: replicaConnectionUrl.toString() }, { schema });

const replicaClient = new PrismaClient({
adapter: replicaAdapter,
Expand Down