cargo fmt

This commit is contained in:
Chris Tsang 2021-06-22 01:30:26 +08:00
parent d77a7c8ab4
commit ad3fb45253
6 changed files with 16 additions and 15 deletions

View File

@ -1,5 +1,7 @@
use crate::{ExecErr, ExecResult, QueryErr, QueryResult, Statement}; 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}; use std::{error::Error, fmt};
pub enum DatabaseConnection { pub enum DatabaseConnection {

View File

@ -143,7 +143,9 @@ macro_rules! try_getable_mysql {
Ok(row.try_get(column.as_str())?) Ok(row.try_get(column.as_str())?)
} }
#[cfg(feature = "sqlx-sqlite")] #[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")] #[cfg(feature = "mock")]
QueryResultRow::Mock(row) => Ok(row.try_get(column.as_str())?), QueryResultRow::Mock(row) => Ok(row.try_get(column.as_str())?),
} }
@ -163,7 +165,9 @@ macro_rules! try_getable_mysql {
} }
} }
#[cfg(feature = "sqlx-sqlite")] #[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")] #[cfg(feature = "mock")]
QueryResultRow::Mock(row) => match row.try_get(column.as_str()) { QueryResultRow::Mock(row) => match row.try_get(column.as_str()) {
Ok(v) => Ok(Some(v)), Ok(v) => Ok(Some(v)),

View File

@ -46,7 +46,7 @@ impl FromQueryResult for JsonValue {
#[cfg(feature = "sqlx-sqlite")] #[cfg(feature = "sqlx-sqlite")]
QueryResultRow::SqlxSqlite(row) => { QueryResultRow::SqlxSqlite(row) => {
use serde_json::json; use serde_json::json;
use sqlx::{Column, Sqlite, Row, Type}; use sqlx::{Column, Row, Sqlite, Type};
let mut map = Map::new(); let mut map = Map::new();
for column in row.columns() { for column in row.columns() {
let col = if !column.name().starts_with(pre) { let col = if !column.name().starts_with(pre) {

View File

@ -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; mod setup;
@ -82,10 +82,7 @@ async fn crud_cake(db: &DbConn) -> Result<(), ExecErr> {
.await .await
.map_err(|_| ExecErr)?; .map_err(|_| ExecErr)?;
assert_eq!( assert_eq!(None, apple);
None,
apple
);
Ok(()) Ok(())
} }

View File

@ -1,7 +1,5 @@
use sea_orm::{Database, DatabaseConnection}; use sea_orm::{Database, DatabaseConnection};
pub async fn setup() -> DatabaseConnection { pub async fn setup() -> DatabaseConnection {
Database::connect("sqlite::memory:") Database::connect("sqlite::memory:").await.unwrap()
.await
.unwrap()
} }