fix(torii-grpc): member clause should never error out if no entities

dojoengine · Sep 12, 2024 · eca7f15 · eca7f15
1 parent bf4ea9b
commit eca7f15
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/crates/torii/grpc/src/server/mod.rs b/crates/torii/grpc/src/server/mod.rs
@@ -521,7 +521,14 @@ impl DojoWorld {
         "#,
             compute_selector_from_names(namespace, model)
         );
-        let (models_str,): (String,) = sqlx::query_as(&models_query).fetch_one(&self.pool).await?;
+
+        let models_result: Option<(String,)> = sqlx::query_as(&models_query).fetch_optional(&self.pool).await?;
+        // we return an empty array of entities if the table is empty
+        if models_result.is_none() {
+            return Ok((Vec::new(), 0));
+        }
+
+        let (models_str,) = models_result.unwrap();
 
         let model_ids = models_str
             .split(',')