fix(sql): bindTypes hint to correctly bind binary data (fix #105)

plugins/sql/guest-js/index.ts

@@ -111,7 +111,8 @@ export default class Database {
       {
         db: this.path,
         query,
-        values: bindValues ?? []
+        values: bindValues ?? [],
+        bindTypes: buildBindTypes(bindValues)
       }
     )
     return {
@@ -142,7 +143,8 @@ export default class Database {
     const result = await invoke<T>('plugin:sql|select', {
       db: this.path,
       query,
-      values: bindValues ?? []
+      values: bindValues ?? [],
+      bindTypes: buildBindTypes(bindValues)
     })
 
     return result
@@ -166,3 +168,14 @@ export default class Database {
     return success
   }
 }
+
+const buildBindTypes = (values?: unknown[]): Map<number, string> => {
+  const bindTypes: Map<number, string> = new Map()
+  if (!values) return bindTypes
+  for (const [index, v] of values.entries()) {
+    if (v instanceof Uint8Array || v instanceof ArrayBuffer) {
+      bindTypes.set(index, 'bytearray')
+    }
+  }
+  return bindTypes
+}

plugins/sql/src/commands.rs

@@ -5,6 +5,7 @@
 use indexmap::IndexMap;
 use serde_json::Value as JsonValue;
 use sqlx::migrate::Migrator;
+use std::collections::HashMap;
 use tauri::{command, AppHandle, Runtime, State};
 
 use crate::{DbInstances, DbPool, Error, LastInsertId, Migrations};
@@ -59,11 +60,12 @@ pub(crate) async fn execute(
     db: String,
     query: String,
     values: Vec<JsonValue>,
+    bind_types: HashMap<usize, String>,
 ) -> Result<(u64, LastInsertId), crate::Error> {
     let instances = db_instances.0.read().await;
 
     let db = instances.get(&db).ok_or(Error::DatabaseNotLoaded(db))?;
-    db.execute(query, values).await
+    db.execute(query, values, bind_types).await
 }
 
 #[command]
@@ -72,9 +74,10 @@ pub(crate) async fn select(
     db: String,
     query: String,
     values: Vec<JsonValue>,
+    bind_types: HashMap<usize, String>,
 ) -> Result<Vec<IndexMap<String, JsonValue>>, crate::Error> {
     let instances = db_instances.0.read().await;
 
     let db = instances.get(&db).ok_or(Error::DatabaseNotLoaded(db))?;
-    db.select(query, values).await
+    db.select(query, values, bind_types).await
 }

plugins/sql/src/wrapper.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+use std::collections::HashMap;
 #[cfg(feature = "sqlite")]
 use std::fs::create_dir_all;
 
@@ -147,13 +148,22 @@ impl DbPool {
         &self,
         _query: String,
         _values: Vec<JsonValue>,
+        _bind_types: HashMap<usize, String>,
     ) -> Result<(u64, LastInsertId), crate::Error> {
         Ok(match self {
             #[cfg(feature = "sqlite")]
             DbPool::Sqlite(pool) => {
                 let mut query = sqlx::query(&_query);
-                for value in _values {
-                    if value.is_null() {
+                for (i, value) in _values.iter().enumerate() {
+                    if _bind_types.get(&i) == Some(&"bytearray".to_string()) {
+                        let bytes = value
+                            .as_array()
+                            .unwrap()
+                            .iter()
+                            .map(|v| v.as_u64().unwrap() as u8)
+                            .collect::<Vec<u8>>();
+                        query = query.bind(bytes);
+                    } else if value.is_null() {
                         query = query.bind(None::<JsonValue>);
                     } else if value.is_string() {
                         query = query.bind(value.as_str().unwrap().to_owned())
@@ -215,13 +225,22 @@ impl DbPool {
         &self,
         _query: String,
         _values: Vec<JsonValue>,
+        _bind_types: HashMap<usize, String>,
     ) -> Result<Vec<IndexMap<String, JsonValue>>, crate::Error> {
         Ok(match self {
             #[cfg(feature = "sqlite")]
             DbPool::Sqlite(pool) => {
                 let mut query = sqlx::query(&_query);
-                for value in _values {
-                    if value.is_null() {
+                for (i, value) in _values.iter().enumerate() {
+                    if _bind_types.get(&i) == Some(&"bytearray".to_string()) {
+                        let bytes = value
+                            .as_array()
+                            .unwrap()
+                            .iter()
+                            .map(|v| v.as_u64().unwrap() as u8)
+                            .collect::<Vec<u8>>();
+                        query = query.bind(bytes);
+                    } else if value.is_null() {
                         query = query.bind(None::<JsonValue>);
                     } else if value.is_string() {
                         query = query.bind(value.as_str().unwrap().to_owned())