rubydex 0.3.0 → 0.4.1

data/rust/rubydex/src/query/cypher/tests.rs

@@ -1,5 +1,5 @@
-use super::run_query;
 use super::schema::RelType;
+use super::{render, run_query};
 use crate::model::graph::Graph;
 use crate::test_utils::GraphTest;
 use cypher_parser::{CypherValue, OutputFormat, ResultSet, execute, parse};
@@ -197,6 +197,31 @@ fn run_query_json_output() {
     assert_eq!(output, "[{\"c.name\":\"Dog\"}]");
 }
 
+#[test]
+fn render_formats_one_result_set_in_both_formats() {
+    // `execute` runs the query once; `render` formats that same result set as often as needed.
+    let graph = fixture_graph();
+    let result = run(&graph, "MATCH (c:Class {name: 'Dog'}) RETURN c.name");
+
+    assert_eq!(render(&result, OutputFormat::Json), "[{\"c.name\":\"Dog\"}]");
+
+    let table = render(&result, OutputFormat::Table);
+    assert!(table.contains("c.name"));
+    assert!(table.contains("Dog"));
+    assert!(table.contains("1 row"));
+}
+
+#[test]
+fn incoming_declares_and_defines_reach_the_document() {
+    // Exercises `expand_in`: walk the Document -> Definition -> Declaration spine backwards.
+    let graph = fixture_graph();
+    let result = run(
+        &graph,
+        "MATCH (decl:Class {name: 'Dog'})<-[:DECLARES]-(def:Definition)<-[:DEFINES]-(d:Document) RETURN DISTINCT d.name",
+    );
+    assert_eq!(column_strings(&result, 0), vec!["zoo.rb".to_string()]);
+}
+
 #[test]
 fn unknown_relationship_type_errors() {
     let graph = fixture_graph();

data/rust/rubydex/src/query/cypher.rs

@@ -18,8 +18,9 @@
 // `Graph` (in `schema`) and the static schema description (in `schema_info`).
 //
 // `Query` is the opaque parsed-query object: callers can `parse` a query string once (failing fast
-// on syntax errors), then `run_parsed` it against a graph that was built afterwards.
-pub use cypher_parser::{CypherError, OutputFormat, Query, parse};
+// on syntax errors), `execute` it against a graph that was built afterwards, and `render` the
+// resulting [`ResultSet`] without running the query again.
+pub use cypher_parser::{CypherError, CypherValue, OutputFormat, Query, ResultSet, execute, parse};
 
 pub mod schema;
 pub mod schema_info;
@@ -35,15 +36,11 @@ pub fn run_query(graph: &Graph, query: &str, output_format: OutputFormat) -> Res
     cypher_parser::run_query(graph, query, output_format)
 }
 
-/// Executes an already-parsed [`Query`] against the graph and formats the result. Pair with
-/// [`parse`] to validate a query before building the graph.
-///
-/// # Errors
-///
-/// Returns a [`CypherError`] if the query cannot be executed.
-pub fn run_parsed(graph: &Graph, query: &Query, output_format: OutputFormat) -> Result<String, CypherError> {
-    let result = cypher_parser::execute(graph, query)?;
-    Ok(cypher_parser::format::format(&result, output_format))
+/// Renders an already-executed [`ResultSet`] in the requested format. Pair with [`execute`] to run a
+/// parsed query once and render its result set as often as needed.
+#[must_use]
+pub fn render(result: &ResultSet, output_format: OutputFormat) -> String {
+    cypher_parser::format::format(result, output_format)
 }
 
 /// Returns a description of the queryable schema (node labels, relationship types, and properties)