Skip to content

Commit

Permalink
feat: allow passing in PostgreSQL connection options
Browse files Browse the repository at this point in the history
  • Loading branch information
derhuerst committed Jul 12, 2024
1 parent a45ebfb commit 33a34d7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
7 changes: 4 additions & 3 deletions import.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const importGtfsAtomically = async (cfg) => {
connectDownloadScriptToStdout,
importScriptVerbose,
connectImportScriptToStdout,
pgHost, pgUser, pgPassword, pgMetaDatabase,
pgHost, pgUser, pgPassword, pgMetaDatabase, pgOpts,
databaseNamePrefix,
schemaName,
pathToImportScript,
Expand All @@ -51,6 +51,7 @@ const importGtfsAtomically = async (cfg) => {
pgUser: null,
pgPassword: null,
pgMetaDatabase: process.env.PGDATABASE || null,
pgOpts: {},
schemaName: process.env.GTFS_IMPORTER_SCHEMA || null,
pathToImportScript: PATH_TO_IMPORT_SCRIPT,
pathToDownloadScript: PATH_TO_DOWNLOAD_SCRIPT,
Expand Down Expand Up @@ -101,11 +102,11 @@ const importGtfsAtomically = async (cfg) => {
// Thus, a newly created database also won't be removed if the transaction fails or is aborted, so we
// have to drop it manually when cleaning up failed/aborted imports.
const dbMngmtClient = await connectToMetaDatabase({
pgHost, pgUser, pgPassword, pgMetaDatabase,
pgHost, pgUser, pgPassword, pgMetaDatabase, pgOpts,
})

const client = await connectToMetaDatabase({
pgHost, pgUser, pgPassword, pgMetaDatabase,
pgHost, pgUser, pgPassword, pgMetaDatabase, pgOpts,
})

// We only ever keep one row in `latest_import`, which contains NULL in the beginning.
Expand Down
6 changes: 5 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,19 @@ const connectToMetaDatabase = async (cfg) => {
pgUser,
pgPassword,
pgMetaDatabase,
pgOpts,
} = {
pgHost: null,
pgUser: null,
pgPassword: null,
pgMetaDatabase: process.env.PGDATABASE || null,
pgOpts: {},
...cfg,
}

const pgConfig = {}
const pgConfig = {
...pgOpts,
}
if (pgHost !== null) {
pgConfig.host = pgHost
}
Expand Down

0 comments on commit 33a34d7

Please sign in to comment.