Merge branch 'master' into region

script/sql/create/31.scada_element.sql

@@ -1,3 +1,5 @@
+create type scada_model_type as enum ('JUNCTION', 'RESERVOIR', 'TANK', 'PIPE', 'PUMP', 'VALVE');
+
 create type scada_element_status as enum ('OFF', 'ON');
 
 create table scada_element
@@ -7,5 +9,6 @@ create table scada_element
 , y numeric not null
 , device_id text references scada_device(id)
 , model_id varchar(32) -- add constraint in API
+, model_type scada_model_type
 , status scada_element_status not null default 'OFF'
 );

script/sql/drop/31.scada_element.sql

@@ -1,3 +1,5 @@
 drop table if exists scada_element;
 
 drop type if exists scada_element_status;
+
+drop type if exists scada_model_type;