Skip to content

Commit

Permalink
Extending the all_user_cluster_generated_commands with more informati…
Browse files Browse the repository at this point in the history
…on on command arguments (#985)

Github: ZAP#971
  • Loading branch information
brdandu authored Mar 30, 2023
1 parent 63c0ecf commit 3ef5077
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion src-electron/db/query-command.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ async function selectAllAvailableClusterCommandDetailsFromEndpointTypes(
incoming: x.INCOMING,
outgoing: x.OUTGOING,
mfgCommandCount: x.MANUFACTURING_SPECIFIC_COMMAND_COUNT,
hasSpecificResponse: dbApi.toDbBool(x.RESPONSE_REF),
responseName: x.RESPONSE_NAME,
commandArgCount: x.COMMAND_ARGUMENT_COUNT,
requiredCommandArgCount: x.REQUIRED_COMMAND_ARGUMENT_COUNT,
hasArguments: x.COMMAND_ARGUMENT_COUNT > 0,
mustUseTimedInvoke: dbApi.fromDbBool(x.MUST_USE_TIMED_INVOKE),
}
}

Expand All @@ -162,7 +168,12 @@ SELECT
COMMAND.CODE AS COMMAND_CODE,
ENDPOINT_TYPE_COMMAND.INCOMING AS INCOMING,
ENDPOINT_TYPE_COMMAND.OUTGOING AS OUTGOING,
COUNT(COMMAND.MANUFACTURER_CODE) OVER () AS MANUFACTURING_SPECIFIC_COMMAND_COUNT
COUNT(COMMAND.MANUFACTURER_CODE) OVER () AS MANUFACTURING_SPECIFIC_COMMAND_COUNT,
COMMAND.RESPONSE_REF,
COMMAND.RESPONSE_NAME,
COMMAND.MUST_USE_TIMED_INVOKE,
COUNT(COMMAND_ARG.COMMAND_REF) AS COMMAND_ARGUMENT_COUNT,
COUNT(COMMAND_ARG.COMMAND_REF) FILTER (WHERE COMMAND_ARG.IS_OPTIONAL = 0) AS REQUIRED_COMMAND_ARGUMENT_COUNT
FROM
COMMAND
INNER JOIN
Expand All @@ -177,6 +188,10 @@ INNER JOIN
ENDPOINT_TYPE_CLUSTER
ON
ENDPOINT_TYPE_CLUSTER.CLUSTER_REF = CLUSTER.CLUSTER_ID
LEFT JOIN
COMMAND_ARG
ON
COMMAND.COMMAND_ID = COMMAND_ARG.COMMAND_REF
WHERE
ENDPOINT_TYPE_COMMAND.ENDPOINT_TYPE_REF IN (${endpointTypeIds})
AND ENDPOINT_TYPE_COMMAND.ENDPOINT_TYPE_REF = ENDPOINT_TYPE_CLUSTER.ENDPOINT_TYPE_REF
Expand Down

0 comments on commit 3ef5077

Please sign in to comment.