Skip to content

fix: bring envvar as the default connection method #30

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

Merged
Billuc merged 1 commit into from
Aug 2, 2025
Merged

fix: bring envvar as the default connection method #30

Show file tree
Hide file tree
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
50 changes: 30 additions & 20 deletions src/cigogne.gleam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import cigogne/internal/fs
import cigogne/internal/migrations_utils
import cigogne/types
import gleam/bool
import gleam/int
import gleam/erlang/process
import gleam/io
import gleam/list
import gleam/option
import gleam/result
import gleam/time/timestamp
import pog

type SchemaData {
SchemaData(generate: Bool, filename: String)
Expand Down Expand Up @@ -94,25 +95,34 @@ fn cli_to_connection_config(
case cli_config.db_url {
option.Some(url) -> types.UrlConfig(url)
option.None -> {
let user = cli_config.db_user |> option.unwrap("postgres")
let password = cli_config.db_password |> option.unwrap("postgres")
let host = cli_config.db_host |> option.unwrap("localhost")
let port = cli_config.db_port |> option.unwrap(5432)
let db_name = cli_config.db_name |> option.unwrap("postgres")

let url =
"postgresql://"
<> user
<> ":"
<> password
<> "@"
<> host
<> ":"
<> int.to_string(port)
<> "/"
<> db_name

types.UrlConfig(url: url)
case
cli_config.db_user,
cli_config.db_password,
cli_config.db_host,
cli_config.db_port,
cli_config.db_name
{
option.None, option.None, option.None, option.None, option.None ->
types.EnvVarConfig
_, _, _, _, _ -> {
let user = cli_config.db_user |> option.unwrap("postgres")
let password = cli_config.db_password
let host = cli_config.db_host |> option.unwrap("localhost")
let port = cli_config.db_port |> option.unwrap(5432)
let db_name = cli_config.db_name |> option.unwrap("postgres")

let procname = process.new_name("cigogne-db")
let config =
pog.default_config(procname)
|> pog.user(user)
|> pog.password(password)
|> pog.host(host)
|> pog.port(port)
|> pog.database(db_name)

types.PogConfig(config)
}
}
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/cigogne/internal/cli.gleam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pub type ConfigOptions {
schema_filename: option.Option(String),
migration_folder: option.Option(String),
migration_pattern: option.Option(String),
// Use envvar
)
}

Expand Down