Skip to content
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

Jump to bottom

Tweak the creation of database connections in diesel_CLI #3737

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Tweak the creation of database connections in diesel_CLI #3737

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
16 changes: 14 additions & 2 deletions diesel_cli/src/database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,20 @@ pub enum InferConnection {
impl InferConnection {
pub fn from_matches(matches: &ArgMatches) -> Self {
let database_url = database_url(matches);
Self::establish(&database_url)
.unwrap_or_else(|err| handle_error_with_database_url(&database_url, err))
// we construct `InferConnection` manually
// here because that allows us to emit better error messages
// than the generic ` Invalid connection url for multiconnection`
// error generated by `InferConnection::establish`
let result = match Backend::for_url(&database_url) {
#[cfg(feature = "postgres")]
Backend::Pg => PgConnection::establish(&database_url).map(Self::Pg),
#[cfg(feature = "mysql")]
Backend::Mysql => MysqlConnection::establish(&database_url).map(Self::Mysql),
#[cfg(feature = "sqlite")]
Backend::Sqlite => SqliteConnection::establish(&database_url).map(Self::Sqlite),
};

result.unwrap_or_else(|err| handle_error_with_database_url(&database_url, err))
}
}

Expand Down
Loading