@lix-js/sdk 0.6.0-preview.2 → 0.6.0-preview.4

package/dist-engine-src/src/sql2/error.rs

@@ -16,7 +16,10 @@ pub(crate) fn lix_error_to_datafusion_error(error: LixError) -> DataFusionError
 
 fn lix_error_from_datafusion_error(error: &DataFusionError) -> Option<LixError> {
     match error {
-        DataFusionError::External(error) => error.downcast_ref::<LixError>().cloned(),
+        DataFusionError::External(error) => error
+            .downcast_ref::<LixError>()
+            .cloned()
+            .map(normalize_external_sql_error),
         DataFusionError::Context(_, error) | DataFusionError::Diagnostic(_, error) => {
             lix_error_from_datafusion_error(error)
         }
@@ -28,6 +31,23 @@ fn lix_error_from_datafusion_error(error: &DataFusionError) -> Option<LixError>
     }
 }
 
+fn normalize_external_sql_error(error: LixError) -> LixError {
+    let lower = error.message.to_ascii_lowercase();
+    if (error.code.starts_with("LIX_ERROR_PATH_")
+        && error.code != "LIX_ERROR_PATH_INVALID_SEGMENT_CODE_POINT")
+        || error.code == LixError::CODE_INVALID_JSON_PATH
+        || (error.code == LixError::CODE_TYPE_MISMATCH
+            && lower.contains("cannot store blob values directly"))
+        || (error.code == LixError::CODE_SCHEMA_DEFINITION && lower.contains("system schema"))
+    {
+        return LixError {
+            code: LixError::CODE_INVALID_PARAM.to_string(),
+            ..error
+        };
+    }
+    error
+}
+
 fn classify_datafusion_error(error: &DataFusionError) -> LixError {
     let message = format!("sql2 DataFusion error: {error}");
     let lower = message.to_ascii_lowercase();
@@ -39,7 +59,7 @@ fn classify_datafusion_error(error: &DataFusionError) -> LixError {
 
     if looks_like_unsupported_dialect(&lower) {
         return LixError::new(LixError::CODE_DIALECT_UNSUPPORTED, message)
-            .with_hint("Lix SQL uses DataFusion syntax. Use lix_json_get(...) or lix_json_get_text(...) for JSON access, and numbered placeholders like $1, $2, ...");
+            .with_hint("Lix SQL uses DataFusion syntax. Use lix_json_get(...) or lix_json_get_text(...) for JSON access, and placeholders like ?, ? or $1, $2, ...");
     }
 
     if looks_like_unsupported_runtime_plan(&lower) {
@@ -56,9 +76,8 @@ fn classify_datafusion_error(error: &DataFusionError) -> LixError {
         || lower.contains("placeholder")
         || lower.contains("bind")
     {
-        return LixError::new(LixError::CODE_PARSE_ERROR, message).with_hint(
-            "Use numbered placeholders like $1, $2, ...; '?' placeholders are not supported.",
-        );
+        return LixError::new(LixError::CODE_PARSE_ERROR, message)
+            .with_hint("Use placeholders like ?, ? or numbered placeholders like $1, $2, ...");
     }
 
     if lower.contains("requires start_commit_id")