Update unit tests + QueryBuilder changes

Author: joeydewaal

sqlx-core/src/query_builder.rs

@@ -14,6 +14,7 @@ use crate::query_as::QueryAs;
 use crate::query_scalar::QueryScalar;
 use crate::sql_str::AssertSqlSafe;
 use crate::sql_str::SqlSafeStr;
+use crate::sql_str::SqlStr;
 use crate::types::Type;
 use crate::Either;
 
@@ -37,7 +38,7 @@ impl<DB: Database> Default for QueryBuilder<'_, DB> {
     fn default() -> Self {
         QueryBuilder {
             init_len: 0,
-            query: String::default().into(),
+            query: Default::default(),
             arguments: Some(Default::default()),
         }
     }
@@ -460,7 +461,7 @@ where
         self.sanity_check();
 
         Query {
-            statement: Either::Left(AssertSqlSafe(self.query.clone()).into_sql_str()),
+            statement: Either::Left(self.sql()),
             arguments: self.arguments.take().map(Ok),
             database: PhantomData,
             persistent: true,
@@ -527,14 +528,19 @@ where
     }
 
     /// Get the current build SQL; **note**: may not be syntactically correct.
-    pub fn sql(&self) -> &str {
-        &self.query
+    pub fn sql(&self) -> SqlStr {
+        AssertSqlSafe(self.query.clone()).into_sql_str()
     }
 
     /// Deconstruct this `QueryBuilder`, returning the built SQL. May not be syntactically correct.
     pub fn into_sql(self) -> String {
         Arc::unwrap_or_clone(self.query)
     }
+
+    /// Deconstruct this `QueryBuilder`, returning the built SQL. May not be syntactically correct.
+    pub fn into_sql(self) -> SqlStr {
+        AssertSqlSafe(self.query).into_sql_str()
+    }
 }
 
 /// A wrapper around `QueryBuilder` for creating comma(or other token)-separated lists.

sqlx-core/src/testing/fixtures.rs

@@ -150,7 +150,7 @@ where
             }
         }
 
-        query.into_sql()
+        query.into_string()
     }
 }
 

tests/mysql/describe.rs

@@ -1,12 +1,12 @@
 use sqlx::mysql::MySql;
-use sqlx::{Column, Executor, Type, TypeInfo};
+use sqlx::{Column, Executor, SqlSafeStr, Type, TypeInfo};
 use sqlx_test::new;
 
 #[sqlx_macros::test]
 async fn it_describes_simple() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
 
-    let d = conn.describe("SELECT * FROM tweet").await?;
+    let d = conn.describe("SELECT * FROM tweet".into_sql_str()).await?;
 
     assert_eq!(d.columns()[0].name(), "id");
     assert_eq!(d.columns()[1].name(), "created_at");
@@ -43,7 +43,9 @@ CREATE TEMPORARY TABLE with_bit_and_tinyint (
     )
     .await?;
 
-    let d = conn.describe("SELECT * FROM with_bit_and_tinyint").await?;
+    let d = conn
+        .describe("SELECT * FROM with_bit_and_tinyint".into_sql_str())
+        .await?;
 
     assert_eq!(d.column(2).name(), "value_bool");
     assert_eq!(d.column(2).type_info().name(), "BOOLEAN");
@@ -62,7 +64,7 @@ async fn uses_alias_name() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
 
     let d = conn
-        .describe("SELECT text AS tweet_text FROM tweet")
+        .describe("SELECT text AS tweet_text FROM tweet".into_sql_str())
         .await?;
 
     assert_eq!(d.columns()[0].name(), "tweet_text");

tests/mysql/mysql.rs

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use futures_util::TryStreamExt;
 use sqlx::mysql::{MySql, MySqlConnection, MySqlPool, MySqlPoolOptions, MySqlRow};
-use sqlx::{Column, Connection, Executor, Row, Statement, TypeInfo};
+use sqlx::{Column, Connection, Executor, Row, SqlSafeStr, Statement, TypeInfo};
 use sqlx_core::connection::ConnectOptions;
 use sqlx_mysql::MySqlConnectOptions;
 use sqlx_test::{new, setup_if_needed};
@@ -391,7 +391,9 @@ async fn it_can_prepare_then_execute() -> anyhow::Result<()> {
         .await?
         .last_insert_id();
 
-    let statement = tx.prepare("SELECT * FROM tweet WHERE id = ?").await?;
+    let statement = tx
+        .prepare("SELECT * FROM tweet WHERE id = ?".into_sql_str())
+        .await?;
 
     assert_eq!(statement.column(0).name(), "id");
     assert_eq!(statement.column(1).name(), "created_at");

tests/postgres/describe.rs

@@ -1,11 +1,11 @@
-use sqlx::{postgres::Postgres, Column, Executor, TypeInfo};
+use sqlx::{postgres::Postgres, Column, Executor, SqlSafeStr, TypeInfo};
 use sqlx_test::new;
 
 #[sqlx_macros::test]
 async fn it_describes_simple() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
-    let d = conn.describe("SELECT * FROM tweet").await?;
+    let d = conn.describe("SELECT * FROM tweet".into_sql_str()).await?;
 
     assert_eq!(d.columns()[0].name(), "id");
     assert_eq!(d.columns()[1].name(), "created_at");
@@ -29,7 +29,7 @@ async fn it_describes_simple() -> anyhow::Result<()> {
 async fn it_describes_expression() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
-    let d = conn.describe("SELECT 1::int8 + 10").await?;
+    let d = conn.describe("SELECT 1::int8 + 10".into_sql_str()).await?;
 
     // ?column? will cause the macro to emit an error ad ask the user to explicitly name the type
     assert_eq!(d.columns()[0].name(), "?column?");
@@ -46,7 +46,9 @@ async fn it_describes_expression() -> anyhow::Result<()> {
 async fn it_describes_enum() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
-    let d = conn.describe("SELECT 'open'::status as _1").await?;
+    let d = conn
+        .describe("SELECT 'open'::status as _1".into_sql_str())
+        .await?;
 
     assert_eq!(d.columns()[0].name(), "_1");
 
@@ -66,7 +68,9 @@ async fn it_describes_enum() -> anyhow::Result<()> {
 async fn it_describes_record() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
-    let d = conn.describe("SELECT (true, 10::int2)").await?;
+    let d = conn
+        .describe("SELECT (true, 10::int2)".into_sql_str())
+        .await?;
 
     let ty = d.columns()[0].type_info();
     assert_eq!(ty.name(), "RECORD");
@@ -79,7 +83,7 @@ async fn it_describes_composite() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
     let d = conn
-        .describe("SELECT ROW('name',10,500)::inventory_item")
+        .describe("SELECT ROW('name',10,500)::inventory_item".into_sql_str())
         .await?;
 
     let ty = d.columns()[0].type_info();

tests/postgres/postgres.rs

@@ -5,7 +5,7 @@ use sqlx::postgres::{
     PgAdvisoryLock, PgConnectOptions, PgConnection, PgDatabaseError, PgErrorPosition, PgListener,
     PgPoolOptions, PgRow, PgSeverity, Postgres, PG_COPY_MAX_DATA_LEN,
 };
-use sqlx::{Column, Connection, Executor, Row, Statement, TypeInfo};
+use sqlx::{Column, Connection, Executor, Row, SqlSafeStr, Statement, TypeInfo};
 use sqlx_core::sql_str::AssertSqlSafe;
 use sqlx_core::{bytes::Bytes, error::BoxDynError};
 use sqlx_test::{new, pool, setup_if_needed};
@@ -220,7 +220,7 @@ CREATE TEMPORARY TABLE json_stuff (obj json, obj2 jsonb);
         .await?;
 
     let query = "INSERT INTO json_stuff (obj, obj2) VALUES ($1, $2)";
-    let _ = conn.describe(query).await?;
+    let _ = conn.describe(query.into_sql_str()).await?;
 
     let done = sqlx::query(query)
         .bind(serde_json::json!({ "a": "a" }))
@@ -881,7 +881,9 @@ async fn it_can_prepare_then_execute() -> anyhow::Result<()> {
             .fetch_one(&mut *tx)
             .await?;
 
-    let statement = tx.prepare("SELECT * FROM tweet WHERE id = $1").await?;
+    let statement = tx
+        .prepare("SELECT * FROM tweet WHERE id = $1".into_sql_str())
+        .await?;
 
     assert_eq!(statement.column(0).name(), "id");
     assert_eq!(statement.column(1).name(), "created_at");
@@ -967,7 +969,8 @@ async fn test_describe_outer_join_nullable() -> anyhow::Result<()> {
         .describe(
             "select tweet.id
     from tweet
-    inner join products on products.name = tweet.text",
+    inner join products on products.name = tweet.text"
+                .into_sql_str(),
         )
         .await?;
 
@@ -978,7 +981,8 @@ async fn test_describe_outer_join_nullable() -> anyhow::Result<()> {
         .describe(
             "select tweet.id
 from (values (null)) vals(val)
-         left join tweet on false",
+         left join tweet on false"
+                .into_sql_str(),
         )
         .await?;
 
@@ -992,7 +996,8 @@ from (values (null)) vals(val)
         .describe(
             "select tweet1.id, tweet2.id
     from tweet tweet1
-    left join tweet tweet2 on false",
+    left join tweet tweet2 on false"
+                .into_sql_str(),
         )
         .await?;
 
@@ -1005,7 +1010,8 @@ from (values (null)) vals(val)
         .describe(
             "select tweet1.id, tweet2.id
     from tweet tweet1
-    right join tweet tweet2 on false",
+    right join tweet tweet2 on false"
+                .into_sql_str(),
         )
         .await?;
 
@@ -1018,7 +1024,8 @@ from (values (null)) vals(val)
         .describe(
             "select tweet1.id, tweet2.id
     from tweet tweet1
-    full join tweet tweet2 on false",
+    full join tweet tweet2 on false"
+                .into_sql_str(),
         )
         .await?;
 

tests/postgres/query_builder.rs

@@ -3,7 +3,6 @@ use sqlx::query_builder::QueryBuilder;
 use sqlx::Executor;
 use sqlx::Type;
 use sqlx::{Either, Execute};
-use sqlx_core::sql_str::AssertSqlSafe;
 use sqlx_test::new;
 
 #[test]
@@ -134,7 +133,7 @@ async fn test_max_number_of_binds() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
     // Indirectly ensures the macros support this many binds since this is what they use.
-    let describe = conn.describe(AssertSqlSafe(qb.sql().to_string())).await?;
+    let describe = conn.describe(qb.sql()).await?;
 
     match describe
         .parameters