Skip to content

Commit 0268460

Browse files
authored
Remove inherent SimpleExpr methods that duplicate ExprTrait (#890)
* Remove `Expr`, re-export `Expr` as type alias of `SimpleExpr` * Use `Self` in types * Use `Self` in types * Make `SimpleExpr::new` public and remove `new_with_left` * Clippy * Update `since` * Update `since` * Update `since` * Remove inherent methods of `SimpleExpr` from `ExprTrait` * Fix tests * Fix tests * Remove inherent methods on `Expr` * Fmt * Fix examples * Fix
1 parent 6f3133f commit 0268460

File tree

9 files changed

+181
-1453
lines changed

9 files changed

+181
-1453
lines changed

examples/rusqlite/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use chrono::{NaiveDate, NaiveDateTime};
22
use rusqlite::{Connection, Result, Row};
3-
use sea_query::{ColumnDef, Expr, Func, Iden, Order, Query, SqliteQueryBuilder, Table};
3+
use sea_query::{ColumnDef, Expr, ExprTrait, Func, Iden, Order, Query, SqliteQueryBuilder, Table};
44

55
use sea_query_rusqlite::RusqliteBinder;
66
use serde_json::{Value as Json, json};

examples/sqlx_any/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use chrono::NaiveDate;
22
use sea_query::{
3-
ColumnDef, Expr, Func, Iden, MysqlQueryBuilder, OnConflict, Order, PostgresQueryBuilder, Query,
4-
QueryBuilder, SchemaBuilder, SqliteQueryBuilder, Table,
3+
ColumnDef, Expr, ExprTrait, Func, Iden, MysqlQueryBuilder, OnConflict, Order,
4+
PostgresQueryBuilder, Query, QueryBuilder, SchemaBuilder, SqliteQueryBuilder, Table,
55
};
66
use sqlx::{AnyPool, Row};
77
use std::env;

examples/sqlx_mysql/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
use bigdecimal::{BigDecimal, FromPrimitive};
22
use chrono::NaiveDate;
33
use rust_decimal::Decimal;
4-
use sea_query::{ColumnDef, Expr, Func, Iden, MysqlQueryBuilder, OnConflict, Order, Query, Table};
4+
use sea_query::{
5+
ColumnDef, Expr, ExprTrait, Func, Iden, MysqlQueryBuilder, OnConflict, Order, Query, Table,
6+
};
57
use sea_query_binder::SqlxBinder;
68
use sqlx::{MySqlPool, Row, types::chrono::NaiveDateTime};
79
use time::{

examples/sqlx_postgres/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use bigdecimal::{BigDecimal, FromPrimitive};
22
use chrono::{NaiveDate, NaiveDateTime};
33
use rust_decimal::Decimal;
44
use sea_query::{
5-
ColumnDef, Expr, Func, Iden, OnConflict, Order, PostgresQueryBuilder, Query, Table,
5+
ColumnDef, Expr, ExprTrait, Func, Iden, OnConflict, Order, PostgresQueryBuilder, Query, Table,
66
};
77
use sea_query_binder::SqlxBinder;
88
use sqlx::{PgPool, Row};

examples/sqlx_sqlite/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use chrono::{NaiveDate, NaiveDateTime};
2-
use sea_query::{ColumnDef, Expr, Func, Iden, OnConflict, Order, Query, SqliteQueryBuilder, Table};
2+
use sea_query::{
3+
ColumnDef, Expr, ExprTrait, Func, Iden, OnConflict, Order, Query, SqliteQueryBuilder, Table,
4+
};
35
use sea_query_binder::SqlxBinder;
46
use serde_json::{Value as Json, json};
57
use sqlx::{Row, SqlitePool};

0 commit comments

Comments
 (0)