caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'url_starts_with' replace with 'is_prefix_of' method

Browse Source
This commit is contained in:
baoyachi 2021-09-27 16:41:47 +08:00
parent ae9e1c48ce
commit d78a067b2d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/connection.rs
View File

@ -129,7 +129,7 @@ impl DatabaseConnection {
} }
impl DbBackend { impl DbBackend {
pub(crate) fn url_starts_with(self, base_url: &str) -> bool { pub(crate) fn is_prefix_of(self, base_url: &str) -> bool {
match self { match self {
Self::Postgres => { Self::Postgres => {
base_url.starts_with("postgres://") || base_url.starts_with("postgresql://") base_url.starts_with("postgres://") || base_url.starts_with("postgresql://")

6
src/database/mod.rs
View File

@ -18,15 +18,15 @@ pub struct Database;
impl Database { impl Database {
pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> { pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> {
#[cfg(feature = "sqlx-mysql")] #[cfg(feature = "sqlx-mysql")]
if DbBackend::MySql.url_starts_with(string) { if DbBackend::MySql.is_prefix_of(string) {
return crate::SqlxMySqlConnector::connect(string).await; return crate::SqlxMySqlConnector::connect(string).await;
} }
#[cfg(feature = "sqlx-postgres")] #[cfg(feature = "sqlx-postgres")]
if DbBackend::Postgres.url_starts_with(string) { if DbBackend::Postgres.is_prefix_of(string) {
return crate::SqlxPostgresConnector::connect(string).await; return crate::SqlxPostgresConnector::connect(string).await;
} }
#[cfg(feature = "sqlx-sqlite")] #[cfg(feature = "sqlx-sqlite")]
if DbBackend::Sqlite.url_starts_with(string) { if DbBackend::Sqlite.is_prefix_of(string) {
return crate::SqlxSqliteConnector::connect(string).await; return crate::SqlxSqliteConnector::connect(string).await;
} }
#[cfg(feature = "mock")] #[cfg(feature = "mock")]

6
src/driver/mock.rs
View File

@ -31,15 +31,15 @@ impl MockDatabaseConnector {
#[allow(unused_variables)] #[allow(unused_variables)]
pub fn accepts(string: &str) -> bool { pub fn accepts(string: &str) -> bool {
#[cfg(feature = "sqlx-mysql")] #[cfg(feature = "sqlx-mysql")]
if DbBackend::MySql.url_starts_with(string) { if DbBackend::MySql.is_prefix_of(string) {
return true; return true;
} }
#[cfg(feature = "sqlx-postgres")] #[cfg(feature = "sqlx-postgres")]
if DbBackend::Postgres.url_starts_with(string) { if DbBackend::Postgres.is_prefix_of(string) {
return true; return true;
} }
#[cfg(feature = "sqlx-sqlite")] #[cfg(feature = "sqlx-sqlite")]
if DbBackend::Sqlite.url_starts_with(string) { if DbBackend::Sqlite.is_prefix_of(string) {
return true; return true;
} }
false false

2
src/driver/sqlx_mysql.rs
View File

@ -20,7 +20,7 @@ pub struct SqlxMySqlPoolConnection {
impl SqlxMySqlConnector { impl SqlxMySqlConnector {
pub fn accepts(string: &str) -> bool { pub fn accepts(string: &str) -> bool {
DbBackend::MySql.url_starts_with(string) DbBackend::MySql.is_prefix_of(string)
} }
pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> { pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> {

2
src/driver/sqlx_postgres.rs
View File

@ -20,7 +20,7 @@ pub struct SqlxPostgresPoolConnection {
impl SqlxPostgresConnector { impl SqlxPostgresConnector {
pub fn accepts(string: &str) -> bool { pub fn accepts(string: &str) -> bool {
DbBackend::Postgres.url_starts_with(string) DbBackend::Postgres.is_prefix_of(string)
} }
pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> { pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> {

2
src/driver/sqlx_sqlite.rs
View File

@ -20,7 +20,7 @@ pub struct SqlxSqlitePoolConnection {
impl SqlxSqliteConnector { impl SqlxSqliteConnector {
pub fn accepts(string: &str) -> bool { pub fn accepts(string: &str) -> bool {
DbBackend::Sqlite.url_starts_with(string) DbBackend::Sqlite.is_prefix_of(string)
} }
pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> { pub async fn connect(string: &str) -> Result<DatabaseConnection, DbErr> {