Skip to content

(SP: 1) [FIX] Hot fix index APP ENV #421

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

Merged
ViktorSvertoka merged 2 commits into from
Mar 28, 2026
+13 −7
Merged

(SP: 1) [FIX] Hot fix index APP ENV #421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0425173
(SP: 1) [FIX] Hot fix index APP ENV
liudmylasovetovs Mar 28, 2026
3f1906e
(SP: 1) [FIX] normalize APP ENV before local runtime check
liudmylasovetovs Mar 28, 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
20 changes: 13 additions & 7 deletions frontend/db/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,30 @@ dotenv.config();

type AppDatabase = PgDatabase<PgQueryResultHKT, typeof schema>;

const APP_ENV = process.env.APP_ENV ?? 'local';
const APP_ENV = process.env.APP_ENV?.trim().toLowerCase();
const IS_LOCAL_ENV = APP_ENV === 'local';
const STRICT_LOCAL_DB_GUARD = process.env.SHOP_STRICT_LOCAL_DB === '1';
const REQUIRED_LOCAL_DB_URL = process.env.SHOP_REQUIRED_DATABASE_URL_LOCAL;

if (STRICT_LOCAL_DB_GUARD) {
if (APP_ENV !== 'local') {
if (!IS_LOCAL_ENV) {
throw new Error(
`[db] SHOP_STRICT_LOCAL_DB=1 requires APP_ENV=local (got "${APP_ENV}")`
`[db] SHOP_STRICT_LOCAL_DB=1 requires APP_ENV=local (got "${APP_ENV ?? 'undefined'}")`
);
}

if (!process.env.DATABASE_URL_LOCAL?.trim()) {
throw new Error(
'[db] SHOP_STRICT_LOCAL_DB=1 requires DATABASE_URL_LOCAL to be set'
);
}

if (process.env.DATABASE_URL?.trim()) {
throw new Error(
'[db] SHOP_STRICT_LOCAL_DB=1 forbids DATABASE_URL during shop-local tests'
);
}

if (
REQUIRED_LOCAL_DB_URL &&
process.env.DATABASE_URL_LOCAL !== REQUIRED_LOCAL_DB_URL
Expand All @@ -43,8 +47,8 @@ if (STRICT_LOCAL_DB_GUARD) {

let db: AppDatabase;

if (APP_ENV === 'local') {
const url = process.env.DATABASE_URL_LOCAL;
if (IS_LOCAL_ENV) {
const url = process.env.DATABASE_URL_LOCAL?.trim();

if (!url) {
throw new Error('[db] APP_ENV=local requires DATABASE_URL_LOCAL to be set');
Expand All @@ -60,10 +64,12 @@ if (APP_ENV === 'local') {
console.log('[db] using local PostgreSQL (pg)');
}
} else {
const url = process.env.DATABASE_URL;
const url = process.env.DATABASE_URL?.trim();

if (!url) {
throw new Error(`[db] APP_ENV=${APP_ENV} requires DATABASE_URL to be set`);
throw new Error(
`[db] APP_ENV=${APP_ENV ?? 'undefined'} requires DATABASE_URL to be set`
);
}

const sql = neon(url);
Expand Down
Loading