Fixed SQL bug

crates/cdk-postgres/src/db.rs

@@ -1,26 +1,32 @@
 use cdk_common::database::Error;
 use cdk_sql_common::stmt::{Column, Statement};
 use futures_util::{pin_mut, TryStreamExt};
-use tokio_postgres::Client;
+use tokio_postgres::{error::SqlState, Client, Error as PgError};
 
 use crate::value::PgValue;
 
 #[inline(always)]
+fn to_pgsql_error(err: PgError) -> Error {
+    if let Some(err) = err.as_db_error() {
+        if *err.code() == SqlState::INTEGRITY_CONSTRAINT_VIOLATION {
+            return Error::Duplicate;
+        }
+    }
+
+    Error::Database(Box::new(err))
+}
+
+#[inline(always)]
 pub async fn pg_batch(conn: &Client, statement: Statement) -> Result<(), Error> {
     let (sql, _placeholder_values) = statement.to_sql()?;
 
-    conn.batch_execute(&sql)
-        .await
-        .map_err(|e| Error::Database(Box::new(e)))
+    conn.batch_execute(&sql).await.map_err(to_pgsql_error)
 }
 
 #[inline(always)]
 pub async fn pg_execute(conn: &Client, statement: Statement) -> Result<usize, Error> {
     let (sql, placeholder_values) = statement.to_sql()?;
-    let prepared_statement = conn
-        .prepare(&sql)
-        .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+    let prepared_statement = conn.prepare(&sql).await.map_err(to_pgsql_error)?;
 
     conn.execute_raw(
         &prepared_statement,
@@ -30,7 +36,7 @@ pub async fn pg_execute(conn: &Client, statement: Statement) -> Result<usize, Er
             .collect::<Vec<PgValue>>(),
     )
     .await
-    .map_err(|e| Error::Database(Box::new(e)))
+    .map_err(to_pgsql_error)
     .map(|x| x as usize)
 }
 
@@ -40,10 +46,7 @@ pub async fn pg_fetch_one(
     statement: Statement,
 ) -> Result<Option<Vec<Column>>, Error> {
     let (sql, placeholder_values) = statement.to_sql()?;
-    let prepared_statement = conn
-        .prepare(&sql)
-        .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+    let prepared_statement = conn.prepare(&sql).await.map_err(to_pgsql_error)?;
 
     let stream = conn
         .query_raw(
@@ -54,30 +57,27 @@ pub async fn pg_fetch_one(
                 .collect::<Vec<PgValue>>(),
         )
         .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+        .map_err(to_pgsql_error)?;
 
     pin_mut!(stream);
 
     stream
         .try_next()
         .await
-        .map_err(|e| Error::Database(Box::new(e)))?
+        .map_err(to_pgsql_error)?
         .map(|row| {
             (0..row.len())
                 .map(|i| row.try_get::<_, PgValue>(i).map(|value| value.into()))
                 .collect::<Result<Vec<_>, _>>()
         })
         .transpose()
-        .map_err(|e| Error::Database(Box::new(e)))
+        .map_err(to_pgsql_error)
 }
 
 #[inline(always)]
 pub async fn pg_fetch_all(conn: &Client, statement: Statement) -> Result<Vec<Vec<Column>>, Error> {
     let (sql, placeholder_values) = statement.to_sql()?;
-    let prepared_statement = conn
-        .prepare(&sql)
-        .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+    let prepared_statement = conn.prepare(&sql).await.map_err(to_pgsql_error)?;
 
     let stream = conn
         .query_raw(
@@ -88,21 +88,17 @@ pub async fn pg_fetch_all(conn: &Client, statement: Statement) -> Result<Vec<Vec
                 .collect::<Vec<PgValue>>(),
         )
         .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+        .map_err(to_pgsql_error)?;
 
     pin_mut!(stream);
 
     let mut rows = vec![];
-    while let Some(row) = stream
-        .try_next()
-        .await
-        .map_err(|e| Error::Database(Box::new(e)))?
-    {
+    while let Some(row) = stream.try_next().await.map_err(to_pgsql_error)? {
         rows.push(
             (0..row.len())
                 .map(|i| row.try_get::<_, PgValue>(i).map(|value| value.into()))
                 .collect::<Result<Vec<_>, _>>()
-                .map_err(|e| Error::Database(Box::new(e)))?,
+                .map_err(to_pgsql_error)?,
         );
     }
 
@@ -112,10 +108,7 @@ pub async fn pg_fetch_all(conn: &Client, statement: Statement) -> Result<Vec<Vec
 #[inline(always)]
 pub async fn gn_pluck(conn: &Client, statement: Statement) -> Result<Option<Column>, Error> {
     let (sql, placeholder_values) = statement.to_sql()?;
-    let prepared_statement = conn
-        .prepare(&sql)
-        .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+    let prepared_statement = conn.prepare(&sql).await.map_err(to_pgsql_error)?;
 
     let stream = conn
         .query_raw(
@@ -126,15 +119,15 @@ pub async fn gn_pluck(conn: &Client, statement: Statement) -> Result<Option<Colu
                 .collect::<Vec<PgValue>>(),
         )
         .await
-        .map_err(|e| Error::Database(Box::new(e)))?;
+        .map_err(to_pgsql_error)?;
 
     pin_mut!(stream);
 
     stream
         .try_next()
         .await
-        .map_err(|e| Error::Database(Box::new(e)))?
+        .map_err(to_pgsql_error)?
         .map(|row| row.try_get::<_, PgValue>(0).map(|value| value.into()))
         .transpose()
-        .map_err(|e| Error::Database(Box::new(e)))
+        .map_err(to_pgsql_error)
 }

crates/cdk-sql-common/src/mint/auth/mod.rs

@@ -325,9 +325,6 @@ where
             return Ok(vec![]);
         }
         let conn = self.pool.get().map_err(|e| Error::Database(Box::new(e)))?;
-        if !ys.is_empty() {
-            return Ok(vec![]);
-        }
         let mut current_states = query(r#"SELECT y, state FROM proof WHERE y IN (:ys)"#)?
             .bind_vec("ys", ys.iter().map(|y| y.to_bytes().to_vec()).collect())
             .fetch_all(&*conn)

crates/cdk-sql-common/src/mint/mod.rs

@@ -314,10 +314,15 @@ where
     // Get payment IDs and timestamps from the mint_quote_payments table
     query(
         r#"
-SELECT payment_id, timestamp, amount
-FROM mint_quote_payments
-WHERE quote_id=:quote_id;
-            "#,
+        SELECT
+            payment_id,
+            timestamp,
+            amount
+        FROM
+            mint_quote_payments
+        WHERE
+            quote_id=:quote_id
+        "#,
     )?
     .bind("quote_id", quote_id.as_hyphenated().to_string())
     .fetch_all(conn)
@@ -662,7 +667,6 @@ where
             UPDATE mint_quote
             SET amount_issued = :amount_issued
             WHERE id = :quote_id
-            FOR UPDATE
             "#,
         )?
         .bind("amount_issued", new_amount_issued.to_i64())