Skip to content

Allows to set environment variables of Postgres #147

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

Closed
wants to merge 1 commit into from
Closed

Allows to set environment variables of Postgres #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 16 additions & 4 deletions src/main/java/io/zonky/test/db/postgres/embedded/EmbeddedPostgres.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public class EmbeddedPostgres implements Closeable
private final Map<String, String> postgresConfig;
private final Map<String, String> localeConfig;
private final Map<String, String> connectConfig;
private final Map<String, String> environmentVariables;

private volatile FileOutputStream lockStream;
private volatile FileLock lock;
Expand All @@ -111,14 +112,15 @@ public class EmbeddedPostgres implements Closeable

EmbeddedPostgres(File parentDirectory, File dataDirectory, boolean cleanDataDirectory,
Map<String, String> postgresConfig, Map<String, String> localeConfig, int port, Map<String, String> connectConfig,
PgBinaryResolver pgBinaryResolver, ProcessBuilder.Redirect errorRedirector, ProcessBuilder.Redirect outputRedirector) throws IOException
Map<String, String> environmentVariables, PgBinaryResolver pgBinaryResolver, ProcessBuilder.Redirect errorRedirector, ProcessBuilder.Redirect outputRedirector) throws IOException
{
this(parentDirectory, dataDirectory, cleanDataDirectory, postgresConfig, localeConfig, port, connectConfig,
this(parentDirectory, dataDirectory, cleanDataDirectory, postgresConfig, localeConfig, port, connectConfig, environmentVariables,
pgBinaryResolver, errorRedirector, outputRedirector, DEFAULT_PG_STARTUP_WAIT, null);
}

EmbeddedPostgres(File parentDirectory, File dataDirectory, boolean cleanDataDirectory,
Map<String, String> postgresConfig, Map<String, String> localeConfig, int port, Map<String, String> connectConfig,
Map<String, String> environmentVariables,
PgBinaryResolver pgBinaryResolver, ProcessBuilder.Redirect errorRedirector,
ProcessBuilder.Redirect outputRedirector, Duration pgStartupWait,
File overrideWorkingDirectory) throws IOException
Expand All @@ -127,6 +129,7 @@ public class EmbeddedPostgres implements Closeable
this.postgresConfig = new HashMap<>(postgresConfig);
this.localeConfig = new HashMap<>(localeConfig);
this.connectConfig = new HashMap<>(connectConfig);
this.environmentVariables = new HashMap<>(environmentVariables);
this.port = port;
this.pgDir = prepareBinaries(pgBinaryResolver, overrideWorkingDirectory);
this.errorRedirector = errorRedirector;
Expand Down Expand Up @@ -490,6 +493,7 @@ public static class Builder
private File builderDataDirectory;
private final Map<String, String> config = new HashMap<>();
private final Map<String, String> localeConfig = new HashMap<>();
private final Map<String, String> environmentVariables = new HashMap<>();
private boolean builderCleanDataDirectory = true;
private int builderPort = 0;
private final Map<String, String> connectConfig = new HashMap<>();
Expand Down Expand Up @@ -546,6 +550,11 @@ public Builder setConnectConfig(String key, String value) {
connectConfig.put(key, value);
return this;
}

public Builder setEnvironmentVariable(String key, String value) {
environmentVariables.put(key, value);
return this;
}

public Builder setOverrideWorkingDirectory(File workingDirectory) {
overrideWorkingDirectory = workingDirectory;
Expand Down Expand Up @@ -582,7 +591,7 @@ public EmbeddedPostgres start() throws IOException {
builderDataDirectory = Files.createTempDirectory("epg").toFile();
}
return new EmbeddedPostgres(parentDirectory, builderDataDirectory, builderCleanDataDirectory, config,
localeConfig, builderPort, connectConfig, pgBinaryResolver, errRedirector, outRedirector,
localeConfig, builderPort, connectConfig, environmentVariables, pgBinaryResolver, errRedirector, outRedirector,
pgStartupWait, overrideWorkingDirectory);
}

Expand All @@ -602,6 +611,7 @@ public boolean equals(Object o) {
Objects.equals(config, builder.config) &&
Objects.equals(localeConfig, builder.localeConfig) &&
Objects.equals(connectConfig, builder.connectConfig) &&
Objects.equals(environmentVariables, builder.environmentVariables) &&
Objects.equals(pgBinaryResolver, builder.pgBinaryResolver) &&
Objects.equals(pgStartupWait, builder.pgStartupWait) &&
Objects.equals(errRedirector, builder.errRedirector) &&
Expand All @@ -610,7 +620,7 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(parentDirectory, builderDataDirectory, config, localeConfig, builderCleanDataDirectory, builderPort, connectConfig, pgBinaryResolver, pgStartupWait, errRedirector, outRedirector);
return Objects.hash(parentDirectory, builderDataDirectory, config, localeConfig, builderCleanDataDirectory, builderPort, connectConfig, environmentVariables, pgBinaryResolver, pgStartupWait, errRedirector, outRedirector);
}
}

Expand Down Expand Up @@ -894,6 +904,8 @@ public void applyTo(ProcessBuilder builder, List<String> arguments) {
command.addAll(arguments);

builder.command(command);

builder.environment().putAll(environmentVariables);
}
}
}