From a90b23fb7daafb4bcc0fbbad7b4357bdb889c029 Mon Sep 17 00:00:00 2001 From: Vlad Beffa <6473744+vbeffa@users.noreply.github.com> Date: Tue, 13 Jul 2021 21:52:14 +0000 Subject: [PATCH] Merge launchbadge/sqlx master into ws-support (#9) * release: v0.5.4 * Fix infinite compile loop regression from recursive Lazy reference * release: v0.5.5 * Improve root README.md and sqlx-cli/README.md (#1262) * readme: Fix inconsistent list style * readme: Improve text alignment * readme: Fix missing links * readme: Consistently use code formatting for runtime & TLS crates and dedup links * readme: Add SQLx is not an ORM section * readme: Improve documentation about offline mode * Rename _expr to expr (#1264) * Fix error message about wildcard overrides (#1276) Co-authored-by: Austin Bonander Co-authored-by: Ryan Leckey Co-authored-by: toshokan Co-authored-by: Jonas Platte Co-authored-by: Rohan Sharma Co-authored-by: Austin Bonander --- sqlx-macros/src/query/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sqlx-macros/src/query/mod.rs b/sqlx-macros/src/query/mod.rs index 0e110cb5f0..44237c8901 100644 --- a/sqlx-macros/src/query/mod.rs +++ b/sqlx-macros/src/query/mod.rs @@ -327,7 +327,8 @@ where for rust_col in &columns { if rust_col.type_.is_wildcard() { return Err( - "columns may not have wildcard overrides in `query!()` or `query_as!()" + "wildcard overrides are only allowed with an explicit record type, \ + e.g. `query_as!()` and its variants" .into(), ); }