8129fdb · reshape · git.iko.soy

git.iko.soy/reshape

Add env var alternatives for all connection options

Also fixes a bug where the `--database` option would do nothing.

commit8129fdbf414f582fe031c58eaaac2aa1a25e48db authorfabianlindfors <fabian@flapplabs.se> dateThu 3 Feb 2022, 23:48 (5 years ago) parent5529d22

3 files changed+36−15

compare with main

unifiedsplit

README.md+10−10 src/lib.rs+2 src/main.rs+24−5

README.md+10−10

@@ -559,16 +559,16 @@ The query should look something like `SET search_path TO migration_1_initial_mig

559559

560560### Connection options

561561

562−The options below can be used with all commands that communicate with Postgres. Use either a connection URL or specify each connection option individually.

563−

564−| Option | Default | Description |

565−| ------ | ------- | ----------- |

566−| `--url` | | URI to connect to your Postgres database.<br>Can also be provided with the environment variable `DB_URL`. |

567−| `--host` | `localhost` | Hostname to use when connecting to Postgres |

568−| `--port` | `5432` | Port which Postgres is listening on |

569−| `--database` | `postgres` | Database name |

570−| `--username` | `postgres` | Postgres username |

571−| `--password` | `postgres` | Postgres password |

562+The options below can be used with all commands that communicate with Postgres. Use either a [connection URL](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING) or specify each connection option individually. All options can also be set using environment variables instead of flags.

563+

565+| ------ | ------- | -------------------- | ----------- |

566+| `--url` | | `DB_URL` | URL to your Postgres database |

572572

573573## License

574574

src/lib.rs+2

@@ -30,6 +30,7 @@ impl Reshape {

3030 pub fn new_with_options(

3131 host: &str,

3232 port: u16,

33+ database: &str,

3334 username: &str,

3435 password: &str,

3536 ) -> anyhow::Result<Reshape> {

@@ -38,6 +39,7 @@ impl Reshape {

3839 .host(host)

3940 .port(port)

4041 .user(username)

42+ .dbname(database)

4143 .password(password);

4244

4345 Self::new_with_config(&config)

src/main.rs+24−5

@@ -105,13 +105,32 @@ fn run(opts: Opts) -> anyhow::Result<()> {

105105}

106106

107107fn reshape_from_connection_options(opts: &ConnectionOptions) -> anyhow::Result<Reshape> {

108− let env_url = std::env::var("DB_URL").ok();

109− let url = env_url.as_ref().or_else(|| opts.url.as_ref());

108+ let url_env = std::env::var("DB_URL").ok();

109+ let url = url_env.as_ref().or_else(|| opts.url.as_ref());

110110

111− match url {

112− Some(url) => Reshape::new(url),

113− None => Reshape::new_with_options(&opts.host, opts.port, &opts.username, &opts.password),

111+ // Use the connection URL if it has been set

112+ if let Some(url) = url {

113+ return Reshape::new(url);

114114 }

115+

116+ let host_env = std::env::var("DB_HOST").ok();

117+ let host = host_env.as_ref().unwrap_or_else(|| &opts.host);

118+

119+ let port = std::env::var("DB_PORT")

120+ .ok()

121+ .and_then(|port| port.parse::<u16>().ok())

122+ .unwrap_or(opts.port);

123+

124+ let username_env = std::env::var("DB_USERNAME").ok();

125+ let username = username_env.as_ref().unwrap_or_else(|| &opts.username);

126+

127+ let password_env = std::env::var("DB_PASSWORD").ok();

128+ let password = password_env.as_ref().unwrap_or_else(|| &opts.password);

129+

130+ let database_env = std::env::var("DB_NAME").ok();

131+ let database = database_env.as_ref().unwrap_or_else(|| &opts.database);

132+

133+ Reshape::new_with_options(host, port, database, username, password)

115134}

116135

117136fn find_migrations(opts: &FindMigrationsOptions) -> anyhow::Result<Vec<Migration>> {