macros: add proper test for sqlite using database file

Author: abonander

.gitignore

@@ -9,3 +9,6 @@ target/
 
 # Environment
 .env
+
+tests/fixtures/*.sqlite-shm
+tests/fixtures/*.sqlite-wal

Cargo.toml

@@ -76,6 +76,10 @@ required-features = [ "mysql", "macros" ]
 name = "sqlite"
 required-features = [ "sqlite" ]
 
+[[test]]
+name = "sqlite-macros"
+required-features = [ "sqlite" ]
+
 [[test]]
 name = "sqlite-raw"
 required-features = [ "sqlite" ]

sqlx-core/src/sqlite/types/mod.rs

@@ -64,7 +64,7 @@ impl Display for SqliteTypeInfo {
 
 impl TypeInfo for SqliteTypeInfo {
     fn compatible(&self, other: &Self) -> bool {
-        self.affinity == other.affinity
+        self.r#type == other.r#type || self.affinity == other.affinity
     }
 
     fn is_null_type(&self) -> bool {

tests/fixtures/test-db.sqlite

@@ -3,13 +3,11 @@ use sqlx_test::new;
 
 #[cfg_attr(feature = "runtime-async-std", async_std::test)]
 #[cfg_attr(feature = "runtime-tokio", tokio::test)]
-async fn macro_select_from_cte() -> anyhow::Result<()> {
+async fn macro_select() -> anyhow::Result<()> {
     let mut conn = new::<Sqlite>().await?;
-    let account = sqlx::query!(
-        "with accounts(id, name) as (values (1, 'Herp Derpinson')) select * from accounts"
-    )
-    .fetch_one(&mut conn)
-    .await?;
+    let account = sqlx::query!("select * from accounts")
+        .fetch_one(&mut conn)
+        .await?;
 
     println!("{:?}", account);
     println!("{}: {}", account.id, account.name);
@@ -19,14 +17,11 @@ async fn macro_select_from_cte() -> anyhow::Result<()> {
 
 #[cfg_attr(feature = "runtime-async-std", async_std::test)]
 #[cfg_attr(feature = "runtime-tokio", tokio::test)]
-async fn macro_select_from_cte_bind() -> anyhow::Result<()> {
+async fn macro_select_bind() -> anyhow::Result<()> {
     let mut conn = new::<Sqlite>().await?;
-    let account = sqlx::query!(
-        "with accounts(id, name) as (select 1, 'Herp Derpinson') select * from accounts where id = ?",
-        1i32
-    )
-    .fetch_one(&mut conn)
-    .await?;
+    let account = sqlx::query!("select * from accounts where id = ?", 1i32)
+        .fetch_one(&mut conn)
+        .await?;
 
     println!("{:?}", account);
     println!("{}: {}", account.id, account.name);
@@ -36,24 +31,21 @@ async fn macro_select_from_cte_bind() -> anyhow::Result<()> {
 
 #[derive(Debug)]
 struct RawAccount {
-    r#type: i32,
-    name: Option<String>,
+    id: i32,
+    name: String,
 }
 
 #[cfg_attr(feature = "runtime-async-std", async_std::test)]
 #[cfg_attr(feature = "runtime-tokio", tokio::test)]
 async fn test_query_as_raw() -> anyhow::Result<()> {
     let mut conn = new::<Sqlite>().await?;
 
-    let account = sqlx::query_as!(
-        RawAccount,
-        "SELECT * from (select 1 as type, cast(null as char) as name) accounts"
-    )
-    .fetch_one(&mut conn)
-    .await?;
+    let account = sqlx::query_as!(RawAccount, "SELECT * from accounts")
+        .fetch_one(&mut conn)
+        .await?;
 
-    assert_eq!(None, account.name);
-    assert_eq!(1, account.r#type);
+    assert_eq!(1, account.id);
+    assert_eq!("Herp Derpinson", account.name);
 
     println!("{:?}", account);