Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cont. Upgrade to SeaQuery 0.28.0 #1366

Merged
merged 7 commits into from
Jan 5, 2023
Merged

Cont. Upgrade to SeaQuery 0.28.0 #1366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc55ca5
Upgrade to SeaQuery 0.28.0
ikrivosheev Dec 9, 2022
344abe9
Remove unnecessary heap allocation
ikrivosheev Dec 9, 2022
8d5a8d2
Upgrade sea-query-binder
ikrivosheev Dec 9, 2022
2a106db
Upgrade sea-schema
ikrivosheev Dec 13, 2022
bc834ca
Fix
ikrivosheev Dec 22, 2022
95f0af0
Upgrade sea-schema
billy1624 Jan 5, 2023
55f0f15
refactoring
billy1624 Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactoring
  • Loading branch information
@billy1624
billy1624 committed Jan 5, 2023
commit 55f0f15c81bdcbdb389f61636d0015370b4878bc
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ let pear = fruit::ActiveModel {
let pear = pear.insert(db).await?;

// insert many
Fruit::insert_many(vec![apple, pear]).exec(db).await?;
Fruit::insert_many([apple, pear]).exec(db).await?;
```
### Update
```rust
Expand Down
8 changes: 4 additions & 4 deletions src/database/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ mod tests {
assert_eq!(
db.into_transaction_log(),
vec![
Transaction::many(vec![
Transaction::many([
Statement::from_string(DbBackend::Postgres, "BEGIN".to_owned()),
Statement::from_sql_and_values(
DbBackend::Postgres,
Expand Down Expand Up @@ -457,7 +457,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![
vec![Transaction::many([
Statement::from_string(DbBackend::Postgres, "BEGIN".to_owned()),
Statement::from_sql_and_values(
DbBackend::Postgres,
Expand Down Expand Up @@ -495,7 +495,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![
vec![Transaction::many([
Statement::from_string(DbBackend::Postgres, "BEGIN".to_owned()),
Statement::from_sql_and_values(
DbBackend::Postgres,
Expand Down Expand Up @@ -553,7 +553,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![
vec![Transaction::many([
Statement::from_string(DbBackend::Postgres, "BEGIN".to_owned()),
Statement::from_sql_and_values(
DbBackend::Postgres,
Expand Down
8 changes: 2 additions & 6 deletions src/entity/base_entity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,7 @@ pub trait EntityTrait: EntityName {
/// ..Default::default()
/// };
///
/// let insert_result = cake::Entity::insert_many(vec![apple, orange])
/// .exec(&db)
/// .await?;
/// let insert_result = cake::Entity::insert_many([apple, orange]).exec(&db).await?;
///
/// assert_eq!(insert_result.last_insert_id, 28);
///
Expand Down Expand Up @@ -438,9 +436,7 @@ pub trait EntityTrait: EntityName {
/// ..Default::default()
/// };
///
/// let insert_result = cake::Entity::insert_many(vec![apple, orange])
/// .exec(&db)
/// .await?;
/// let insert_result = cake::Entity::insert_many([apple, orange]).exec(&db).await?;
///
/// assert_eq!(insert_result.last_insert_id, 28);
///
Expand Down
16 changes: 8 additions & 8 deletions src/executor/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "fruit"."id", "fruit"."name", "fruit"."cake_id""#,
Expand Down Expand Up @@ -331,7 +331,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "fruit"."id", "fruit"."name", "fruit"."cake_id""#,
Expand Down Expand Up @@ -392,7 +392,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "fruit"."id", "fruit"."name", "fruit"."cake_id""#,
Expand Down Expand Up @@ -471,7 +471,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "example"."id", "example"."category""#,
Expand Down Expand Up @@ -509,7 +509,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "example"."id", "example"."category""#,
Expand Down Expand Up @@ -554,7 +554,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "example"."id", "example"."category""#,
Expand Down Expand Up @@ -599,7 +599,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "m"."x", "m"."y", "m"."z""#,
Expand Down Expand Up @@ -638,7 +638,7 @@ mod tests {

assert_eq!(
db.into_transaction_log(),
vec![Transaction::many(vec![Statement::from_sql_and_values(
vec![Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "m"."x", "m"."y", "m"."z""#,
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
//! # };
//!
//! // insert many
//! Fruit::insert_many(vec![apple, pear]).exec(db).await?;
//! Fruit::insert_many([apple, pear]).exec(db).await?;
//! # Ok(())
//! # }
//! ```
Expand Down
6 changes: 3 additions & 3 deletions src/query/insert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ where
/// use sea_orm::{entity::*, query::*, tests_cfg::cake, DbBackend};
///
/// assert_eq!(
/// Insert::many(vec![
/// Insert::many([
/// cake::Model {
/// id: 1,
/// name: "Apple Pie".to_owned(),
Expand Down Expand Up @@ -275,7 +275,7 @@ mod tests {
fn insert_4() {
assert_eq!(
Insert::<cake::ActiveModel>::new()
.add_many(vec![
.add_many([
cake::Model {
id: 1,
name: "Apple Pie".to_owned(),
Expand Down Expand Up @@ -304,7 +304,7 @@ mod tests {
};
assert_eq!(
Insert::<cake::ActiveModel>::new()
.add_many(vec![apple, orange])
.add_many([apple, orange])
.build(DbBackend::Postgres)
.to_string(),
r#"INSERT INTO "cake" ("id", "name") VALUES (NULL, 'Apple'), (2, 'Orange')"#,
Expand Down
2 changes: 1 addition & 1 deletion tests/common/features/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub async fn create_tables(db: &DatabaseConnection) -> Result<(), DbErr> {
let schema = Schema::new(db_backend);
let enum_create_stmt = Type::create()
.as_enum(Alias::new("tea"))
.values(vec![Alias::new("EverydayTea"), Alias::new("BreakfastTea")])
.values([Alias::new("EverydayTea"), Alias::new("BreakfastTea")])
.to_owned();
assert_eq!(
db_backend.build(&enum_create_stmt),
Expand Down
2 changes: 1 addition & 1 deletion tests/parallel_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pub async fn crud_in_parallel(db: &DatabaseConnection) -> Result<(), DbErr> {

assert_eq!(
metadata,
vec![
[
find_res.0.clone().unwrap(),
find_res.1.clone().unwrap(),
find_res.2.clone().unwrap(),
Expand Down
2 changes: 1 addition & 1 deletion tests/returning_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async fn main() -> Result<(), DbErr> {
insert
.into_table(Entity)
.columns([Column::Name, Column::ProfitMargin])
.values_panic(vec!["Bakery Shop".into(), 0.5.into()]);
.values_panic(["Bakery Shop".into(), 0.5.into()]);

let mut update = Query::update();
update
Expand Down