cargo fmt
This commit is contained in:
parent
d77a7c8ab4
commit
ad3fb45253
@ -1,5 +1,7 @@
|
||||
use crate::{ExecErr, ExecResult, QueryErr, QueryResult, Statement};
|
||||
use sea_query::{MysqlQueryBuilder, PostgresQueryBuilder, QueryStatementBuilder, SqliteQueryBuilder};
|
||||
use sea_query::{
|
||||
MysqlQueryBuilder, PostgresQueryBuilder, QueryStatementBuilder, SqliteQueryBuilder,
|
||||
};
|
||||
use std::{error::Error, fmt};
|
||||
|
||||
pub enum DatabaseConnection {
|
||||
|
@ -10,4 +10,4 @@ impl From<sqlx::Error> for ExecErr {
|
||||
fn from(_: sqlx::Error) -> ExecErr {
|
||||
ExecErr
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -143,7 +143,9 @@ macro_rules! try_getable_mysql {
|
||||
Ok(row.try_get(column.as_str())?)
|
||||
}
|
||||
#[cfg(feature = "sqlx-sqlite")]
|
||||
QueryResultRow::SqlxSqlite(_) => panic!("{} unsupported by sqlx-sqlite", stringify!($type)),
|
||||
QueryResultRow::SqlxSqlite(_) => {
|
||||
panic!("{} unsupported by sqlx-sqlite", stringify!($type))
|
||||
}
|
||||
#[cfg(feature = "mock")]
|
||||
QueryResultRow::Mock(row) => Ok(row.try_get(column.as_str())?),
|
||||
}
|
||||
@ -163,7 +165,9 @@ macro_rules! try_getable_mysql {
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "sqlx-sqlite")]
|
||||
QueryResultRow::SqlxSqlite(_) => panic!("{} unsupported by sqlx-sqlite", stringify!($type)),
|
||||
QueryResultRow::SqlxSqlite(_) => {
|
||||
panic!("{} unsupported by sqlx-sqlite", stringify!($type))
|
||||
}
|
||||
#[cfg(feature = "mock")]
|
||||
QueryResultRow::Mock(row) => match row.try_get(column.as_str()) {
|
||||
Ok(v) => Ok(Some(v)),
|
||||
|
@ -46,7 +46,7 @@ impl FromQueryResult for JsonValue {
|
||||
#[cfg(feature = "sqlx-sqlite")]
|
||||
QueryResultRow::SqlxSqlite(row) => {
|
||||
use serde_json::json;
|
||||
use sqlx::{Column, Sqlite, Row, Type};
|
||||
use sqlx::{Column, Row, Sqlite, Type};
|
||||
let mut map = Map::new();
|
||||
for column in row.columns() {
|
||||
let col = if !column.name().starts_with(pre) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
use sea_orm::{DbConn, entity::*, query::*, sea_query, tests_cfg::*};
|
||||
use sea_orm::{entity::*, query::*, sea_query, tests_cfg::*, DbConn};
|
||||
|
||||
mod setup;
|
||||
|
||||
@ -82,10 +82,7 @@ async fn crud_cake(db: &DbConn) -> Result<(), ExecErr> {
|
||||
.await
|
||||
.map_err(|_| ExecErr)?;
|
||||
|
||||
assert_eq!(
|
||||
None,
|
||||
apple
|
||||
);
|
||||
assert_eq!(None, apple);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,5 @@
|
||||
use sea_orm::{Database, DatabaseConnection};
|
||||
|
||||
pub async fn setup() -> DatabaseConnection {
|
||||
Database::connect("sqlite::memory:")
|
||||
.await
|
||||
.unwrap()
|
||||
}
|
||||
Database::connect("sqlite::memory:").await.unwrap()
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user