From 1dffb72e195bef76fbfffd8d3ead45d12d57bbba Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Wed, 11 May 2022 22:17:39 +0800 Subject: [PATCH] Clean up examples: actually we should have done this long ago. hint: https://doc.rust-lang.org/edition-guide/rust-2021/IntoIterator-for-arrays.html --- README.md | 2 +- examples/cockroach/src/main.rs | 6 +- examples/cockroach_json/src/main.rs | 4 +- examples/postgres/src/main.rs | 6 +- examples/postgres_json/src/main.rs | 4 +- examples/rusqlite/src/main.rs | 6 +- examples/sqlx_mysql/src/main.rs | 10 ++-- examples/sqlx_postgres/src/main.rs | 10 ++-- examples/sqlx_sqlite/src/main.rs | 10 ++-- src/expr.rs | 92 ++++++++++++++--------------- src/lib.rs | 2 +- src/query/delete.rs | 2 +- src/query/insert.rs | 22 +++---- src/query/on_conflict.rs | 6 +- src/query/ordered.rs | 2 +- src/query/select.rs | 10 ++-- src/query/update.rs | 2 +- tests/error/mod.rs | 2 +- tests/mysql/query.rs | 82 ++++++++++++------------- tests/postgres/query.rs | 86 +++++++++++++-------------- tests/sqlite/query.rs | 84 +++++++++++++------------- 21 files changed, 225 insertions(+), 225 deletions(-) diff --git a/README.md b/README.md index eda9f87c6..4ca826685 100644 --- a/README.md +++ b/README.md @@ -360,7 +360,7 @@ assert_eq!( ```rust let query = Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![5.15.into(), "12A".into()]) .values_panic(vec![4.21.into(), "123".into()]) .to_owned(); diff --git a/examples/cockroach/src/main.rs b/examples/cockroach/src/main.rs index 89b84dea6..75e13d8bf 100644 --- a/examples/cockroach/src/main.rs +++ b/examples/cockroach/src/main.rs @@ -36,7 +36,7 @@ fn main() { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![Character::Character, Character::FontSize]) + .columns([Character::Character, Character::FontSize]) .values_panic(vec!["A".into(), 12i64.into()]) .returning_col(Character::Id) .build(PostgresQueryBuilder); @@ -48,7 +48,7 @@ fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Character, Character::FontSize, @@ -80,7 +80,7 @@ fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Character, Character::FontSize, diff --git a/examples/cockroach_json/src/main.rs b/examples/cockroach_json/src/main.rs index c2c10306c..36f9d2d64 100644 --- a/examples/cockroach_json/src/main.rs +++ b/examples/cockroach_json/src/main.rs @@ -60,7 +60,7 @@ fn main() { }; let (sql, values) = Query::insert() .into_table(Document::Table) - .columns(vec![Document::JsonField, Document::Timestamp]) + .columns([Document::JsonField, Document::Timestamp]) .values_panic(vec![ serde_json::to_value(document_chrono.json_field) .unwrap() @@ -81,7 +81,7 @@ fn main() { // Read let (sql, values) = Query::select() - .columns(vec![Document::Id, Document::JsonField, Document::Timestamp]) + .columns([Document::Id, Document::JsonField, Document::Timestamp]) .from(Document::Table) .order_by(Document::Id, Order::Desc) .limit(1) diff --git a/examples/postgres/src/main.rs b/examples/postgres/src/main.rs index 4564ec2bd..48b3e17b6 100644 --- a/examples/postgres/src/main.rs +++ b/examples/postgres/src/main.rs @@ -36,7 +36,7 @@ fn main() { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![Character::Character, Character::FontSize]) + .columns([Character::Character, Character::FontSize]) .values_panic(vec!["A".into(), 12.into()]) .returning_col(Character::Id) .build(PostgresQueryBuilder); @@ -48,7 +48,7 @@ fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Character, Character::FontSize, @@ -80,7 +80,7 @@ fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Character, Character::FontSize, diff --git a/examples/postgres_json/src/main.rs b/examples/postgres_json/src/main.rs index aa9ef9d1b..e77349b9a 100644 --- a/examples/postgres_json/src/main.rs +++ b/examples/postgres_json/src/main.rs @@ -79,7 +79,7 @@ fn main() { let (sql, values) = Query::insert() .into_table(Document::Table) - .columns(vec![ + .columns([ Document::Uuid, Document::JsonField, Document::Timestamp, @@ -115,7 +115,7 @@ fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Document::Id, Document::Uuid, Document::JsonField, diff --git a/examples/rusqlite/src/main.rs b/examples/rusqlite/src/main.rs index 3b8a6cfc6..a443c03f5 100644 --- a/examples/rusqlite/src/main.rs +++ b/examples/rusqlite/src/main.rs @@ -45,7 +45,7 @@ fn main() -> Result<()> { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Uuid, Character::FontSize, Character::Character, @@ -104,7 +104,7 @@ fn main() -> Result<()> { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::FontSize, @@ -146,7 +146,7 @@ fn main() -> Result<()> { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::FontSize, diff --git a/examples/sqlx_mysql/src/main.rs b/examples/sqlx_mysql/src/main.rs index a3fe9490a..ada20dced 100644 --- a/examples/sqlx_mysql/src/main.rs +++ b/examples/sqlx_mysql/src/main.rs @@ -45,7 +45,7 @@ async fn main() { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Uuid, Character::FontSize, Character::Character, @@ -95,7 +95,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, @@ -146,7 +146,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, @@ -185,7 +185,7 @@ async fn main() { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Id, Character::FontSize, Character::Character, @@ -208,7 +208,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, diff --git a/examples/sqlx_postgres/src/main.rs b/examples/sqlx_postgres/src/main.rs index 7f90b1215..9a079ff40 100644 --- a/examples/sqlx_postgres/src/main.rs +++ b/examples/sqlx_postgres/src/main.rs @@ -47,7 +47,7 @@ async fn main() { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Uuid, Character::FontSize, Character::Character, @@ -99,7 +99,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, @@ -150,7 +150,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, @@ -205,7 +205,7 @@ async fn main() { let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Id, Character::FontSize, Character::Character, @@ -227,7 +227,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, diff --git a/examples/sqlx_sqlite/src/main.rs b/examples/sqlx_sqlite/src/main.rs index 82a067b0d..1d2979a26 100644 --- a/examples/sqlx_sqlite/src/main.rs +++ b/examples/sqlx_sqlite/src/main.rs @@ -36,7 +36,7 @@ async fn main() { // Create let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Uuid, Character::FontSize, Character::Character, @@ -76,7 +76,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, @@ -122,7 +122,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, @@ -172,7 +172,7 @@ async fn main() { // Upsert let (sql, values) = Query::insert() .into_table(Character::Table) - .columns(vec![ + .columns([ Character::Id, Character::FontSize, Character::Character, @@ -191,7 +191,7 @@ async fn main() { // Read let (sql, values) = Query::select() - .columns(vec![ + .columns([ Character::Id, Character::Uuid, Character::Character, diff --git a/src/expr.rs b/src/expr.rs index 06aea9ce3..1a9b25f9f 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -84,7 +84,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col((Char::Table, Char::SizeW)).eq(1)) /// .to_owned(); @@ -114,7 +114,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col(Char::SizeW).eq(1)) /// .to_owned(); @@ -137,7 +137,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col((Char::Table, Char::SizeW)).eq(1)) /// .to_owned(); @@ -170,7 +170,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where( /// Expr::tuple([Expr::col(Char::SizeW).into_simple_expr(), Expr::value(100)]) @@ -263,7 +263,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).eq(1)) /// .to_owned(); @@ -297,7 +297,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val(1).into()) /// .and_where(Expr::val(2.5).into()) @@ -332,7 +332,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::expr(Expr::col(Char::SizeW).if_null(0)).gt(2)) /// .to_owned(); @@ -363,7 +363,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::value(1).into()) /// .and_where(Expr::value(2.5).into()) @@ -398,7 +398,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::cust("1 = 1").into()) /// .to_owned(); @@ -428,7 +428,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col(Char::Id).eq(1)) /// .and_where(Expr::cust_with_values("6 = ? * ?", vec![2, 3]).into()) @@ -499,7 +499,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val("What!").eq("Nothing")) /// .and_where(Expr::col(Char::Id).eq(1)) @@ -533,7 +533,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val("Morning").ne("Good")) /// .and_where(Expr::col(Char::Id).ne(1)) @@ -568,7 +568,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::FontId).equals(Font::Table, Font::Id)) /// .to_owned(); @@ -605,7 +605,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).gt(2)) /// .to_owned(); @@ -638,7 +638,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where( /// Expr::tbl(Char::Table, Char::SizeW) @@ -673,7 +673,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).gte(2)) /// .to_owned(); @@ -706,7 +706,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where( /// Expr::tbl(Char::Table, Char::SizeW) @@ -742,7 +742,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).lt(2)) /// .to_owned(); @@ -775,7 +775,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where( /// Expr::tbl(Char::Table, Char::SizeW) @@ -811,7 +811,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).lte(2)) /// .to_owned(); @@ -844,7 +844,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where( /// Expr::tbl(Char::Table, Char::SizeW) @@ -880,7 +880,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val(1).add(1).equals(Expr::value(2))) /// .to_owned(); @@ -914,7 +914,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val(1).sub(1).equals(Expr::value(2))) /// .to_owned(); @@ -948,7 +948,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val(1).mul(1).equals(Expr::value(2))) /// .to_owned(); @@ -982,7 +982,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::val(1).div(1).equals(Expr::value(2))) /// .to_owned(); @@ -1016,7 +1016,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).between(1, 10)) /// .to_owned(); @@ -1049,7 +1049,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).not_between(1, 10)) /// .to_owned(); @@ -1096,7 +1096,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::Character).like("Ours'%")) /// .to_owned(); @@ -1136,7 +1136,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).is_null()) /// .to_owned(); @@ -1167,7 +1167,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).is_not_null()) /// .to_owned(); @@ -1197,7 +1197,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .cond_where(all![ /// Expr::col(Char::SizeW).binary(BinOper::SmallerThan, Expr::value(10)), @@ -1232,7 +1232,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::expr(Expr::tbl(Char::Table, Char::SizeW).is_null()).not()) /// .to_owned(); @@ -1419,7 +1419,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Id]) + /// .columns([Char::Id]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).is_in(vec![1, 2, 3])) /// .to_owned(); @@ -1442,7 +1442,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Id]) + /// .columns([Char::Id]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).is_in(Vec::::new())) /// .to_owned(); @@ -1481,7 +1481,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Id]) + /// .columns([Char::Id]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).is_not_in(vec![1, 2, 3])) /// .to_owned(); @@ -1504,7 +1504,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Char::Id]) + /// .columns([Char::Id]) /// .from(Char::Table) /// .and_where(Expr::tbl(Char::Table, Char::SizeW).is_not_in(Vec::::new())) /// .to_owned(); @@ -1543,7 +1543,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col(Char::SizeW).in_subquery( /// Query::select() @@ -1582,7 +1582,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col(Char::SizeW).not_in_subquery( /// Query::select() @@ -1621,7 +1621,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Font::Name, Font::Variant, Font::Language]) + /// .columns([Font::Name, Font::Variant, Font::Language]) /// .from(Font::Table) /// .and_where(Expr::val("a & b").matches(Expr::val("a b"))) /// .and_where(Expr::col(Font::Name).matches(Expr::val("a b"))) @@ -1648,7 +1648,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Font::Name, Font::Variant, Font::Language]) + /// .columns([Font::Name, Font::Variant, Font::Language]) /// .from(Font::Table) /// .and_where(Expr::val("a & b").contains(Expr::val("a b"))) /// .and_where(Expr::col(Font::Name).contains(Expr::val("a b"))) @@ -1675,7 +1675,7 @@ impl Expr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Font::Name, Font::Variant, Font::Language]) + /// .columns([Font::Name, Font::Variant, Font::Language]) /// .from(Font::Table) /// .and_where(Expr::val("a & b").contained(Expr::val("a b"))) /// .and_where(Expr::col(Font::Name).contained(Expr::val("a b"))) @@ -1702,7 +1702,7 @@ impl Expr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Font::Name, Font::Variant, Font::Language]) + /// .columns([Font::Name, Font::Variant, Font::Language]) /// .from(Font::Table) /// .and_where(Expr::val("a").concatenate(Expr::val("b"))) /// .and_where(Expr::val("c").concat(Expr::val("d"))) @@ -1780,7 +1780,7 @@ impl Expr { /// /// let query = Query::insert() /// .into_table(Char::Table) - /// .columns(vec![Char::FontSize]) + /// .columns([Char::FontSize]) /// .exprs_panic(vec![Expr::val("large").as_enum(Alias::new("FontSizeEnum"))]) /// .to_owned(); /// @@ -1896,7 +1896,7 @@ impl SimpleExpr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .or_where(Expr::col(Char::SizeW).eq(1).and(Expr::col(Char::SizeH).eq(2))) /// .or_where(Expr::col(Char::SizeW).eq(3).and(Expr::col(Char::SizeH).eq(4))) @@ -1927,7 +1927,7 @@ impl SimpleExpr { /// use sea_query::{*, tests_cfg::*}; /// /// let query = Query::select() - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .from(Char::Table) /// .and_where(Expr::col(Char::SizeW).eq(1).or(Expr::col(Char::SizeH).eq(2))) /// .and_where(Expr::col(Char::SizeW).eq(3).or(Expr::col(Char::SizeH).eq(4))) @@ -2172,7 +2172,7 @@ impl SimpleExpr { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Font::Name, Font::Variant, Font::Language]) + /// .columns([Font::Name, Font::Variant, Font::Language]) /// .from(Font::Table) /// .and_where( /// Expr::val("a") diff --git a/src/lib.rs b/src/lib.rs index 64a3a88b5..28ae9d92c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -382,7 +382,7 @@ //! # use sea_query::{*, tests_cfg::*}; //! let query = Query::insert() //! .into_table(Glyph::Table) -//! .columns(vec![Glyph::Aspect, Glyph::Image]) +//! .columns([Glyph::Aspect, Glyph::Image]) //! .values_panic(vec![5.15.into(), "12A".into()]) //! .values_panic(vec![4.21.into(), "123".into()]) //! .to_owned(); diff --git a/src/query/delete.rs b/src/query/delete.rs index 562b2537a..81f19a21d 100644 --- a/src/query/delete.rs +++ b/src/query/delete.rs @@ -174,7 +174,7 @@ impl DeleteStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["12A".into()]) /// .returning_all() /// .to_owned(); diff --git a/src/query/insert.rs b/src/query/insert.rs index ee0e125b8..35d606028 100644 --- a/src/query/insert.rs +++ b/src/query/insert.rs @@ -23,7 +23,7 @@ pub(crate) enum InsertValueSource { /// /// let query = Query::insert() /// .into_table(Glyph::Table) -/// .columns(vec![Glyph::Aspect, Glyph::Image]) +/// .columns([Glyph::Aspect, Glyph::Image]) /// .values_panic(vec![5.15.into(), "12A".into()]) /// .values_panic(vec![4.21.into(), "123".into()]) /// .to_owned(); @@ -68,7 +68,7 @@ impl InsertStatement { /// let query = Query::insert() /// .replace() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .values_panic(vec![5.15.into(), "12A".into()]) /// .to_owned(); /// @@ -123,7 +123,7 @@ impl InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .values(vec![2.1345.into(), "24B".into()]) /// .unwrap() /// .values_panic(vec![5.15.into(), "12A".into()]) @@ -180,7 +180,7 @@ impl InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .select_from(Query::select() /// .column(Glyph::Aspect) /// .column(Glyph::Image) @@ -230,7 +230,7 @@ impl InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .exprs(vec![ /// Expr::val(2).into(), /// Func::cast_as("2020-02-02 00:00:00", Alias::new("DATE")), @@ -315,7 +315,7 @@ impl InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["12A".into()]) /// .returning(Query::returning().columns([Glyph::Id])) /// .to_owned(); @@ -347,7 +347,7 @@ impl InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["12A".into()]) /// .returning_col(Glyph::Id) /// .to_owned(); @@ -381,7 +381,7 @@ impl InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["12A".into()]) /// .returning_all() /// .to_owned(); @@ -481,7 +481,7 @@ impl InsertStatement { /// let query = Query::insert() /// .into_table(Glyph::Table) /// .or_default_values() - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["ABC".into()]) /// .to_owned(); /// @@ -533,7 +533,7 @@ impl InsertStatement { /// let query = Query::insert() /// .into_table(Glyph::Table) /// .or_default_values_many(3) - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["ABC".into()]) /// .to_owned(); /// @@ -581,7 +581,7 @@ impl QueryStatementWriter for InsertStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .values_panic(vec![3.1415.into(), "041080".into()]) /// .to_owned(); /// diff --git a/src/query/on_conflict.rs b/src/query/on_conflict.rs index d7e811d41..0f6c43a79 100644 --- a/src/query/on_conflict.rs +++ b/src/query/on_conflict.rs @@ -75,7 +75,7 @@ impl OnConflict { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .values_panic(vec![ /// 2.into(), /// 3.into(), @@ -128,7 +128,7 @@ impl OnConflict { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .values_panic(vec![ /// 2.into(), /// 3.into(), @@ -187,7 +187,7 @@ impl OnConflict { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Aspect, Glyph::Image]) + /// .columns([Glyph::Aspect, Glyph::Image]) /// .values_panic(vec![ /// 2.into(), /// 3.into(), diff --git a/src/query/ordered.rs b/src/query/ordered.rs index fbeaf94b2..60de2a248 100644 --- a/src/query/ordered.rs +++ b/src/query/ordered.rs @@ -32,7 +32,7 @@ pub trait OrderedStatement { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Glyph::Aspect]) + /// .columns([Glyph::Aspect]) /// .from(Glyph::Table) /// .order_by( /// Glyph::Id, diff --git a/src/query/select.rs b/src/query/select.rs index d448005f9..4c749139b 100644 --- a/src/query/select.rs +++ b/src/query/select.rs @@ -475,7 +475,7 @@ impl SelectStatement { /// /// let query = Query::select() /// .from(Char::Table) - /// .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + /// .columns([Char::Character, Char::SizeW, Char::SizeH]) /// .to_owned(); /// /// assert_eq!( @@ -497,7 +497,7 @@ impl SelectStatement { /// /// let query = Query::select() /// .from(Char::Table) - /// .columns(vec![ + /// .columns([ /// (Char::Table, Char::Character), /// (Char::Table, Char::SizeW), /// (Char::Table, Char::SizeH), @@ -996,10 +996,10 @@ impl SelectStatement { /// use sea_query::{tests_cfg::*, *}; /// /// let query = Query::select() - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .from_subquery( /// Query::select() - /// .columns(vec![Glyph::Image, Glyph::Aspect]) + /// .columns([Glyph::Image, Glyph::Aspect]) /// .from(Glyph::Table) /// .take(), /// Alias::new("subglyph"), @@ -2113,7 +2113,7 @@ impl SelectStatement { /// .query( /// base_query.clone().union(UnionType::All, cte_referencing).to_owned() /// ) - /// .columns(vec![Alias::new("id"), Alias::new("depth"), Alias::new("next"), Alias::new("value")]) + /// .columns([Alias::new("id"), Alias::new("depth"), Alias::new("next"), Alias::new("value")]) /// .table_name(Alias::new("cte_traversal")) /// .to_owned(); /// diff --git a/src/query/update.rs b/src/query/update.rs index af3e9df22..48f9045ec 100644 --- a/src/query/update.rs +++ b/src/query/update.rs @@ -302,7 +302,7 @@ impl UpdateStatement { /// /// let query = Query::insert() /// .into_table(Glyph::Table) - /// .columns(vec![Glyph::Image]) + /// .columns([Glyph::Image]) /// .values_panic(vec!["12A".into()]) /// .returning_all() /// .to_owned(); diff --git a/tests/error/mod.rs b/tests/error/mod.rs index 96e1ea0a3..2e34ba17b 100644 --- a/tests/error/mod.rs +++ b/tests/error/mod.rs @@ -5,7 +5,7 @@ fn insert_values_1() { let mut insert = Query::insert(); let result = insert .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect]) + .columns([Glyph::Image, Glyph::Aspect]) .values(vec![String::from("").into()]); assert!(result.is_err()); diff --git a/tests/mysql/query.rs b/tests/mysql/query.rs index e24a24535..511fd0e20 100644 --- a/tests/mysql/query.rs +++ b/tests/mysql/query.rs @@ -5,7 +5,7 @@ use pretty_assertions::assert_eq; fn select_1() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .limit(10) .offset(100) @@ -18,7 +18,7 @@ fn select_1() { fn select_2() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .to_string(MysqlQueryBuilder), @@ -30,7 +30,7 @@ fn select_2() { fn select_3() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, Char::SizeW, Char::SizeH ]) .from(Char::Table) @@ -45,10 +45,10 @@ fn select_3() { fn select_4() { assert_eq!( Query::select() - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .from_subquery( Query::select() - .columns(vec![Glyph::Image, Glyph::Aspect]) + .columns([Glyph::Image, Glyph::Aspect]) .from(Glyph::Table) .take(), Alias::new("subglyph") @@ -74,7 +74,7 @@ fn select_5() { fn select_6() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .exprs(vec![Expr::col(Glyph::Image).max(),]) .from(Glyph::Table) .group_by_columns(vec![Glyph::Aspect,]) @@ -88,7 +88,7 @@ fn select_6() { fn select_7() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .to_string(MysqlQueryBuilder), @@ -100,7 +100,7 @@ fn select_7() { fn select_8() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, ]) .from(Char::Table) @@ -114,7 +114,7 @@ fn select_8() { fn select_9() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, ]) .from(Char::Table) @@ -129,7 +129,7 @@ fn select_9() { fn select_10() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, ]) .from(Char::Table) @@ -146,7 +146,7 @@ fn select_10() { fn select_11() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Glyph::Aspect, ]) .from(Glyph::Table) @@ -162,7 +162,7 @@ fn select_11() { fn select_12() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Glyph::Aspect, ]) .from(Glyph::Table) @@ -180,7 +180,7 @@ fn select_12() { fn select_13() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Glyph::Aspect, ]) .from(Glyph::Table) @@ -198,7 +198,7 @@ fn select_13() { fn select_14() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Glyph::Id, Glyph::Aspect, ]) @@ -218,7 +218,7 @@ fn select_14() { fn select_15() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::FontId).is_null()) .to_string(MysqlQueryBuilder), @@ -230,7 +230,7 @@ fn select_15() { fn select_16() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::FontId).is_null()) .and_where(Expr::col(Char::Character).is_not_null()) @@ -243,7 +243,7 @@ fn select_16() { fn select_17() { assert_eq!( Query::select() - .columns(vec![(Glyph::Table, Glyph::Image),]) + .columns([(Glyph::Table, Glyph::Image),]) .from(Glyph::Table) .and_where(Expr::tbl(Glyph::Table, Glyph::Aspect).between(3, 5)) .to_string(MysqlQueryBuilder), @@ -255,7 +255,7 @@ fn select_17() { fn select_18() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Glyph::Aspect, ]) .from(Glyph::Table) @@ -270,7 +270,7 @@ fn select_18() { fn select_19() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::Character).eq("A")) .to_string(MysqlQueryBuilder), @@ -294,7 +294,7 @@ fn select_20() { fn select_21() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character ]) .from(Char::Table) @@ -394,7 +394,7 @@ fn select_26() { fn select_27() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, Char::SizeW, Char::SizeH ]) .from(Char::Table) @@ -410,7 +410,7 @@ fn select_27() { fn select_28() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, Char::SizeW, Char::SizeH ]) .from(Char::Table) @@ -427,7 +427,7 @@ fn select_28() { fn select_29() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, Char::SizeW, Char::SizeH ]) .from(Char::Table) @@ -443,7 +443,7 @@ fn select_29() { fn select_30() { assert_eq!( Query::select() - .columns(vec![ + .columns([ Char::Character, Char::SizeW, Char::SizeH ]) .from(Char::Table) @@ -656,7 +656,7 @@ fn select_40() { fn select_41() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .exprs(vec![Expr::col(Glyph::Image).max()]) .from(Glyph::Table) .group_by_columns(vec![Glyph::Aspect]) @@ -823,7 +823,7 @@ fn select_50() { fn select_51() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_with_nulls(Glyph::Image, Order::Desc, NullOrdering::First) @@ -850,7 +850,7 @@ fn select_51() { fn select_52() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -875,7 +875,7 @@ fn select_52() { fn select_53() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -919,7 +919,7 @@ fn select_54() { fn select_55() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by( @@ -948,7 +948,7 @@ fn select_55() { fn select_56() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by((Glyph::Table, Glyph::Aspect), Order::Asc) @@ -1003,7 +1003,7 @@ fn insert_2() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![ + .columns([ Glyph::Image, Glyph::Aspect, ]) @@ -1022,7 +1022,7 @@ fn insert_3() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![ + .columns([ Glyph::Image, Glyph::Aspect, ]) @@ -1045,7 +1045,7 @@ fn insert_4() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![chrono::NaiveDateTime::from_timestamp(0, 0).into()]) .to_string(MysqlQueryBuilder), "INSERT INTO `glyph` (`image`) VALUES ('1970-01-01 00:00:00')" @@ -1059,7 +1059,7 @@ fn insert_8() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![date!(1970 - 01 - 01) .with_time(time!(00:00:00)) .into()]) @@ -1074,7 +1074,7 @@ fn insert_5() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![uuid::Uuid::nil().into()]) .to_string(MysqlQueryBuilder), "INSERT INTO `glyph` (`image`) VALUES ('00000000-0000-0000-0000-000000000000')" @@ -1109,7 +1109,7 @@ fn insert_from_select() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .select_from( Query::select() .column(Glyph::Aspect) @@ -1139,7 +1139,7 @@ fn insert_on_conflict_0() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1165,7 +1165,7 @@ fn insert_on_conflict_1() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1191,7 +1191,7 @@ fn insert_on_conflict_2() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1217,7 +1217,7 @@ fn insert_on_conflict_3() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1246,7 +1246,7 @@ fn insert_on_conflict_4() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), diff --git a/tests/postgres/query.rs b/tests/postgres/query.rs index 48ed11754..f821dbf99 100644 --- a/tests/postgres/query.rs +++ b/tests/postgres/query.rs @@ -5,7 +5,7 @@ use pretty_assertions::assert_eq; fn select_1() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .limit(10) .offset(100) @@ -18,7 +18,7 @@ fn select_1() { fn select_2() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .to_string(PostgresQueryBuilder), @@ -30,7 +30,7 @@ fn select_2() { fn select_3() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .and_where(Expr::col(Char::SizeH).eq(4)) @@ -43,10 +43,10 @@ fn select_3() { fn select_4() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .from_subquery( Query::select() - .columns(vec![Glyph::Image, Glyph::Aspect]) + .columns([Glyph::Image, Glyph::Aspect]) .from(Glyph::Table) .take(), Alias::new("subglyph") @@ -72,7 +72,7 @@ fn select_5() { fn select_6() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .exprs(vec![Expr::col(Glyph::Image).max(),]) .from(Glyph::Table) .group_by_columns(vec![Glyph::Aspect,]) @@ -86,7 +86,7 @@ fn select_6() { fn select_7() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .to_string(PostgresQueryBuilder), @@ -98,7 +98,7 @@ fn select_7() { fn select_8() { assert_eq!( Query::select() - .columns(vec![Char::Character,]) + .columns([Char::Character,]) .from(Char::Table) .left_join( Font::Table, @@ -113,7 +113,7 @@ fn select_8() { fn select_9() { assert_eq!( Query::select() - .columns(vec![Char::Character,]) + .columns([Char::Character,]) .from(Char::Table) .left_join( Font::Table, @@ -132,7 +132,7 @@ fn select_9() { fn select_10() { assert_eq!( Query::select() - .columns(vec![Char::Character,]) + .columns([Char::Character,]) .from(Char::Table) .left_join( Font::Table, @@ -149,7 +149,7 @@ fn select_10() { fn select_11() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by(Glyph::Image, Order::Desc) @@ -163,7 +163,7 @@ fn select_11() { fn select_12() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns(vec![(Glyph::Id, Order::Asc), (Glyph::Aspect, Order::Desc),]) @@ -176,7 +176,7 @@ fn select_12() { fn select_13() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns(vec![ @@ -192,7 +192,7 @@ fn select_13() { fn select_14() { assert_eq!( Query::select() - .columns(vec![Glyph::Id, Glyph::Aspect,]) + .columns([Glyph::Id, Glyph::Aspect,]) .expr(Expr::col(Glyph::Image).max()) .from(Glyph::Table) .group_by_columns(vec![ @@ -209,7 +209,7 @@ fn select_14() { fn select_15() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::FontId).is_null()) .to_string(PostgresQueryBuilder), @@ -221,7 +221,7 @@ fn select_15() { fn select_16() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::FontId).is_null()) .and_where(Expr::col(Char::Character).is_not_null()) @@ -234,7 +234,7 @@ fn select_16() { fn select_17() { assert_eq!( Query::select() - .columns(vec![(Glyph::Table, Glyph::Image),]) + .columns([(Glyph::Table, Glyph::Image),]) .from(Glyph::Table) .and_where(Expr::tbl(Glyph::Table, Glyph::Aspect).between(3, 5)) .to_string(PostgresQueryBuilder), @@ -246,7 +246,7 @@ fn select_17() { fn select_18() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::col(Glyph::Aspect).between(3, 5)) .and_where(Expr::col(Glyph::Aspect).not_between(8, 10)) @@ -259,7 +259,7 @@ fn select_18() { fn select_19() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::Character).eq("A")) .to_string(PostgresQueryBuilder), @@ -283,7 +283,7 @@ fn select_20() { fn select_21() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .or_where(Expr::col(Char::Character).like("A%")) .or_where(Expr::col(Char::Character).like("%B")) @@ -385,7 +385,7 @@ fn select_26() { fn select_27() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .and_where(Expr::col(Char::SizeH).eq(4)) @@ -399,7 +399,7 @@ fn select_27() { fn select_28() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .or_where(Expr::col(Char::SizeW).eq(3)) .or_where(Expr::col(Char::SizeH).eq(4)) @@ -414,7 +414,7 @@ fn select_28() { fn select_29() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .or_where(Expr::col(Char::SizeH).eq(4)) @@ -428,7 +428,7 @@ fn select_29() { fn select_30() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where( Expr::col(Char::SizeW) @@ -640,7 +640,7 @@ fn select_40() { fn select_41() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .exprs(vec![Expr::col(Glyph::Image).max()]) .from(Glyph::Table) .group_by_columns(vec![Glyph::Aspect]) @@ -807,7 +807,7 @@ fn select_50() { fn select_51() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_with_nulls(Glyph::Image, Order::Desc, NullOrdering::First) @@ -832,7 +832,7 @@ fn select_51() { fn select_52() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -855,7 +855,7 @@ fn select_52() { fn select_53() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -883,7 +883,7 @@ fn select_54() { assert_eq!( Query::select() .distinct_on(vec![Glyph::Aspect,]) - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -925,7 +925,7 @@ fn select_55() { fn select_56() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by( @@ -959,7 +959,7 @@ fn select_56() { fn select_57() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by((Glyph::Table, Glyph::Aspect), Order::Asc) @@ -1046,7 +1046,7 @@ fn insert_2() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect,]) + .columns([Glyph::Image, Glyph::Aspect,]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1062,7 +1062,7 @@ fn insert_3() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect,]) + .columns([Glyph::Image, Glyph::Aspect,]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1079,7 +1079,7 @@ fn insert_4() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![chrono::NaiveDateTime::from_timestamp(0, 0).into()]) .to_string(PostgresQueryBuilder), "INSERT INTO \"glyph\" (\"image\") VALUES ('1970-01-01 00:00:00')" @@ -1093,7 +1093,7 @@ fn insert_9() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![date!(1970 - 01 - 01) .with_time(time!(00:00:00)) .into()]) @@ -1108,7 +1108,7 @@ fn insert_5() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![uuid::Uuid::nil().into()]) .to_string(PostgresQueryBuilder), "INSERT INTO \"glyph\" (\"image\") VALUES ('00000000-0000-0000-0000-000000000000')" @@ -1121,7 +1121,7 @@ fn insert_from_select() { Query::insert() .into_table(Glyph::Table) .or_default_values() - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .select_from( Query::select() .column(Glyph::Aspect) @@ -1208,7 +1208,7 @@ fn insert_on_conflict_1() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1234,7 +1234,7 @@ fn insert_on_conflict_2() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1260,7 +1260,7 @@ fn insert_on_conflict_3() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1289,7 +1289,7 @@ fn insert_on_conflict_4() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1315,7 +1315,7 @@ fn insert_returning_all_columns() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect,]) + .columns([Glyph::Image, Glyph::Aspect,]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1332,7 +1332,7 @@ fn insert_returning_specific_columns() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect,]) + .columns([Glyph::Image, Glyph::Aspect,]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), diff --git a/tests/sqlite/query.rs b/tests/sqlite/query.rs index e86740766..d90f7d594 100644 --- a/tests/sqlite/query.rs +++ b/tests/sqlite/query.rs @@ -5,7 +5,7 @@ use pretty_assertions::assert_eq; fn select_1() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .limit(10) .offset(100) @@ -18,7 +18,7 @@ fn select_1() { fn select_2() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .to_string(SqliteQueryBuilder), @@ -30,7 +30,7 @@ fn select_2() { fn select_3() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .and_where(Expr::col(Char::SizeH).eq(4)) @@ -43,10 +43,10 @@ fn select_3() { fn select_4() { assert_eq!( Query::select() - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .from_subquery( Query::select() - .columns(vec![Glyph::Image, Glyph::Aspect]) + .columns([Glyph::Image, Glyph::Aspect]) .from(Glyph::Table) .take(), Alias::new("subglyph") @@ -72,7 +72,7 @@ fn select_5() { fn select_6() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .exprs(vec![Expr::col(Glyph::Image).max(),]) .from(Glyph::Table) .group_by_columns(vec![Glyph::Aspect,]) @@ -86,7 +86,7 @@ fn select_6() { fn select_7() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .to_string(SqliteQueryBuilder), @@ -98,7 +98,7 @@ fn select_7() { fn select_8() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .left_join( Font::Table, @@ -113,7 +113,7 @@ fn select_8() { fn select_9() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .left_join( Font::Table, @@ -132,7 +132,7 @@ fn select_9() { fn select_10() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .left_join( Font::Table, @@ -149,7 +149,7 @@ fn select_10() { fn select_11() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by(Glyph::Image, Order::Desc) @@ -163,7 +163,7 @@ fn select_11() { fn select_12() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns(vec![(Glyph::Id, Order::Asc), (Glyph::Aspect, Order::Desc)]) @@ -176,7 +176,7 @@ fn select_12() { fn select_13() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns(vec![ @@ -192,7 +192,7 @@ fn select_13() { fn select_14() { assert_eq!( Query::select() - .columns(vec![Glyph::Id, Glyph::Aspect]) + .columns([Glyph::Id, Glyph::Aspect]) .expr(Expr::col(Glyph::Image).max()) .from(Glyph::Table) .group_by_columns(vec![ @@ -209,7 +209,7 @@ fn select_14() { fn select_15() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::FontId).is_null()) .to_string(SqliteQueryBuilder), @@ -221,7 +221,7 @@ fn select_15() { fn select_16() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::FontId).is_null()) .and_where(Expr::col(Char::Character).is_not_null()) @@ -234,7 +234,7 @@ fn select_16() { fn select_17() { assert_eq!( Query::select() - .columns(vec![(Glyph::Table, Glyph::Image),]) + .columns([(Glyph::Table, Glyph::Image),]) .from(Glyph::Table) .and_where(Expr::tbl(Glyph::Table, Glyph::Aspect).between(3, 5)) .to_string(SqliteQueryBuilder), @@ -246,7 +246,7 @@ fn select_17() { fn select_18() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .from(Glyph::Table) .and_where(Expr::col(Glyph::Aspect).between(3, 5)) .and_where(Expr::col(Glyph::Aspect).not_between(8, 10)) @@ -259,7 +259,7 @@ fn select_18() { fn select_19() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .and_where(Expr::col(Char::Character).eq("A")) .to_string(SqliteQueryBuilder), @@ -283,7 +283,7 @@ fn select_20() { fn select_21() { assert_eq!( Query::select() - .columns(vec![Char::Character]) + .columns([Char::Character]) .from(Char::Table) .or_where(Expr::col(Char::Character).like("A%")) .or_where(Expr::col(Char::Character).like("%B")) @@ -385,7 +385,7 @@ fn select_26() { fn select_27() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .and_where(Expr::col(Char::SizeH).eq(4)) @@ -399,7 +399,7 @@ fn select_27() { fn select_28() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .or_where(Expr::col(Char::SizeW).eq(3)) .or_where(Expr::col(Char::SizeH).eq(4)) @@ -414,7 +414,7 @@ fn select_28() { fn select_29() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where(Expr::col(Char::SizeW).eq(3)) .or_where(Expr::col(Char::SizeH).eq(4)) @@ -428,7 +428,7 @@ fn select_29() { fn select_30() { assert_eq!( Query::select() - .columns(vec![Char::Character, Char::SizeW, Char::SizeH]) + .columns([Char::Character, Char::SizeW, Char::SizeH]) .from(Char::Table) .and_where( Expr::col(Char::SizeW) @@ -640,7 +640,7 @@ fn select_40() { fn select_41() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect]) + .columns([Glyph::Aspect]) .exprs(vec![Expr::col(Glyph::Image).max()]) .from(Glyph::Table) .group_by_columns(vec![Glyph::Aspect]) @@ -807,7 +807,7 @@ fn select_50() { fn select_51() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_with_nulls(Glyph::Image, Order::Desc, NullOrdering::First) @@ -832,7 +832,7 @@ fn select_51() { fn select_52() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -855,7 +855,7 @@ fn select_52() { fn select_53() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by_columns_with_nulls(vec![ @@ -897,7 +897,7 @@ fn select_54() { fn select_55() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by( @@ -931,7 +931,7 @@ fn select_55() { fn select_56() { assert_eq!( Query::select() - .columns(vec![Glyph::Aspect,]) + .columns([Glyph::Aspect,]) .from(Glyph::Table) .and_where(Expr::expr(Expr::col(Glyph::Aspect).if_null(0)).gt(2)) .order_by((Glyph::Table, Glyph::Aspect), Order::Asc) @@ -991,7 +991,7 @@ fn insert_2() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect]) + .columns([Glyph::Image, Glyph::Aspect]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1007,7 +1007,7 @@ fn insert_3() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect]) + .columns([Glyph::Image, Glyph::Aspect]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1024,7 +1024,7 @@ fn insert_4() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![chrono::NaiveDateTime::from_timestamp(0, 0).into()]) .to_string(SqliteQueryBuilder), r#"INSERT INTO "glyph" ("image") VALUES ('1970-01-01 00:00:00')"# @@ -1038,7 +1038,7 @@ fn insert_8() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![date!(1970 - 01 - 01) .with_time(time!(00:00:00)) .into()]) @@ -1052,7 +1052,7 @@ fn insert_from_select() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .select_from( Query::select() .column(Glyph::Aspect) @@ -1082,7 +1082,7 @@ fn insert_5() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image]) + .columns([Glyph::Image]) .values_panic(vec![uuid::Uuid::nil().into()]) .to_string(SqliteQueryBuilder), r#"INSERT INTO "glyph" ("image") VALUES ('00000000-0000-0000-0000-000000000000')"# @@ -1118,7 +1118,7 @@ fn insert_on_conflict_1() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1144,7 +1144,7 @@ fn insert_on_conflict_2() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1170,7 +1170,7 @@ fn insert_on_conflict_3() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1199,7 +1199,7 @@ fn insert_on_conflict_4() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Aspect, Glyph::Image]) + .columns([Glyph::Aspect, Glyph::Image]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1225,7 +1225,7 @@ fn insert_returning_all_columns() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect,]) + .columns([Glyph::Image, Glyph::Aspect,]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(), @@ -1242,7 +1242,7 @@ fn insert_returning_specific_columns() { assert_eq!( Query::insert() .into_table(Glyph::Table) - .columns(vec![Glyph::Image, Glyph::Aspect,]) + .columns([Glyph::Image, Glyph::Aspect,]) .values_panic(vec![ "04108048005887010020060000204E0180400400".into(), 3.1415.into(),