Skip to content

Commit f086caf

Browse files
committed
Adding db constraints for enum items, struct items and bitmap fields
- also fixing related bug
1 parent ff46f97 commit f086caf

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

src-electron/db/zap-schema.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ CREATE TABLE IF NOT EXISTS BITMAP (
626626
DROP TABLE IF EXISTS "BITMAP_FIELD";
627627
CREATE TABLE IF NOT EXISTS BITMAP_FIELD (
628628
BITMAP_FIELD_ID integer NOT NULL PRIMARY KEY autoincrement,
629-
BITMAP_REF integer,
629+
BITMAP_REF integer NOT NULL,
630630
FIELD_IDENTIFIER integer,
631631
NAME text(100),
632632
MASK integer,
@@ -649,7 +649,7 @@ CREATE TABLE IF NOT EXISTS "ENUM" (
649649
DROP TABLE IF EXISTS "ENUM_ITEM";
650650
CREATE TABLE IF NOT EXISTS "ENUM_ITEM" (
651651
"ENUM_ITEM_ID" integer NOT NULL PRIMARY KEY autoincrement,
652-
"ENUM_REF" integer,
652+
"ENUM_REF" integer NOT NULL,
653653
"NAME" text,
654654
"DESCRIPTION" text,
655655
"FIELD_IDENTIFIER" integer,
@@ -674,7 +674,7 @@ CREATE TABLE IF NOT EXISTS STRUCT (
674674
DROP TABLE IF EXISTS "STRUCT_ITEM";
675675
CREATE TABLE IF NOT EXISTS STRUCT_ITEM (
676676
STRUCT_ITEM_ID integer NOT NULL PRIMARY KEY autoincrement,
677-
STRUCT_REF integer,
677+
STRUCT_REF integer NOT NULL,
678678
FIELD_IDENTIFIER integer,
679679
NAME text(100),
680680
IS_ARRAY integer,

src-electron/zcl/zcl-loader-silabs.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,20 @@ async function collectDataFromPropertiesFile(metadataFile, data) {
254254
returnObject.featureFlags = zclProps.featureFlags
255255
}
256256

257+
// ZCLDataTypes
258+
if (zclProps.zclDataTypes) {
259+
returnObject.ZCLDataTypes = obj.ZCLDataTypes
260+
} else {
261+
returnObject.ZCLDataTypes = [
262+
'ARRAY',
263+
'BITMAP',
264+
'ENUM',
265+
'NUMBER',
266+
'STRING',
267+
'STRUCT'
268+
]
269+
}
270+
257271
returnObject.supportCustomZclDevice = zclProps.supportCustomZclDevice
258272
returnObject.version = zclProps.version
259273
returnObject.description = zclProps.description

0 commit comments

Comments
 (0)