Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
codetheweb committed Apr 4, 2024
1 parent bfbb016 commit 2b97eaf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
3 changes: 1 addition & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,7 @@ export const getTestPostgresDatabaseFactory = <
getTestDatabaseOptions?: GetTestPostgresDatabaseOptions
) => {
const testDatabaseConnection = await rpc.getTestDatabase({
// todo: rename?
key: getTestDatabaseOptions?.databaseDedupeKey,
databaseDedupeKey: getTestDatabaseOptions?.databaseDedupeKey,
params,
})

Expand Down
2 changes: 1 addition & 1 deletion src/internal-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface TestWorkerFunctions {

export interface SharedWorkerFunctions {
getTestDatabase: (options: {
key?: string
databaseDedupeKey?: string
params?: Jsonifiable
}) => Promise<{
connectionDetails: ConnectionDetailsFromWorker
Expand Down
11 changes: 7 additions & 4 deletions src/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ export class Worker {
const { postgresClient } = await this.startContainerPromise

// Only relevant when a `key` is provided
const fullDatabaseKey = `${paramsHash}-${options.key}`
const fullDatabaseKey = `${paramsHash}-${options.databaseDedupeKey}`

let databaseName = options.key
let databaseName = options.databaseDedupeKey
? this.keyToDatabaseName.get(fullDatabaseKey)
: undefined
if (!databaseName) {
Expand All @@ -118,7 +118,7 @@ export class Worker {
)
}

if (options.key) {
if (options.databaseDedupeKey) {
await this.getOrCreateKeyToCreationMutex.runExclusive(() => {
if (!this.keyToCreationMutex.has(fullDatabaseKey)) {
this.keyToCreationMutex.set(fullDatabaseKey, new Mutex())
Expand All @@ -142,7 +142,10 @@ export class Worker {

registerTeardown(async () => {
// Don't remove keyed databases
if (options.key && this.keyToDatabaseName.has(fullDatabaseKey)) {
if (
options.databaseDedupeKey &&
this.keyToDatabaseName.has(fullDatabaseKey)
) {
return
}

Expand Down

0 comments on commit 2b97eaf

Please sign in to comment.