Merge branch 'master' into darksky/cleanup-ci-deployment

toeverything · Nov 9, 2023 · b44b9cc · b44b9cc
2 parents 77a6fbe + aad9e5b
commit b44b9cc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/libs/jwst-storage/src/storage/blobs/blob_storage.rs b/libs/jwst-storage/src/storage/blobs/blob_storage.rs
@@ -1,4 +1,5 @@
 use jwst_core::{Base64Engine, URL_SAFE_ENGINE};
+use sea_orm::FromQueryResult;
 use sha2::{Digest, Sha256};
 
 use super::*;
@@ -40,10 +41,16 @@ impl BlobDBStorage {
     }
 
     async fn keys(&self, workspace: &str) -> Result<Vec<String>, DbErr> {
+        #[derive(FromQueryResult)]
+        struct BlobHash {
+            hash: String,
+        }
+
         Blobs::find()
             .filter(BlobColumn::WorkspaceId.eq(workspace))
             .select_only()
             .column(BlobColumn::Hash)
+            .into_model::<BlobHash>()
             .all(&self.pool)
             .await
             .map(|r| r.into_iter().map(|f| f.hash).collect())