fix(neo4j): preserve cypher labels during query execution

This commit is contained in:
Hand Sonic authored and GitHub committed 2026-09-29 11:29:53 +08:00
1 parent 62bf47a0e9
commit 77c542248d
9 files changed
+84 -11

No files matched your search

+14 -1
View File
@@ -6,6 +6,7 @@ import (
"errors"
"net/url"
"reflect"
"strings"
"testing"
neo4j "github.com/neo4j/neo4j-go-driver/v6/neo4j"
@@ -230,9 +231,21 @@ func TestClassifyNeo4jErrors(t *testing.T) {
syntax := classifyRPCError("execute_query", "session-1", &neo4jdb.Neo4jError{
Code: "Neo.ClientError.Statement.SyntaxError", Msg: "invalid input",
})
if syntax.Data.Category != "sql" || syntax.Data.SQLState == "" {
if syntax.Data.Category != "sql" || syntax.Data.SQLState != "" || syntax.Data.AgentSessionID != "session-1" {
t.Fatalf("unexpected syntax classification: %#v", syntax)
}
if syntax.Data.ContractVersion != 1 || syntax.Data.Stage != "execute" || syntax.Data.OperationOutcome != "unknown" {
t.Fatalf("invalid structured error contract: %#v", syntax.Data)
}
if syntax.Message == "" || !strings.Contains(syntax.Message, "Neo.ClientError.Statement.SyntaxError") {
t.Fatalf("Neo4j error code was lost: %q", syntax.Message)
}
resource := classifyRPCError("execute_query", "session-1", &neo4jdb.Neo4jError{
Code: "Neo.TransientError.General.DatabaseUnavailable", Msg: "database unavailable",
})
if resource.Data.Category != "resource" || resource.Data.SessionDisposition != "replace_runtime" {
t.Fatalf("invalid resource error contract: %#v", resource.Data)
}
canceled := classifyRPCError("execute_query", "session-1", context.Canceled)
if canceled.Data.Category != "canceled" || canceled.Data.SessionDisposition != "quarantine" {
t.Fatalf("unexpected cancellation classification: %#v", canceled)
+4 -1
View File
@@ -50,7 +50,7 @@ func classifyRPCError(method, agentSessionID string, err error) *rpcError {
var databaseError *neo4jdb.Neo4jError
if errors.As(err, &databaseError) {
data.SQLState = safeRPCDiagnostic(databaseError.Code, 160)
// Neo4j error codes are not SQLSTATE values; the code remains in err.Error().
data.Retryable = neo4j.IsRetryable(err)
code := strings.ToLower(databaseError.Code)
switch {
@@ -60,6 +60,9 @@ func classifyRPCError(method, agentSessionID string, err error) *rpcError {
case strings.Contains(code, ".transienterror."), strings.Contains(code, "databaseunavailable"):
data.Category = "resource"
data.Retryable = true
if data.OperationOutcome == "unknown" {
data.SessionDisposition = "replace_runtime"
}
case strings.Contains(code, ".statement."), strings.Contains(code, ".schema."), strings.Contains(code, ".procedure."):
data.Category = "sql"
default: