Add path to package error message (#443)

Add path to module error message Signed-off-by: Daniel Henneberger <git@danielhenneberger.com> Signed-off-by: henneberger <git@danielhenneberger.com>
DataSQRL · Dec 12, 2023 · aa50c8f · aa50c8f
1 parent 7b7b8b8
commit aa50c8f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/sqrl-planner/sqrl-common/src/main/java/com/datasqrl/plan/validate/ScriptValidator.java b/sqrl-planner/sqrl-common/src/main/java/com/datasqrl/plan/validate/ScriptValidator.java
@@ -126,7 +126,8 @@ public Void visit(SqrlImportDefinition node, Void context) {
     Optional<SqrlModule> moduleOpt = moduleLoader.getModule(path.popLast());
 
     if (moduleOpt.isEmpty()) {
-      addError(ErrorCode.GENERIC, node, "Could not find module [%s]", path);
+      addError(ErrorCode.GENERIC, node, "Could not find module [%s] at path: [%s]", path,
+          String.join("/",path.toStringList()));
       return null; //end processing
     }
 

diff --git a/...r/sqrl-planner-local/src/test/java/com/datasqrl/plan/local/analyze/QuerySnapshotTest.java b/...r/sqrl-planner-local/src/test/java/com/datasqrl/plan/local/analyze/QuerySnapshotTest.java
@@ -338,6 +338,11 @@ public void customerDistinctTest() {
   }
 
   @Test
+  public void missingModuleTestTest() {
+    ScriptBuilder builder = ScriptBuilder.of("IMPORT point.at.location");
+    validateScriptInvalid(builder.getScript());
+  }
+
   public void invalidCustomerDistinctNoOrderTest() {
     ScriptBuilder builder = example.getImports();
     builder.add("Customer := DISTINCT Customer ON customerid");

diff --git a/...planner/sqrl-planner-local/src/test/java/com/datasqrl/plan/local/analyze/ResolveTest.java b/...planner/sqrl-planner-local/src/test/java/com/datasqrl/plan/local/analyze/ResolveTest.java
@@ -110,7 +110,8 @@ public void tableImportTest() {
   @Test
   public void timestampColumnDefinition() {
     String script = ScriptBuilder.of("IMPORT time.*",
-            "IMPORT ecommerce-data.Customer TIMESTAMP epochToTimestamp(lastUpdated) AS timestamp");
+            "IMPORT ecommerce-data.Customer TIMESTAMP epochToTimestamp(lastUpdated) AS timestamp")
+        .toString();
     plan(script);
     validateQueryTable("customer", TableType.STREAM, ExecutionEngine.Type.STREAM, 7, 1,
         TimestampTest.fixed(6));
@@ -120,7 +121,8 @@ public void timestampColumnDefinition() {
   public void timestampColumnDefinitionWithPropagation() {
     String script = ScriptBuilder.of("IMPORT time.*",
             "IMPORT ecommerce-data.Customer TIMESTAMP epochToTimestamp(lastUpdated) AS timestamp",
-        "CustomerCopy := SELECT timestamp, endOfMonth(endOfMonth(timestamp)) as month FROM Customer");
+        "CustomerCopy := SELECT timestamp, endOfMonth(endOfMonth(timestamp)) as month FROM Customer")
+        .toString();
     plan(script);
     validateQueryTable("customer", TableType.STREAM, ExecutionEngine.Type.STREAM, 7, 1,
         TimestampTest.fixed(6));
@@ -148,7 +150,8 @@ public void addingSimpleColumns() {
     String script = ScriptBuilder.of("IMPORT ecommerce-data.Orders",
         "Orders.col1 := (id + customerid)/2",
         "Orders.entries.discount2 := coalesce(discount,0.0)",
-        "OrderEntry := SELECT o.col1, o.time, e.productid, e.discount2, o._ingest_time FROM Orders o JOIN o.entries e");
+        "OrderEntry := SELECT o.col1, o.time, e.productid, e.discount2, o._ingest_time FROM Orders o JOIN o.entries e")
+        .toString();
     plan(script);
     validateQueryTable("orders", TableType.STREAM, ExecutionEngine.Type.STREAM, 7, 1,
         TimestampTest.candidates(1,4));
@@ -169,7 +172,8 @@ public void selfJoinSubqueryTest() {
   @Test
   public void tableDefinitionTest() {
     String sqrl = ScriptBuilder.of("IMPORT ecommerce-data.Orders",
-        "EntryCount := SELECT e.quantity * e.unit_price - e.discount as price FROM Orders.entries e;");
+        "EntryCount := SELECT e.quantity * e.unit_price - e.discount as price FROM Orders.entries e;")
+        .toString();
     plan(sqrl);
     validateQueryTable("entrycount", TableType.STREAM, ExecutionEngine.Type.STREAM, 4, 2,
         TimestampTest.fixed(3)); //4 cols = 1 select col + 2 pk cols + 1 timestamp cols
@@ -187,7 +191,8 @@ public void nestedAggregationAndSelfJoinTest() {
         "Customer := DISTINCT Customer ON customerid ORDER BY _ingest_time DESC",
         "Orders.total := SELECT SUM(e.quantity * e.unit_price - e.discount) as price, COUNT(e.quantity) as num, SUM(e.discount) as discount FROM @.entries e",
         "OrdersInline := SELECT o.id, o.customerid, o.time, t.price, t.num FROM Orders o JOIN o.total t",
-        "Customer.orders_by_day := SELECT endOfDay(o.time) as day, SUM(o.price) as total_price, SUM(o.num) as total_num FROM @ JOIN OrdersInline o ON o.customerid = @.customerid GROUP BY day");
+        "Customer.orders_by_day := SELECT endOfDay(o.time) as day, SUM(o.price) as total_price, SUM(o.num) as total_num FROM @ JOIN OrdersInline o ON o.customerid = @.customerid GROUP BY day")
+        .toString();
     plan(sqrl);
     validateQueryTable("total", TableType.STREAM, ExecutionEngine.Type.STREAM, 5, 1,
         TimestampTest.fixed(4));

diff --git a/sqrl-planner/sqrl-planner-local/src/test/java/com/datasqrl/util/ScriptBuilder.java b/sqrl-planner/sqrl-planner-local/src/test/java/com/datasqrl/util/ScriptBuilder.java
@@ -35,12 +35,11 @@ public String toString() {
     return s.toString();
   }
 
-  public static String of(String... statements) {
+  public static ScriptBuilder of(String... statements) {
     ScriptBuilder s = new ScriptBuilder();
     for (String statement : statements) {
       s.add(statement);
     }
-    return s.toString();
+    return s;
   }
-
 }
diff --git a/...ces/snapshots/com/datasqrl/plan/local/analyze/QuerySnapshotTest/missingModuleTestTest.txt b/...ces/snapshots/com/datasqrl/plan/local/analyze/QuerySnapshotTest/missingModuleTestTest.txt
@@ -0,0 +1,6 @@
+>>>errors
+[FATAL] Could not find module [point.at.location] at path: [point/at/location]
+in script:<script> [1:1]:
+IMPORT point.at.location;
+^
+