mirror of
https://github.com/immich-app/immich.git
synced 2026-02-28 01:29:04 +03:00
fix(server): db restore failure when DB_URL is set to unix-domain socket connection (#26252)
* fix db restore fails to get postgres user * Apply suggestion from @danieldietzler Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> * fix fallback to reasonable default test --------- Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
This commit is contained in:
@@ -554,7 +554,7 @@ describe(DatabaseBackupService.name, () => {
|
|||||||
"bin": "/usr/lib/postgresql/14/bin/psql",
|
"bin": "/usr/lib/postgresql/14/bin/psql",
|
||||||
"databaseMajorVersion": 14,
|
"databaseMajorVersion": 14,
|
||||||
"databasePassword": "",
|
"databasePassword": "",
|
||||||
"databaseUsername": "",
|
"databaseUsername": "postgres",
|
||||||
"databaseVersion": "14.10 (Debian 14.10-1.pgdg120+1)",
|
"databaseVersion": "14.10 (Debian 14.10-1.pgdg120+1)",
|
||||||
}
|
}
|
||||||
`);
|
`);
|
||||||
|
|||||||
@@ -139,7 +139,8 @@ export class DatabaseBackupService {
|
|||||||
// remove known bad parameters
|
// remove known bad parameters
|
||||||
parsedUrl.searchParams.delete('uselibpqcompat');
|
parsedUrl.searchParams.delete('uselibpqcompat');
|
||||||
|
|
||||||
databaseUsername = parsedUrl.username;
|
databaseUsername = parsedUrl.username || parsedUrl.searchParams.get('user');
|
||||||
|
|
||||||
url = parsedUrl.toString();
|
url = parsedUrl.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user