got rid of duplicate command and added constraints

dhchandw · Oct 1, 2024 · b52b4a3 · b52b4a3
1 parent 87601db
commit b52b4a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src-electron/db/zap-schema.sql b/src-electron/db/zap-schema.sql
@@ -156,10 +156,11 @@ CREATE TABLE IF NOT EXISTS "CLUSTER" (
   "INTRODUCED_IN_REF" integer,
   "REMOVED_IN_REF" integer,
   "API_MATURITY" text,
+  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, 0)),
   foreign key (INTRODUCED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (REMOVED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (PACKAGE_REF) references PACKAGE(PACKAGE_ID) ON DELETE CASCADE ON UPDATE CASCADE
-  UNIQUE(PACKAGE_REF, CODE, MANUFACTURER_CODE)
+  UNIQUE(PACKAGE_REF, CODE, MANUFACTURER_CODE_DERIVED)
 );
 /*
  COMMAND table contains commands contained inside a cluster.
@@ -182,13 +183,13 @@ CREATE TABLE IF NOT EXISTS "COMMAND" (
   "RESPONSE_NAME" integer,
   "RESPONSE_REF" integer,
   "IS_DEFAULT_RESPONSE_ENABLED" integer,
-  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, -1)),
+  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, 0)),
   foreign key (INTRODUCED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (REMOVED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (CLUSTER_REF) references CLUSTER(CLUSTER_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (PACKAGE_REF) references PACKAGE(PACKAGE_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (RESPONSE_REF) references COMMAND(COMMAND_ID) ON DELETE CASCADE ON UPDATE CASCADE
-  UNIQUE(CLUSTER_REF, PACKAGE_REF, CODE, MANUFACTURER_CODE, SOURCE)
+  UNIQUE(CLUSTER_REF, PACKAGE_REF, CODE, MANUFACTURER_CODE_DERIVED, SOURCE)
 );
 /*
  COMMAND_ARG table contains arguments for a command.
@@ -233,12 +234,12 @@ CREATE TABLE IF NOT EXISTS "EVENT" (
   "PRIORITY" text,
   "INTRODUCED_IN_REF" integer,
   "REMOVED_IN_REF" integer,
-  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, -1)),
+  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, 0)),
   foreign key (CLUSTER_REF) references CLUSTER(CLUSTER_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (PACKAGE_REF) references PACKAGE(PACKAGE_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (INTRODUCED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (REMOVED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE
-  UNIQUE(CLUSTER_REF, PACKAGE_REF, CODE, MANUFACTURER_CODE)
+  UNIQUE(CLUSTER_REF, PACKAGE_REF, CODE, MANUFACTURER_CODE_DERIVED)
 );
 /*
  EVENT_FIELD table contains events for a given cluster.
@@ -295,12 +296,12 @@ CREATE TABLE IF NOT EXISTS "ATTRIBUTE" (
   "API_MATURITY" text,
   "IS_CHANGE_COMITTED" integer,
   "PERSISTENCE" text,
-  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, -1)),
+  "MANUFACTURER_CODE_DERIVED" AS (COALESCE(MANUFACTURER_CODE, 0)),
   foreign key (INTRODUCED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (REMOVED_IN_REF) references SPEC(SPEC_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (CLUSTER_REF) references CLUSTER(CLUSTER_ID) ON DELETE CASCADE ON UPDATE CASCADE,
   foreign key (PACKAGE_REF) references PACKAGE(PACKAGE_ID) ON DELETE CASCADE ON UPDATE CASCADE
-  UNIQUE("CLUSTER_REF", "PACKAGE_REF", "CODE", "MANUFACTURER_CODE")
+  UNIQUE("CLUSTER_REF", "PACKAGE_REF", "CODE", "MANUFACTURER_CODE_DERIVED")
 );
 
 /*

diff --git a/zcl-builtin/silabs/demo.xml b/zcl-builtin/silabs/demo.xml
@@ -15,10 +15,10 @@
       <description>Send a hello command to the server</description>
       <arg name="numberOfTimes" type="INT8U"/>
     </command>
-    <command source="client" code="0x00" name="SayHelloFromClient" optional="false">
+    <!-- <command source="client" code="0x00" name="SayHelloFromClient" optional="false">
       <description>Send a hello command to the client</description>
       <arg name="numberOfTimes" type="INT8U"/>
-    </command>
+    </command> -->
     <event code="0x0001" name="HelloEvent" priority="info" side="server">
       <description>Example test event</description>
       <field id="1" name="arg1" type="INT8U"/>