queryer merger test progress

src/queryer/mod.rs

@@ -18,13 +18,12 @@ impl Queryer {
     }
   }
 
-  /// Entrypoint to execute a dynamically compiled query based on a schema
   pub fn query(
     &self,
     schema_id: &str,
     stem_opt: Option<&str>,
     filters: Option<&serde_json::Value>,
-  ) -> Result<serde_json::Value, String> {
+  ) -> crate::drop::Drop {
     let filters_map: Option<&serde_json::Map<String, serde_json::Value>> =
       filters.and_then(|f| f.as_object());
 
@@ -45,9 +44,21 @@ impl Queryer {
     } else {
       // Compile the massive base SQL string
       let compiler = compiler::SqlCompiler::new(self.db.clone());
-      let compiled_sql = compiler.compile(schema_id, stem_opt, &filter_keys)?;
-      self.cache.insert(cache_key.clone(), compiled_sql.clone());
-      compiled_sql
+      match compiler.compile(schema_id, stem_opt, &filter_keys) {
+        Ok(compiled_sql) => {
+          self.cache.insert(cache_key.clone(), compiled_sql.clone());
+          compiled_sql
+        }
+        Err(e) => {
+          return crate::drop::Drop::with_errors(vec![crate::drop::Error {
+            code: "QUERY_COMPILATION_FAILED".to_string(),
+            message: e,
+            details: crate::drop::ErrorDetails {
+              path: schema_id.to_string(),
+            },
+          }]);
+        }
+      }
     };
 
     // 2. Prepare the execution arguments from the filters
@@ -62,22 +73,29 @@ impl Queryer {
     }
 
     // 3. Execute via Database Executor
-    let fetched = match self.db.query(&sql, Some(&args)) {
+    match self.db.query(&sql, Some(&args)) {
       Ok(serde_json::Value::Array(table)) => {
         if table.is_empty() {
-          Ok(serde_json::Value::Null)
+          crate::drop::Drop::success_with_val(serde_json::Value::Null)
         } else {
           // We expect the query to return a single JSONB column, already unpacked from row[0]
-          Ok(table.first().unwrap().clone())
+          crate::drop::Drop::success_with_val(table.first().unwrap().clone())
         }
       }
-      Ok(other) => Err(format!(
-        "Expected array from generic query, got: {:?}",
-        other
-      )),
-      Err(e) => Err(format!("SPI error in queryer: {}", e)),
-    }?;
-
-    Ok(fetched)
+      Ok(other) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
+        code: "QUERY_FAILED".to_string(),
+        message: format!("Expected array from generic query, got: {:?}", other),
+        details: crate::drop::ErrorDetails {
+          path: schema_id.to_string(),
+        },
+      }]),
+      Err(e) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
+        code: "QUERY_FAILED".to_string(),
+        message: format!("SPI error in queryer: {}", e),
+        details: crate::drop::ErrorDetails {
+          path: schema_id.to_string(),
+        },
+      }]),
+    }
   }
 }