Skip to content

Commit db0215f

Browse files
committed
clippy
1 parent 083738a commit db0215f

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/webserver/database/sql.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,8 +1090,7 @@ mod test {
10901090
let mut ast =
10911091
parse_postgres_stmt("select $a from t where $x > $a OR $x = sqlpage.cookie('cookoo')");
10921092
let db_info = create_test_db_info(SupportedDatabase::Postgres);
1093-
let parameters =
1094-
ParameterExtractor::extract_parameters(&mut ast, db_info);
1093+
let parameters = ParameterExtractor::extract_parameters(&mut ast, db_info);
10951094
// $a -> $1
10961095
// $x -> $2
10971096
// sqlpage.cookie(...) -> $3
@@ -1116,8 +1115,7 @@ mod test {
11161115
fn test_statement_rewrite_sqlite() {
11171116
let mut ast = parse_stmt("select $x, :y from t", &SQLiteDialect {});
11181117
let db_info = create_test_db_info(SupportedDatabase::Sqlite);
1119-
let parameters =
1120-
ParameterExtractor::extract_parameters(&mut ast, db_info);
1118+
let parameters = ParameterExtractor::extract_parameters(&mut ast, db_info);
11211119
assert_eq!(
11221120
ast.to_string(),
11231121
"SELECT CAST(?1 AS TEXT), CAST(?2 AS TEXT) FROM t"
@@ -1234,8 +1232,7 @@ mod test {
12341232
let sql = "select sqlpage.fetch($x)";
12351233
let mut ast = parse_stmt(sql, dialect);
12361234
let db_info = create_test_db_info(SupportedDatabase::Postgres);
1237-
let parameters =
1238-
ParameterExtractor::extract_parameters(&mut ast, db_info);
1235+
let parameters = ParameterExtractor::extract_parameters(&mut ast, db_info);
12391236
assert_eq!(
12401237
parameters,
12411238
[StmtParam::FunctionCall(SqlPageFunctionCall {
@@ -1350,17 +1347,17 @@ mod test {
13501347
&MsSqlDialect {},
13511348
];
13521349
for &dialect in dialects {
1350+
use std::any::Any;
13531351
use SimpleSelectValue::{Dynamic, Static};
13541352
use StmtParam::PostOrGet;
1355-
use std::any::Any;
13561353

1357-
let db_info = if dialect.type_id() == (&PostgreSqlDialect {}).type_id() {
1354+
let db_info = if dialect.type_id() == (PostgreSqlDialect {}).type_id() {
13581355
create_test_db_info(SupportedDatabase::Postgres)
1359-
} else if dialect.type_id() == (&SQLiteDialect {}).type_id() {
1356+
} else if dialect.type_id() == (SQLiteDialect {}).type_id() {
13601357
create_test_db_info(SupportedDatabase::Sqlite)
1361-
} else if dialect.type_id() == (&MySqlDialect {}).type_id() {
1358+
} else if dialect.type_id() == (MySqlDialect {}).type_id() {
13621359
create_test_db_info(SupportedDatabase::MySql)
1363-
} else if dialect.type_id() == (&MsSqlDialect {}).type_id() {
1360+
} else if dialect.type_id() == (MsSqlDialect {}).type_id() {
13641361
create_test_db_info(SupportedDatabase::Mssql)
13651362
} else {
13661363
create_test_db_info(SupportedDatabase::Generic)

0 commit comments

Comments
 (0)