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

Add 'presentIf' field inside the db and expose it to the templates #65

Merged
merged 2 commits into from
Dec 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions src-electron/db/db-mapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ exports.map = {
argName: x.ARG_NAME,
argType: x.ARG_TYPE,
argIsArray: x.ARG_IS_ARRAY,
argPresentIf: x.ARG_PRESENT_IF,
}
},

Expand All @@ -125,6 +126,7 @@ exports.map = {
type: x.TYPE,
code: x.CODE,
isArray: x.IS_ARRAY,
presentIf: x.PRESENT_IF,
caption: `Command argument of type ${x.TYPE}`,
}
},
Expand Down
20 changes: 13 additions & 7 deletions src-electron/db/query-zcl.js
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,9 @@ SELECT
CL.NAME AS CLUSTER_NAME,
CA.NAME AS ARG_NAME,
CA.TYPE AS ARG_TYPE,
CA.IS_ARRAY AS ARG_IS_ARRAY
FROM
CA.IS_ARRAY AS ARG_IS_ARRAY,
CA.PRESENT_IF AS ARG_PRESENT_IF
FROM
COMMAND AS CMD
LEFT JOIN
CLUSTER AS CL
Expand Down Expand Up @@ -700,7 +701,8 @@ SELECT
COMMAND_ARG.COMMAND_REF,
COMMAND_ARG.NAME,
COMMAND_ARG.TYPE,
COMMAND_ARG.IS_ARRAY
COMMAND_ARG.IS_ARRAY,
COMMAND_ARG.PRESENT_IF
FROM COMMAND_ARG, COMMAND
WHERE
COMMAND_ARG.COMMAND_REF = COMMAND.COMMAND_ID
Expand Down Expand Up @@ -1015,14 +1017,15 @@ function insertGlobals(db, packageId, data) {
arg.name,
arg.type,
arg.isArray,
arg.presentIf,
arg.ordinal,
])
)
}
}
return dbApi.dbMultiInsert(
db,
'INSERT INTO COMMAND_ARG (COMMAND_REF, NAME, TYPE, IS_ARRAY, ORDINAL) VALUES (?,?,?,?, ?)',
'INSERT INTO COMMAND_ARG (COMMAND_REF, NAME, TYPE, IS_ARRAY, PRESENT_IF, ORDINAL) VALUES (?,?,?,?,?,?)',
argsToLoad
)
})
Expand Down Expand Up @@ -1141,14 +1144,15 @@ function insertClusterExtensions(db, packageId, data) {
arg.name,
arg.type,
arg.isArray,
arg.presentIf,
arg.ordinal,
])
)
}
}
return dbApi.dbMultiInsert(
db,
'INSERT INTO COMMAND_ARG (COMMAND_REF, NAME, TYPE, IS_ARRAY, ORDINAL) VALUES (?,?,?,?, ?)',
'INSERT INTO COMMAND_ARG (COMMAND_REF, NAME, TYPE, IS_ARRAY, PRESENT_IF, ORDINAL) VALUES (?,?,?,?,?,?)',
argsToLoad
)
})
Expand Down Expand Up @@ -1305,14 +1309,15 @@ function insertClusters(db, packageId, data) {
arg.name,
arg.type,
arg.isArray,
arg.presentIf,
arg.ordinal,
])
)
}
}
return dbApi.dbMultiInsert(
db,
'INSERT INTO COMMAND_ARG (COMMAND_REF, NAME, TYPE, IS_ARRAY, ORDINAL) VALUES (?,?,?,?, ?)',
'INSERT INTO COMMAND_ARG (COMMAND_REF, NAME, TYPE, IS_ARRAY, PRESENT_IF, ORDINAL) VALUES (?,?,?,?,?,?)',
argsToLoad
)
})
Expand Down Expand Up @@ -1899,7 +1904,8 @@ SELECT
COMMAND_REF,
NAME,
TYPE,
IS_ARRAY
IS_ARRAY,
PRESENT_IF
FROM COMMAND_ARG WHERE COMMAND_REF = ?
ORDER BY ORDINAL`,
[commandId]
Expand Down
3 changes: 2 additions & 1 deletion src-electron/db/zap-schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ CREATE TABLE IF NOT EXISTS "COMMAND_ARG" (
"NAME" text,
"TYPE" text,
"IS_ARRAY" integer,
"PRESENT_IF" text,
foreign key (COMMAND_REF) references COMMAND(COMMAND_ID)
);
/*
Expand Down Expand Up @@ -666,4 +667,4 @@ CREATE TABLE IF NOT EXISTS "FILE_LOCATION" (
"CATEGORY" text NOT NULL UNIQUE,
"FILE_PATH" path,
"ACCESS_TIME" integer
);
);
1 change: 1 addition & 0 deletions src-electron/zcl/zcl-loader-silabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ function prepareCluster(cluster, isExtension = false) {
name: arg.$.name,
type: arg.$.type,
isArray: arg.$.array == 'true' ? 1 : 0,
presentIf: arg.$.presentIf,
ordinal: index,
})
})
Expand Down