diff --git a/examples/advanced-types/src/queries.rs b/examples/advanced-types/src/queries.rs index 5906e87..ce9be80 100644 --- a/examples/advanced-types/src/queries.rs +++ b/examples/advanced-types/src/queries.rs @@ -1,7 +1,10 @@ -// Code generated by sqlc-gen-sqlx v0.1.4. DO NOT EDIT. +// Code generated by sqlc-gen-sqlx v0.1.5. DO NOT EDIT. // sqlc version: v1.30.0 -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const GET_EVENT: &str = "SELECT id, name, flags, event_window FROM events WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/examples/basic/src/queries.rs b/examples/basic/src/queries.rs index 667512a..9801f06 100644 --- a/examples/basic/src/queries.rs +++ b/examples/basic/src/queries.rs @@ -1,7 +1,10 @@ -// Code generated by sqlc-gen-sqlx v0.1.4. DO NOT EDIT. +// Code generated by sqlc-gen-sqlx v0.1.5. DO NOT EDIT. // sqlc version: v1.30.0 -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const GET_AUTHOR: &str = "SELECT id, name, bio FROM authors WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] @@ -22,7 +25,8 @@ pub struct CreateAuthorParams { pub name: String, pub bio: Option, } -const CREATE_AUTHOR: &str = "INSERT INTO authors (name, bio) VALUES ($1, $2) RETURNING id, name, bio"; +const CREATE_AUTHOR: &str = + "INSERT INTO authors (name, bio) VALUES ($1, $2) RETURNING id, name, bio"; #[derive(Debug, Clone, sqlx::FromRow)] pub struct CreateAuthorRow { pub id: i64, @@ -99,7 +103,10 @@ impl Queries { .await } pub async fn delete_author(&mut self, id: i64) -> Result<(), sqlx::Error> { - sqlx::query(DELETE_AUTHOR).bind(id).execute(self.db.as_executor()).await?; + sqlx::query(DELETE_AUTHOR) + .bind(id) + .execute(self.db.as_executor()) + .await?; Ok(()) } pub async fn delete_author_rows(&mut self, id: i64) -> Result { diff --git a/examples/batch/src/queries.rs b/examples/batch/src/queries.rs index a109180..d4d8c94 100644 --- a/examples/batch/src/queries.rs +++ b/examples/batch/src/queries.rs @@ -1,7 +1,10 @@ -// Code generated by sqlc-gen-sqlx v0.1.4. DO NOT EDIT. +// Code generated by sqlc-gen-sqlx v0.1.5. DO NOT EDIT. // sqlc version: v1.30.0 -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const BATCH_GET_AUTHOR: &str = "SELECT id, name, bio FROM authors WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] @@ -60,9 +63,7 @@ impl Queries { pub fn batch_get_author<'a, I>( &'a mut self, items: I, - ) -> impl futures_core::stream::Stream< - Item = Result, - > + 'a + ) -> impl futures_core::stream::Stream> + 'a where I: IntoIterator + 'a, I::IntoIter: 'a, diff --git a/examples/enums/src/queries.rs b/examples/enums/src/queries.rs index 34110fa..00d9cf9 100644 --- a/examples/enums/src/queries.rs +++ b/examples/enums/src/queries.rs @@ -1,7 +1,10 @@ -// Code generated by sqlc-gen-sqlx v0.1.4. DO NOT EDIT. +// Code generated by sqlc-gen-sqlx v0.1.5. DO NOT EDIT. // sqlc version: v1.30.0 -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, sqlx::Type)] #[sqlx(type_name = "status")] @@ -94,10 +97,7 @@ impl Queries { .fetch_all(self.db.as_executor()) .await } - pub async fn create_user( - &mut self, - arg: CreateUserParams, - ) -> Result<(), sqlx::Error> { + pub async fn create_user(&mut self, arg: CreateUserParams) -> Result<(), sqlx::Error> { sqlx::query(CREATE_USER) .bind(arg.name) .bind(arg.status) diff --git a/sqlc.yaml b/sqlc.yaml index 888b532..bfc6a40 100644 --- a/sqlc.yaml +++ b/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: sqlc-gen-sqlx wasm: url: file://target/wasm32-wasip1/debug/sqlc-gen-sqlx.wasm - sha256: "8e453f461e97ef85246e94b56842efbda064380bfa672a1396c229cc57f0a1e7" + sha256: "837a7ff89040ce7bded3d87abaaa83591353eadc99c4cd46ed9572a450b09fd2" sql: - schema: examples/basic/schema.sql @@ -14,3 +14,30 @@ sql: out: examples/basic/src options: output: queries.rs + + - schema: examples/advanced-types/schema.sql + queries: examples/advanced-types/queries.sql + engine: postgresql + codegen: + - plugin: sqlc-gen-sqlx + out: examples/advanced-types/src + options: + output: queries.rs + + - schema: examples/batch/schema.sql + queries: examples/batch/queries.sql + engine: postgresql + codegen: + - plugin: sqlc-gen-sqlx + out: examples/batch/src + options: + output: queries.rs + + - schema: examples/enums/schema.sql + queries: examples/enums/queries.sql + engine: postgresql + codegen: + - plugin: sqlc-gen-sqlx + out: examples/enums/src + options: + output: queries.rs diff --git a/src/emit.rs b/src/emit.rs index 258ef39..3089637 100644 --- a/src/emit.rs +++ b/src/emit.rs @@ -34,10 +34,13 @@ impl FileEmitter { let formatted = prettyplease::unparse(&file); + // Pre-wrapped to satisfy `cargo fmt --check` at the default 100-col + // max_width — the single-line form exceeds the limit and rustfmt + // rewrites it. let header = format!( "// Code generated by sqlc-gen-sqlx v{}. DO NOT EDIT.\n\ // sqlc version: {}\n\n\ - #![allow(dead_code, reason = \"generated queries may expose items a caller does not use\")]\n\n", + #![allow(\n dead_code,\n reason = \"generated queries may expose items a caller does not use\"\n)]\n\n", self.plugin_version, self.sqlc_version, ); @@ -61,7 +64,7 @@ mod tests { assert!(code.contains("sqlc-gen-sqlx vsqlc-test")); assert!(code.contains("sqlc version: 0.0.0-test")); assert!(code.contains( - "#![allow(dead_code, reason = \"generated queries may expose items a caller does not use\")]" + "#![allow(\n dead_code,\n reason = \"generated queries may expose items a caller does not use\"\n)]" )); } diff --git a/tests/codegen.rs b/tests/codegen.rs index 7580326..b671d62 100644 --- a/tests/codegen.rs +++ b/tests/codegen.rs @@ -92,7 +92,7 @@ fn snapshot_one() { let code = String::from_utf8(resp.files[0].contents.clone()).unwrap(); assert_codegen_snapshot("one", &code); assert!( - code.contains("#![allow(dead_code, reason = \"generated queries may expose items a caller does not use\")]"), + code.contains("#![allow(\n dead_code,\n reason = \"generated queries may expose items a caller does not use\"\n)]"), "expected dead_code allow in:\n{code}" ); assert!( diff --git a/tests/snapshots/codegen__batch_dynamic_slice_param.snap b/tests/snapshots/codegen__batch_dynamic_slice_param.snap index 03cfafc..52d95a3 100644 --- a/tests/snapshots/codegen__batch_dynamic_slice_param.snap +++ b/tests/snapshots/codegen__batch_dynamic_slice_param.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const BATCH_LIST_AUTHORS_BY_DYNAMIC_IDS: &str = "SELECT id, name, bio FROM authors WHERE id IN ($1)"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__batchexec.snap b/tests/snapshots/codegen__batchexec.snap index 5f41d89..5792c41 100644 --- a/tests/snapshots/codegen__batchexec.snap +++ b/tests/snapshots/codegen__batchexec.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const BATCH_DELETE_AUTHOR: &str = "DELETE FROM authors WHERE id = $1"; pub trait AsExecutor { diff --git a/tests/snapshots/codegen__batchmany.snap b/tests/snapshots/codegen__batchmany.snap index caf03ae..46c1810 100644 --- a/tests/snapshots/codegen__batchmany.snap +++ b/tests/snapshots/codegen__batchmany.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const BATCH_LIST_AUTHORS: &str = "SELECT id, name, bio FROM authors WHERE bio LIKE $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__batchone.snap b/tests/snapshots/codegen__batchone.snap index 6d289bc..cf3af70 100644 --- a/tests/snapshots/codegen__batchone.snap +++ b/tests/snapshots/codegen__batchone.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const BATCH_GET_AUTHOR: &str = "SELECT id, name, bio FROM authors WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__composite_types.snap b/tests/snapshots/codegen__composite_types.snap index 2b9458e..8a4fd90 100644 --- a/tests/snapshots/codegen__composite_types.snap +++ b/tests/snapshots/codegen__composite_types.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] #[derive(Debug, Clone, sqlx::Type)] #[sqlx(type_name = "address")] diff --git a/tests/snapshots/codegen__copyfrom.snap b/tests/snapshots/codegen__copyfrom.snap index ccddb38..3161898 100644 --- a/tests/snapshots/codegen__copyfrom.snap +++ b/tests/snapshots/codegen__copyfrom.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] #[derive(Debug, Clone)] pub struct CopyAuthorsParams { diff --git a/tests/snapshots/codegen__dynamic_slice_param.snap b/tests/snapshots/codegen__dynamic_slice_param.snap index 6fcf73c..8f2d797 100644 --- a/tests/snapshots/codegen__dynamic_slice_param.snap +++ b/tests/snapshots/codegen__dynamic_slice_param.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const LIST_AUTHORS_BY_DYNAMIC_IDS: &str = "SELECT id, name, bio FROM authors WHERE id IN ($1)"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__embed.snap b/tests/snapshots/codegen__embed.snap index b60bc57..39f703b 100644 --- a/tests/snapshots/codegen__embed.snap +++ b/tests/snapshots/codegen__embed.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const GET_AUTHOR_EMBED: &str = "SELECT a.id, a.name, a.bio FROM authors a WHERE a.id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__enum_types.snap b/tests/snapshots/codegen__enum_types.snap index 6d66dd3..cc53d6b 100644 --- a/tests/snapshots/codegen__enum_types.snap +++ b/tests/snapshots/codegen__enum_types.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, sqlx::Type)] #[sqlx(type_name = "status")] diff --git a/tests/snapshots/codegen__exec.snap b/tests/snapshots/codegen__exec.snap index 64694c8..dd7bc10 100644 --- a/tests/snapshots/codegen__exec.snap +++ b/tests/snapshots/codegen__exec.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const DELETE_AUTHOR: &str = "DELETE FROM authors WHERE id = $1"; pub trait AsExecutor { diff --git a/tests/snapshots/codegen__execlastid.snap b/tests/snapshots/codegen__execlastid.snap index 81accc2..541a12d 100644 --- a/tests/snapshots/codegen__execlastid.snap +++ b/tests/snapshots/codegen__execlastid.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const CREATE_AUTHOR: &str = "INSERT INTO authors (name) VALUES ($1) RETURNING id"; pub trait AsExecutor { diff --git a/tests/snapshots/codegen__execresult.snap b/tests/snapshots/codegen__execresult.snap index ee80266..3f73217 100644 --- a/tests/snapshots/codegen__execresult.snap +++ b/tests/snapshots/codegen__execresult.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const DELETE_AUTHOR_RESULT: &str = "DELETE FROM authors WHERE id = $1"; pub trait AsExecutor { diff --git a/tests/snapshots/codegen__execrows.snap b/tests/snapshots/codegen__execrows.snap index 99cf300..f9885af 100644 --- a/tests/snapshots/codegen__execrows.snap +++ b/tests/snapshots/codegen__execrows.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const DELETE_AUTHOR_ROWS: &str = "DELETE FROM authors WHERE id = $1"; pub trait AsExecutor { diff --git a/tests/snapshots/codegen__many.snap b/tests/snapshots/codegen__many.snap index 703df4f..80ad060 100644 --- a/tests/snapshots/codegen__many.snap +++ b/tests/snapshots/codegen__many.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const LIST_AUTHORS: &str = "SELECT id, name, bio FROM authors"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__multidimensional_array_types.snap b/tests/snapshots/codegen__multidimensional_array_types.snap index 3f229c4..9c949b8 100644 --- a/tests/snapshots/codegen__multidimensional_array_types.snap +++ b/tests/snapshots/codegen__multidimensional_array_types.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const GET_MATRIX: &str = "SELECT matrix FROM tensors WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__named_params.snap b/tests/snapshots/codegen__named_params.snap index 082682a..a57c97c 100644 --- a/tests/snapshots/codegen__named_params.snap +++ b/tests/snapshots/codegen__named_params.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] #[derive(Debug, Clone)] pub struct UpdateAuthorNamedParamsParams { diff --git a/tests/snapshots/codegen__nullable_named_param.snap b/tests/snapshots/codegen__nullable_named_param.snap index 33dcce2..6f1fd1b 100644 --- a/tests/snapshots/codegen__nullable_named_param.snap +++ b/tests/snapshots/codegen__nullable_named_param.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const LIST_AUTHORS_BY_OPTIONAL_BIO: &str = "SELECT id, name, bio FROM authors WHERE bio = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__one.snap b/tests/snapshots/codegen__one.snap index 49d1a6d..d268541 100644 --- a/tests/snapshots/codegen__one.snap +++ b/tests/snapshots/codegen__one.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const GET_AUTHOR: &str = "SELECT id, name, bio FROM authors WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__range_types.snap b/tests/snapshots/codegen__range_types.snap index bf32749..e5ad4c6 100644 --- a/tests/snapshots/codegen__range_types.snap +++ b/tests/snapshots/codegen__range_types.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const GET_EVENT_WINDOW: &str = "SELECT id, window, flags FROM events WHERE id = $1"; #[derive(Debug, Clone, sqlx::FromRow)] diff --git a/tests/snapshots/codegen__slice_param.snap b/tests/snapshots/codegen__slice_param.snap index 70cd6a9..a2be06a 100644 --- a/tests/snapshots/codegen__slice_param.snap +++ b/tests/snapshots/codegen__slice_param.snap @@ -5,7 +5,10 @@ expression: code // Code generated by sqlc-gen-sqlx v[VERSION]. DO NOT EDIT. // sqlc version: [VERSION] -#![allow(dead_code, reason = "generated queries may expose items a caller does not use")] +#![allow( + dead_code, + reason = "generated queries may expose items a caller does not use" +)] const LIST_AUTHORS_BY_IDS: &str = "SELECT id, name, bio FROM authors WHERE id = ANY($1)"; #[derive(Debug, Clone, sqlx::FromRow)]