Mirrors/sqlx
2
0
Fork 0
mirror of https://github.com/launchbadge/sqlx synced 2024-09-20 06:11:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clarify where optional features should be enabled (#2706)

Browse source
This commit is contained in:
kryptan 2023-09-22 06:49:51 +06:00 committed by GitHub
parent c2c2b9a7ed
commit ca608a964e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sqlx-macros-core/src/query/args.rs
View file

@ -60,7 +60,7 @@ pub fn quote_args<DB: DatabaseExt>(
.ok_or_else(|| { .ok_or_else(|| {
if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&param_ty) { if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&param_ty) {
format!( format!(
"optional feature `{}` required for type {} of param #{}", "optional sqlx feature `{}` required for type {} of param #{}",
feature_gate, feature_gate,
param_ty, param_ty,
i + 1, i + 1,

2
sqlx-macros-core/src/query/output.rs
View file

@ -227,7 +227,7 @@ fn get_column_type<DB: DatabaseExt>(i: usize, column: &DB::Column) -> TokenStrea
let message = let message =
if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&type_info) { if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&type_info) {
format!( format!(
"optional feature `{feat}` required for type {ty} of {col}", "optional sqlx feature `{feat}` required for type {ty} of {col}",
ty = &type_info, ty = &type_info,
feat = feature_gate, feat = feature_gate,
col = DisplayColumn { col = DisplayColumn {

6
tests/ui/mysql/gated/chrono.stderr
View file

@ -1,4 +1,4 @@
error: optional feature `chrono` required for type DATE of column #1 ("date") error: optional sqlx feature `chrono` required for type DATE of column #1 ("date")
--> $DIR/chrono.rs:2:13 --> $DIR/chrono.rs:2:13
| |
2 | let _ = sqlx::query!("select CONVERT(now(), DATE) date"); 2 | let _ = sqlx::query!("select CONVERT(now(), DATE) date");
@ -6,7 +6,7 @@ error: optional feature `chrono` required for type DATE of column #1 ("date")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `chrono` required for type TIME of column #1 ("time") error: optional sqlx feature `chrono` required for type TIME of column #1 ("time")
--> $DIR/chrono.rs:4:13 --> $DIR/chrono.rs:4:13
| |
4 | let _ = sqlx::query!("select CONVERT(now(), TIME) time"); 4 | let _ = sqlx::query!("select CONVERT(now(), TIME) time");
@ -14,7 +14,7 @@ error: optional feature `chrono` required for type TIME of column #1 ("time")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `chrono` required for type DATETIME of column #1 ("datetime") error: optional sqlx feature `chrono` required for type DATETIME of column #1 ("datetime")
--> $DIR/chrono.rs:6:13 --> $DIR/chrono.rs:6:13
| |
6 | let _ = sqlx::query!("select CONVERT(now(), DATETIME) datetime"); 6 | let _ = sqlx::query!("select CONVERT(now(), DATETIME) datetime");

16
tests/ui/postgres/gated/chrono.stderr
View file

@ -1,4 +1,4 @@
error: optional feature `time` required for type DATE of column #1 ("now") error: optional sqlx feature `time` required for type DATE of column #1 ("now")
--> $DIR/chrono.rs:2:13 --> $DIR/chrono.rs:2:13
| |
2 | let _ = sqlx::query!("select now()::date"); 2 | let _ = sqlx::query!("select now()::date");
@ -6,7 +6,7 @@ error: optional feature `time` required for type DATE of column #1 ("now")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type TIME of column #1 ("now") error: optional sqlx feature `time` required for type TIME of column #1 ("now")
--> $DIR/chrono.rs:4:13 --> $DIR/chrono.rs:4:13
| |
4 | let _ = sqlx::query!("select now()::time"); 4 | let _ = sqlx::query!("select now()::time");
@ -14,7 +14,7 @@ error: optional feature `time` required for type TIME of column #1 ("now")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type TIMESTAMP of column #1 ("now") error: optional sqlx feature `time` required for type TIMESTAMP of column #1 ("now")
--> $DIR/chrono.rs:6:13 --> $DIR/chrono.rs:6:13
| |
6 | let _ = sqlx::query!("select now()::timestamp"); 6 | let _ = sqlx::query!("select now()::timestamp");
@ -22,7 +22,7 @@ error: optional feature `time` required for type TIMESTAMP of column #1 ("now")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type TIMESTAMPTZ of column #1 ("now") error: optional sqlx feature `time` required for type TIMESTAMPTZ of column #1 ("now")
--> $DIR/chrono.rs:8:13 --> $DIR/chrono.rs:8:13
| |
8 | let _ = sqlx::query!("select now()::timestamptz"); 8 | let _ = sqlx::query!("select now()::timestamptz");
@ -30,7 +30,7 @@ error: optional feature `time` required for type TIMESTAMPTZ of column #1 ("now"
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type DATE of param #1 error: optional sqlx feature `time` required for type DATE of param #1
--> $DIR/chrono.rs:10:13 --> $DIR/chrono.rs:10:13
| |
10 | let _ = sqlx::query!("select $1::date", ()); 10 | let _ = sqlx::query!("select $1::date", ());
@ -38,7 +38,7 @@ error: optional feature `time` required for type DATE of param #1
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type TIME of param #1 error: optional sqlx feature `time` required for type TIME of param #1
--> $DIR/chrono.rs:12:13 --> $DIR/chrono.rs:12:13
| |
12 | let _ = sqlx::query!("select $1::time", ()); 12 | let _ = sqlx::query!("select $1::time", ());
@ -46,7 +46,7 @@ error: optional feature `time` required for type TIME of param #1
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type TIMESTAMP of param #1 error: optional sqlx feature `time` required for type TIMESTAMP of param #1
--> $DIR/chrono.rs:14:13 --> $DIR/chrono.rs:14:13
| |
14 | let _ = sqlx::query!("select $1::timestamp", ()); 14 | let _ = sqlx::query!("select $1::timestamp", ());
@ -54,7 +54,7 @@ error: optional feature `time` required for type TIMESTAMP of param #1
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `time` required for type TIMESTAMPTZ of param #1 error: optional sqlx feature `time` required for type TIMESTAMPTZ of param #1
--> $DIR/chrono.rs:16:13 --> $DIR/chrono.rs:16:13
| |
16 | let _ = sqlx::query!("select $1::timestamptz", ()); 16 | let _ = sqlx::query!("select $1::timestamptz", ());

8
tests/ui/postgres/gated/ipnetwork.stderr
View file

@ -1,4 +1,4 @@
error: optional feature `ipnetwork` required for type INET of column #1 ("inet") error: optional sqlx feature `ipnetwork` required for type INET of column #1 ("inet")
--> $DIR/ipnetwork.rs:2:13 --> $DIR/ipnetwork.rs:2:13
| |
2 | let _ = sqlx::query!("select '127.0.0.1'::inet"); 2 | let _ = sqlx::query!("select '127.0.0.1'::inet");
@ -6,7 +6,7 @@ error: optional feature `ipnetwork` required for type INET of column #1 ("inet")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `ipnetwork` required for type CIDR of column #1 ("cidr") error: optional sqlx feature `ipnetwork` required for type CIDR of column #1 ("cidr")
--> $DIR/ipnetwork.rs:4:13 --> $DIR/ipnetwork.rs:4:13
| |
4 | let _ = sqlx::query!("select '2001:4f8:3:ba::/64'::cidr"); 4 | let _ = sqlx::query!("select '2001:4f8:3:ba::/64'::cidr");
@ -14,7 +14,7 @@ error: optional feature `ipnetwork` required for type CIDR of column #1 ("cidr")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `ipnetwork` required for type INET of param #1 error: optional sqlx feature `ipnetwork` required for type INET of param #1
--> $DIR/ipnetwork.rs:6:13 --> $DIR/ipnetwork.rs:6:13
| |
6 | let _ = sqlx::query!("select $1::inet", ()); 6 | let _ = sqlx::query!("select $1::inet", ());
@ -22,7 +22,7 @@ error: optional feature `ipnetwork` required for type INET of param #1
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `ipnetwork` required for type CIDR of param #1 error: optional sqlx feature `ipnetwork` required for type CIDR of param #1
--> $DIR/ipnetwork.rs:8:13 --> $DIR/ipnetwork.rs:8:13
| |
8 | let _ = sqlx::query!("select $1::cidr", ()); 8 | let _ = sqlx::query!("select $1::cidr", ());

4
tests/ui/postgres/gated/uuid.stderr
View file

@ -1,4 +1,4 @@
error: optional feature `uuid` required for type UUID of column #1 ("uuid") error: optional sqlx feature `uuid` required for type UUID of column #1 ("uuid")
--> $DIR/uuid.rs:2:13 --> $DIR/uuid.rs:2:13
| |
2 | let _ = sqlx::query!("select 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid"); 2 | let _ = sqlx::query!("select 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid");
@ -6,7 +6,7 @@ error: optional feature `uuid` required for type UUID of column #1 ("uuid")
| |
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: optional feature `uuid` required for type UUID of param #1 error: optional sqlx feature `uuid` required for type UUID of param #1
--> $DIR/uuid.rs:3:13 --> $DIR/uuid.rs:3:13
| |
3 | let _ = sqlx::query!("select $1::uuid", ()); 3 | let _ = sqlx::query!("select $1::uuid", ());