upgrade dependencies

rkusa · rkusa · commit ad9268d49b3f · 2024-11-08T12:27:06.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           --health-retries 5
 
     env:
-        DATABASE_URL: postgresql://sqlm-test:sqlm-test@localhost/sqlm-test
+      DATABASE_URL: postgresql://sqlm-test:sqlm-test@localhost/sqlm-test
 
     steps:
       - name: Add build dependencies
@@ -46,19 +46,17 @@ jobs:
         run: psql $DATABASE_URL < postgres/testdb.sql
 
       - name: Install ${{matrix.toolchain}} toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{matrix.toolchain}}
-          override: true
           components: rustfmt, clippy
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
 
       - name: Test
         run: cargo hack test --workspace --feature-powerset --depth 2
-      
+
       - name: Clippy
         run: cargo hack check --workspace --feature-powerset --depth 1
 
diff --git a/postgres-macros/Cargo.toml b/postgres-macros/Cargo.toml
@@ -18,7 +18,7 @@ uuid = ["dep:uuid", "postgres/with-uuid-1"]
 
 [dependencies]
 ariadne = "0.4"
-chumsky = "1.0.0-alpha.6"
+chumsky = "1.0.0-alpha.7"
 dotenvy = "0.15"
 heck = "0.5"
 pgvector = { version = "0.4", features = ["postgres"], optional = true }
@@ -29,7 +29,7 @@ rustls = { version = "0.23", default-features = false, features = ["ring"] }
 serde_json = { version = "1.0", optional = true }
 syn = { version = "2.0", features = ["full", "extra-traits"] }
 time = { version = "0.3", optional = true }
-tokio-postgres-rustls = "0.12"
+tokio-postgres-rustls = "0.13"
 uuid = { version = "1.4", optional = true }
 
 [dev-dependencies]
diff --git a/postgres-macros/tests/fail-stable/date_vs_datetime.stderr b/postgres-macros/tests/fail-stable/date_vs_datetime.stderr
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<OffsetDateTime as SqlType>::Type == Date
  --> tests/fail-stable/date_vs_datetime.rs:5:62
   |
 5 |     let _: time::OffsetDateTime = sql!("SELECT NOW()::DATE").await.unwrap();
-  |                                                              ^^^^^ expected `Date`, found `OffsetDateTime`
+  |                                                              ^^^^^ expected `OffsetDateTime`, found `Date`
   |
   = note: required for `Sql<'_, Primitive<time::Date>, OffsetDateTime>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/datetime_vs_date.stderr b/postgres-macros/tests/fail-stable/datetime_vs_date.stderr
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<Date as SqlType>::Type == OffsetDateTime
  --> tests/fail-stable/datetime_vs_date.rs:6:10
   |
 6 |         .await
-  |          ^^^^^ expected `OffsetDateTime`, found `Date`
+  |          ^^^^^ expected `Date`, found `OffsetDateTime`
   |
   = note: required for `Sql<'_, Primitive<OffsetDateTime>, time::Date>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/enum_array_to_enum_literal.stderr b/postgres-macros/tests/fail-stable/enum_array_to_enum_literal.stderr
@@ -4,10 +4,9 @@ error[E0277]: the trait bound `Role: sqlm_postgres::query::Query<sqlm_postgres::
 17 |         .await
    |         -^^^^^
    |         ||
-   |         |unsatisfied trait bound
+   |         |the trait `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>>>>` is not implemented for `Role`, which is required by `Sql<'_, sqlm_postgres::types::Array<Vec<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>>>, _>: IntoFuture`
    |         help: remove the `.await`
    |
-   = help: the trait `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>>>>` is not implemented for `Role`
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
              `()` implements `sqlm_postgres::query::Query<()>`
              `Option<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
diff --git a/postgres-macros/tests/fail-stable/enum_extra_variant.stderr b/postgres-macros/tests/fail-stable/enum_extra_variant.stderr
@@ -4,10 +4,9 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
 26 |     let _: Vec<User> = sql!("SELECT id, role FROM users").await.unwrap();
    |                                                          -^^^^^
    |                                                          ||
-   |                                                          |unsatisfied trait bound
+   |                                                          |the trait `sqlm_postgres::query::Query<Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>>` is not implemented for `Vec<User>`, which is required by `Sql<'_, Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>, _>: IntoFuture`
    |                                                          help: remove the `.await`
    |
-   = help: the trait `sqlm_postgres::query::Query<Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>>` is not implemented for `Vec<User>`
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
              `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
              `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
diff --git a/postgres-macros/tests/fail-stable/enum_missing_variant.stderr b/postgres-macros/tests/fail-stable/enum_missing_variant.stderr
@@ -4,10 +4,9 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
 20 |     let _: Vec<User> = sql!("SELECT id, role FROM users").await.unwrap();
    |                                                          -^^^^^
    |                                                          ||
-   |                                                          |unsatisfied trait bound
+   |                                                          |the trait `sqlm_postgres::query::Query<Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>>` is not implemented for `Vec<User>`, which is required by `Sql<'_, Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>, _>: IntoFuture`
    |                                                          help: remove the `.await`
    |
-   = help: the trait `sqlm_postgres::query::Query<Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>>` is not implemented for `Vec<User>`
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
              `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
              `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
diff --git a/postgres-macros/tests/fail-stable/enum_variant_mismatch.stderr b/postgres-macros/tests/fail-stable/enum_variant_mismatch.stderr
@@ -4,10 +4,9 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
 23 |     let _: Vec<User> = sql!("SELECT id, role FROM users").await.unwrap();
    |                                                          -^^^^^
    |                                                          ||
-   |                                                          |unsatisfied trait bound
+   |                                                          |the trait `sqlm_postgres::query::Query<Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>>` is not implemented for `Vec<User>`, which is required by `Sql<'_, Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>, _>: IntoFuture`
    |                                                          help: remove the `.await`
    |
-   = help: the trait `sqlm_postgres::query::Query<Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>>` is not implemented for `Vec<User>`
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
              `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
              `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
diff --git a/postgres-macros/tests/fail-stable/literal_array_to_literal.stderr b/postgres-macros/tests/fail-stable/literal_array_to_literal.stderr
@@ -4,7 +4,7 @@ error[E0277]: the trait bound `String: sqlm_postgres::query::Query<sqlm_postgres
 6 |         .await
   |         -^^^^^
   |         ||
-  |         |the trait `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<String>>>` is not implemented for `String`
+  |         |the trait `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<String>>>` is not implemented for `String`, which is required by `Sql<'_, sqlm_postgres::types::Array<Vec<String>>, _>: IntoFuture`
   |         help: remove the `.await`
   |
   = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
diff --git a/postgres-macros/tests/fail-stable/scalar_mismatch.stderr b/postgres-macros/tests/fail-stable/scalar_mismatch.stderr
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<String as SqlType>::Type == i64`
  --> tests/fail-stable/scalar_mismatch.rs:5:56
   |
 5 |     let _: String = sql!("SELECT COUNT(*) FROM users").await.unwrap();
-  |                                                        ^^^^^ expected `i64`, found `String`
+  |                                                        ^^^^^ expected `String`, found `i64`
   |
   = note: required for `Sql<'_, Primitive<i64>, String>` to implement `IntoFuture`
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
@@ -30,7 +30,7 @@ serde_json = { version = "1.0", optional = true }
 sqlm-postgres-macros = { path = "../postgres-macros", version = "0.1", default-features = false }
 time = { version = "0.3", optional = true }
 tokio-postgres = "0.7"
-tokio-postgres-rustls = "0.12"
+tokio-postgres-rustls = "0.13"
 tracing = "0.1"
 uuid = { version = "1.4", optional = true }
 

Original file line number	Diff line number	Diff line change
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<OffsetDateTime as SqlType>::Type == Date
`2`	`2`	`--> tests/fail-stable/date_vs_datetime.rs:5:62`
`3`	`3`	`\|`
`4`	`4`	`5 \| let _: time::OffsetDateTime = sql!("SELECT NOW()::DATE").await.unwrap();`
`5`		- \| ^^^^^ expected `Date`, found `OffsetDateTime`
	`5`	+ \| ^^^^^ expected `OffsetDateTime`, found `Date`
`6`	`6`	`\|`
`7`	`7`	= note: required for `Sql<'_, Primitive<time::Date>, OffsetDateTime>` to implement `IntoFuture`
Original file line number	Diff line number	Diff line change
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<Date as SqlType>::Type == OffsetDateTime
`2`	`2`	`--> tests/fail-stable/datetime_vs_date.rs:6:10`
`3`	`3`	`\|`
`4`	`4`	`6 \| .await`
`5`		- \| ^^^^^ expected `OffsetDateTime`, found `Date`
	`5`	+ \| ^^^^^ expected `Date`, found `OffsetDateTime`
`6`	`6`	`\|`
`7`	`7`	= note: required for `Sql<'_, Primitive<OffsetDateTime>, time::Date>` to implement `IntoFuture`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0277]: the trait bound `String: sqlm_postgres::query::Query<sqlm_postgres
`4`	`4`	`6 \| .await`
`5`	`5`	`\| -^^^^^`
`6`	`6`	`\| \|\|`
`7`		- \| \|the trait `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<String>>>` is not implemented for `String`
	`7`	+ \| \|the trait `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<String>>>` is not implemented for `String`, which is required by `Sql<'_, sqlm_postgres::types::Array<Vec<String>>, _>: IntoFuture`
`8`	`8`	\| help: remove the `.await`
`9`	`9`	`\|`
`10`	`10`	= help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
Original file line number	Diff line number	Diff line change
@@ -2,6 +2,6 @@ error[E0271]: type mismatch resolving `<String as SqlType>::Type == i64`
`2`	`2`	`--> tests/fail-stable/scalar_mismatch.rs:5:56`
`3`	`3`	`\|`
`4`	`4`	`5 \| let _: String = sql!("SELECT COUNT(*) FROM users").await.unwrap();`
`5`		- \| ^^^^^ expected `i64`, found `String`
	`5`	+ \| ^^^^^ expected `String`, found `i64`
`6`	`6`	`\|`
`7`	`7`	= note: required for `Sql<'_, Primitive<i64>, String>` to implement `IntoFuture`