Skip to content

Commit

Permalink
Merge launchbadge/sqlx master into ws-support (#9)
Browse files Browse the repository at this point in the history
* 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 (launchbadge#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 (launchbadge#1264)

* Fix error message about wildcard overrides (launchbadge#1276)

Co-authored-by: Austin Bonander <austin@launchbadge.com>

Co-authored-by: Ryan Leckey <ryan@launchbadge.com>
Co-authored-by: toshokan <toshokan@shojigate.net>
Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
Co-authored-by: Rohan Sharma <rhnsharma5113@gmail.com>
Co-authored-by: Austin Bonander <austin@launchbadge.com>
  • Loading branch information
6 people authored Jul 13, 2021
1 parent 8bd39bc commit a90b23f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sqlx-macros/src/query/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
);
}
Expand Down

0 comments on commit a90b23f

Please sign in to comment.