Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable order-by in two queries. #520

Merged
merged 2 commits into from
Jun 4, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Enable order-by in two queries.
tecimovic committed May 20, 2022

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
commit ed42298b3b1dcd7fc733c528cc8c3726af99a16c
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "commonjs",
"name": "zap",
"version": "2022.5.18",
"version": "2022.5.20",
"description": "Configuration tool for the Zigbee Cluster Library",
"productName": "zap",
"cordovaId": "",
2 changes: 1 addition & 1 deletion src-electron/db/query-command.js
Original file line number Diff line number Diff line change
@@ -1516,7 +1516,7 @@ async function selectCommandDetailsFromAllEndpointTypesAndClusters(
}

// Ordering of the results:
// query = query + ' ORDER BY C.MANUFACTURER_CODE, C.CODE, C.NAME'
query = query + ' ORDER BY C.MANUFACTURER_CODE, C.CODE, C.NAME'

return dbApi.dbAll(db, query).then((rows) => rows.map(commandMapFunction))
}
2 changes: 1 addition & 1 deletion src-electron/db/query-endpoint-type.js
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ async function selectAllClustersDetailsFromEndpointTypes(db, endpointTypes) {
}
}

let doOrderBy = false
let doOrderBy = true
return dbApi
.dbAll(
db,