Merge pull request #9879 from ellemouton/graphSQLFixNodesQuery

sqldb+graph/db: fix UpsertNode query to account for nullable `last_update` field

graph/db/graph_test.go

@@ -3359,6 +3359,9 @@ func TestAddChannelEdgeShellNodes(t *testing.T) {
 	// error.
 	err = graph.AddChannelEdge(&edgeInfo)
 	require.ErrorIs(t, err, ErrEdgeAlreadyExist)
+
+	// Show that updating the shell node to a full node record works.
+	require.NoError(t, graph.AddLightningNode(node2))
 }
 
 // TestNodePruningUpdateIndexDeletion tests that once a node has been removed

sqldb/sqlc/graph.sql.go

@@ -542,7 +542,8 @@ ON CONFLICT (pub_key, version)
         last_update = EXCLUDED.last_update,
         color = EXCLUDED.color,
         signature = EXCLUDED.signature
-WHERE EXCLUDED.last_update > nodes.last_update
+WHERE nodes.last_update IS NULL
+    OR EXCLUDED.last_update > nodes.last_update
 RETURNING id
 `
 

sqldb/sqlc/queries/graph.sql

@@ -17,7 +17,8 @@ ON CONFLICT (pub_key, version)
         last_update = EXCLUDED.last_update,
         color = EXCLUDED.color,
         signature = EXCLUDED.signature
-WHERE EXCLUDED.last_update > nodes.last_update
+WHERE nodes.last_update IS NULL
+    OR EXCLUDED.last_update > nodes.last_update
 RETURNING id;
 
 -- name: GetNodeByPubKey :one