resolve tests conflict from merge conflicts in GH ui

Author: JosiahParry

tests/any/any.rs

@@ -254,168 +254,5 @@ async fn it_encodes_decodes_json() -> anyhow::Result<()> {
 
     assert_eq!(result.0, test_data);
 
-<<<<<<< Updated upstream
-        let mut conn = new::<Any>().await?;
-
-        let string = "Hello, world!".to_string();
-        let ref tuple = ("Hello, world!".to_string(),);
-
-        #[cfg(feature = "postgres")]
-        const SQL: &str =
-        "SELECT 'Hello, world!' as string where 'Hello, world!' in ($1, $2, $3, $4, $5, $6, $7)";
-
-        #[cfg(not(feature = "postgres"))]
-        const SQL: &str =
-            "SELECT 'Hello, world!' as string where 'Hello, world!' in (?, ?, ?, ?, ?, ?, ?)";
-
-        {
-            let query = sqlx::query(SQL)
-                // validate flexibility of lifetimes
-                .bind(&string)
-                .bind(&string[..])
-                .bind(Some(&string))
-                .bind(Some(&string[..]))
-                .bind(&Option::<String>::None)
-                .bind(&string.clone())
-                .bind(&tuple.0); // should not get "temporary value is freed at the end of this statement" here
-
-            let result = query.fetch_one(&mut conn).await?;
-
-            let column_0: String = result.try_get(0)?;
-
-            assert_eq!(column_0, string);
-        }
-
-        {
-            let mut query = sqlx::query(SQL);
-
-            let query = || -> Result<_, BoxDynError> {
-                // validate flexibility of lifetimes
-                query.try_bind(&string)?;
-                query.try_bind(&string[..])?;
-                query.try_bind(Some(&string))?;
-                query.try_bind(Some(&string[..]))?;
-                query.try_bind(&Option::<String>::None)?;
-                query.try_bind(&string.clone())?;
-                query.try_bind(&tuple.0)?;
-
-                Ok(query)
-            }()
-            .map_err(Error::Encode)?;
-
-            let result = query.fetch_one(&mut conn).await?;
-
-            let column_0: String = result.try_get(0)?;
-
-            assert_eq!(column_0, string);
-        }
-    }
-
-    #[cfg(feature = "json")]
-    #[sqlx_macros::test]
-    async fn it_encodes_decodes_json() -> anyhow::Result<()> {
-        sqlx::any::install_default_drivers();
-
-        // Create new connection
-        let mut conn = new::<Any>().await?;
-
-        // Test with serde_json::Value
-        let json_value = serde_json::json!({
-            "name": "test",
-            "value": 42,
-            "items": [1, 2, 3]
-        });
-
-        // This will work by encoding JSON as text and decoding it back
-        let result: serde_json::Value = sqlx::query_scalar("SELECT ?")
-            .bind(Json(&json_value))
-            .fetch_one(&mut conn)
-            .await?;
-
-        assert_eq!(result, json_value);
-
-        // Test with custom struct
-        #[derive(Serialize, Deserialize, Debug, PartialEq)]
-        struct TestData {
-            name: String,
-            count: i32,
-        }
-
-        let test_data = TestData {
-            name: "example".to_string(),
-            count: 100,
-        };
-
-        let result: Json<TestData> = sqlx::query_scalar("SELECT ?")
-            .bind(Json(&test_data))
-            .fetch_one(&mut conn)
-            .await?;
-
-        assert_eq!(result.0, test_data);
-
-        Ok(())
-    }
-=======
-#[sqlx_macros::test]
-async fn it_can_query_by_string_args() -> sqlx::Result<()> {
-    install_default_drivers();
-
-    let mut conn = new::<Any>().await?;
-
-    let string = "Hello, world!".to_string();
-    let ref tuple = ("Hello, world!".to_string(),);
-
-    #[cfg(feature = "postgres")]
-    const SQL: &str =
-        "SELECT 'Hello, world!' as string where 'Hello, world!' in ($1, $2, $3, $4, $5, $6, $7)";
-
-    #[cfg(not(feature = "postgres"))]
-    const SQL: &str =
-        "SELECT 'Hello, world!' as string where 'Hello, world!' in (?, ?, ?, ?, ?, ?, ?)";
-
-    {
-        let query = sqlx::query(SQL)
-            // validate flexibility of lifetimes
-            .bind(&string)
-            .bind(&string[..])
-            .bind(Some(&string))
-            .bind(Some(&string[..]))
-            .bind(&Option::<String>::None)
-            .bind(&string.clone())
-            .bind(&tuple.0); // should not get "temporary value is freed at the end of this statement" here
-
-        let result = query.fetch_one(&mut conn).await?;
-
-        let column_0: String = result.try_get(0)?;
-
-        assert_eq!(column_0, string);
-    }
-
-    {
-        let mut query = sqlx::query(SQL);
-
-        let query = || -> Result<_, BoxDynError> {
-            // validate flexibility of lifetimes
-            query.try_bind(&string)?;
-            query.try_bind(&string[..])?;
-            query.try_bind(Some(&string))?;
-            query.try_bind(Some(&string[..]))?;
-            query.try_bind(&Option::<String>::None)?;
-            query.try_bind(&string.clone())?;
-            query.try_bind(&tuple.0)?;
-
-            Ok(query)
-        }()
-        .map_err(Error::Encode)?;
-
-        let result = query.fetch_one(&mut conn).await?;
-
-        let column_0: String = result.try_get(0)?;
-
-        assert_eq!(column_0, string);
-    }
-
-=======
->>>>>>> Stashed changes
     Ok(())
 }