Skip to content

Commit

Permalink
Clarify where optional features should be enabled (#2706)
Browse files Browse the repository at this point in the history
  • Loading branch information
kryptan authored Sep 22, 2023
1 parent c2c2b9a commit ca608a9
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion sqlx-macros-core/src/query/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub fn quote_args<DB: DatabaseExt>(
.ok_or_else(|| {
if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&param_ty) {
format!(
"optional feature `{}` required for type {} of param #{}",
"optional sqlx feature `{}` required for type {} of param #{}",
feature_gate,
param_ty,
i + 1,
Expand Down
2 changes: 1 addition & 1 deletion sqlx-macros-core/src/query/output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ fn get_column_type<DB: DatabaseExt>(i: usize, column: &DB::Column) -> TokenStrea
let message =
if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&type_info) {
format!(
"optional feature `{feat}` required for type {ty} of {col}",
"optional sqlx feature `{feat}` required for type {ty} of {col}",
ty = &type_info,
feat = feature_gate,
col = DisplayColumn {
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/mysql/gated/chrono.stderr
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
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
|
2 | let _ = sqlx::query!("select CONVERT(now(), DATE) date");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
4 | let _ = sqlx::query!("select CONVERT(now(), TIME) time");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
6 | let _ = sqlx::query!("select CONVERT(now(), DATETIME) datetime");
Expand Down
16 changes: 8 additions & 8 deletions tests/ui/postgres/gated/chrono.stderr
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
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
|
2 | let _ = sqlx::query!("select now()::date");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
4 | let _ = sqlx::query!("select now()::time");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
6 | let _ = sqlx::query!("select now()::timestamp");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
8 | let _ = sqlx::query!("select now()::timestamptz");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
10 | let _ = sqlx::query!("select $1::date", ());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
12 | let _ = sqlx::query!("select $1::time", ());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
14 | let _ = sqlx::query!("select $1::timestamp", ());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
16 | let _ = sqlx::query!("select $1::timestamptz", ());
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/postgres/gated/ipnetwork.stderr
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
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
|
2 | let _ = sqlx::query!("select '127.0.0.1'::inet");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
4 | let _ = sqlx::query!("select '2001:4f8:3:ba::/64'::cidr");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
6 | let _ = sqlx::query!("select $1::inet", ());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
8 | let _ = sqlx::query!("select $1::cidr", ());
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/postgres/gated/uuid.stderr
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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
|
2 | let _ = sqlx::query!("select 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= 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
|
3 | let _ = sqlx::query!("select $1::uuid", ());
Expand Down

0 comments on commit ca608a9

Please sign in to comment.