Refine type

script/sql/create/18.sources.sql

@@ -5,7 +5,7 @@ create type sources_type as enum ('CONCEN', 'MASS', 'FLOWPACED', 'SETPOINT');
 create table sources
 (
   node varchar(32) primary key references _node(id)
-, type sources_type not null
+, s_type sources_type not null
 , strength float8 not null
 , pattern varchar(32) references _pattern(id)
 );

script/sql/create/29.scada_device.sql

@@ -5,5 +5,5 @@ create table scada_device
   id text primary key
 , name text
 , address text
-, type scada_device_type
+, sd_type scada_device_type
 );

script/sql/create/7.valves.sql

@@ -8,7 +8,7 @@ create table valves
 , node1 varchar(32) references _node(id) not null
 , node2 varchar(32) references _node(id) not null
 , diameter float8 not null
-, type valves_type not null
+, v_type valves_type not null
 , setting text not null
 , minor_loss float8 not null
 );