简柏林 / thingskit · Commits

Commit 5e5790a9d22052a9bf5c2891a044f8b0dcd68896

Authored by Andrew Shvayka
1 parent 067545b0

DAO layer fixes

Inline Side-by-side
Showing 1 changed file with 122 additions and 122 deletions
@@ -16,44 +16,44 @@ @@ -16,44 +16,44 @@
16 16
17 17
18 CREATE TABLE IF NOT EXISTS admin_settings ( 18 CREATE TABLE IF NOT EXISTS admin_settings (
19 - id character varying(31) NOT NULL CONSTRAINT admin_settings_pkey PRIMARY KEY, 19 + id varchar(31) NOT NULL CONSTRAINT admin_settings_pkey PRIMARY KEY,
20 json_value varchar, 20 json_value varchar,
21 - key character varying(255) 21 + key varchar(255)
22 ); 22 );
23 23
24 CREATE TABLE IF NOT EXISTS alarm ( 24 CREATE TABLE IF NOT EXISTS alarm (
25 - id character varying(31) NOT NULL CONSTRAINT alarm_pkey PRIMARY KEY, 25 + id varchar(31) NOT NULL CONSTRAINT alarm_pkey PRIMARY KEY,
26 ack_ts bigint, 26 ack_ts bigint,
27 clear_ts bigint, 27 clear_ts bigint,
28 additional_info varchar, 28 additional_info varchar,
29 end_ts bigint, 29 end_ts bigint,
30 - originator_id character varying(31), 30 + originator_id varchar(31),
31 originator_type integer, 31 originator_type integer,
32 propagate boolean, 32 propagate boolean,
33 - severity character varying(255), 33 + severity varchar(255),
34 start_ts bigint, 34 start_ts bigint,
35 - status character varying(255),  
36 - tenant_id character varying(31),  
37 - type character varying(255) 35 + status varchar(255),
  36 + tenant_id varchar(31),
  37 + type varchar(255)
38 ); 38 );
39 39
40 CREATE TABLE IF NOT EXISTS asset ( 40 CREATE TABLE IF NOT EXISTS asset (
41 - id character varying(31) NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, 41 + id varchar(31) NOT NULL CONSTRAINT asset_pkey PRIMARY KEY,
42 additional_info varchar, 42 additional_info varchar,
43 - customer_id character varying(31),  
44 - name character varying(255),  
45 - search_text character varying(255),  
46 - tenant_id character varying(31),  
47 - type character varying(255) 43 + customer_id varchar(31),
  44 + name varchar(255),
  45 + search_text varchar(255),
  46 + tenant_id varchar(31),
  47 + type varchar(255)
48 ); 48 );
49 49
50 CREATE TABLE IF NOT EXISTS attribute_kv ( 50 CREATE TABLE IF NOT EXISTS attribute_kv (
51 - entity_type character varying(255),  
52 - entity_id character varying(31),  
53 - attribute_type character varying(255),  
54 - attribute_key character varying(255), 51 + entity_type varchar(255),
  52 + entity_id varchar(31),
  53 + attribute_type varchar(255),
  54 + attribute_key varchar(255),
55 bool_v boolean, 55 bool_v boolean,
56 - str_v character varying(255), 56 + str_v varchar,
57 long_v bigint, 57 long_v bigint,
58 dbl_v double precision, 58 dbl_v double precision,
59 last_update_ts bigint, 59 last_update_ts bigint,
@@ -61,182 +61,182 @@ CREATE TABLE IF NOT EXISTS attribute_kv ( @@ -61,182 +61,182 @@ CREATE TABLE IF NOT EXISTS attribute_kv (
61 ); 61 );
62 62
63 CREATE TABLE IF NOT EXISTS component_descriptor ( 63 CREATE TABLE IF NOT EXISTS component_descriptor (
64 - id character varying(31) NOT NULL CONSTRAINT component_descriptor_pkey PRIMARY KEY,  
65 - actions character varying(255),  
66 - clazz character varying(255), 64 + id varchar(31) NOT NULL CONSTRAINT component_descriptor_pkey PRIMARY KEY,
  65 + actions varchar(255),
  66 + clazz varchar,
67 configuration_descriptor varchar, 67 configuration_descriptor varchar,
68 - name character varying(255),  
69 - scope character varying(255),  
70 - search_text character varying(255),  
71 - type character varying(255) 68 + name varchar(255),
  69 + scope varchar(255),
  70 + search_text varchar(255),
  71 + type varchar(255)
72 ); 72 );
73 73
74 CREATE TABLE IF NOT EXISTS customer ( 74 CREATE TABLE IF NOT EXISTS customer (
75 - id character varying(31) NOT NULL CONSTRAINT customer_pkey PRIMARY KEY, 75 + id varchar(31) NOT NULL CONSTRAINT customer_pkey PRIMARY KEY,
76 additional_info varchar, 76 additional_info varchar,
77 - address character varying(255),  
78 - address2 character varying(255),  
79 - city character varying(255),  
80 - country character varying(255),  
81 - email character varying(255),  
82 - phone character varying(255),  
83 - search_text character varying(255),  
84 - state character varying(255),  
85 - tenant_id character varying(31),  
86 - title character varying(255),  
87 - zip character varying(255) 77 + address varchar,
  78 + address2 varchar,
  79 + city varchar(255),
  80 + country varchar(255),
  81 + email varchar(255),
  82 + phone varchar(255),
  83 + search_text varchar(255),
  84 + state varchar(255),
  85 + tenant_id varchar(31),
  86 + title varchar(255),
  87 + zip varchar(255)
88 ); 88 );
89 89
90 CREATE TABLE IF NOT EXISTS dashboard ( 90 CREATE TABLE IF NOT EXISTS dashboard (
91 - id character varying(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, 91 + id varchar(31) NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY,
92 configuration varchar, 92 configuration varchar,
93 - customer_id character varying(31),  
94 - search_text character varying(255),  
95 - tenant_id character varying(31),  
96 - title character varying(255) 93 + customer_id varchar(31),
  94 + search_text varchar(255),
  95 + tenant_id varchar(31),
  96 + title varchar(255)
97 ); 97 );
98 98
99 CREATE TABLE IF NOT EXISTS device ( 99 CREATE TABLE IF NOT EXISTS device (
100 - id character varying(31) NOT NULL CONSTRAINT device_pkey PRIMARY KEY, 100 + id varchar(31) NOT NULL CONSTRAINT device_pkey PRIMARY KEY,
101 additional_info varchar, 101 additional_info varchar,
102 - customer_id character varying(31),  
103 - type character varying(255),  
104 - name character varying(255),  
105 - search_text character varying(255),  
106 - tenant_id character varying(31) 102 + customer_id varchar(31),
  103 + type varchar(255),
  104 + name varchar(255),
  105 + search_text varchar(255),
  106 + tenant_id varchar(31)
107 ); 107 );
108 108
109 CREATE TABLE IF NOT EXISTS device_credentials ( 109 CREATE TABLE IF NOT EXISTS device_credentials (
110 - id character varying(31) NOT NULL CONSTRAINT device_credentials_pkey PRIMARY KEY,  
111 - credentials_id character varying(255),  
112 - credentials_type character varying(255),  
113 - credentials_value character varying(255),  
114 - device_id character varying(31) 110 + id varchar(31) NOT NULL CONSTRAINT device_credentials_pkey PRIMARY KEY,
  111 + credentials_id varchar,
  112 + credentials_type varchar(255),
  113 + credentials_value varchar),
  114 + device_id varchar(31)
115 ); 115 );
116 116
117 CREATE TABLE IF NOT EXISTS event ( 117 CREATE TABLE IF NOT EXISTS event (
118 - id character varying(31) NOT NULL CONSTRAINT event_pkey PRIMARY KEY, 118 + id varchar(31) NOT NULL CONSTRAINT event_pkey PRIMARY KEY,
119 body varchar, 119 body varchar,
120 - entity_id character varying(31),  
121 - entity_type character varying(255),  
122 - event_type character varying(255),  
123 - event_uid character varying(255),  
124 - tenant_id character varying(31), 120 + entity_id varchar(31),
  121 + entity_type varchar(255),
  122 + event_type varchar(255),
  123 + event_uid varchar(255),
  124 + tenant_id varchar(31),
125 CONSTRAINT event_unq_key UNIQUE (tenant_id, entity_type, entity_id, event_type, event_uid) 125 CONSTRAINT event_unq_key UNIQUE (tenant_id, entity_type, entity_id, event_type, event_uid)
126 ); 126 );
127 127
128 CREATE TABLE IF NOT EXISTS plugin ( 128 CREATE TABLE IF NOT EXISTS plugin (
129 - id character varying(31) NOT NULL CONSTRAINT plugin_pkey PRIMARY KEY, 129 + id varchar(31) NOT NULL CONSTRAINT plugin_pkey PRIMARY KEY,
130 additional_info varchar, 130 additional_info varchar,
131 - api_token character varying(255),  
132 - plugin_class character varying(255), 131 + api_token varchar(255),
  132 + plugin_class varchar(255),
133 configuration varchar, 133 configuration varchar,
134 - name character varying(255), 134 + name varchar(255),
135 public_access boolean, 135 public_access boolean,
136 - search_text character varying(255),  
137 - state character varying(255),  
138 - tenant_id character varying(31) 136 + search_text varchar(255),
  137 + state varchar(255),
  138 + tenant_id varchar(31)
139 ); 139 );
140 140
141 CREATE TABLE IF NOT EXISTS relation ( 141 CREATE TABLE IF NOT EXISTS relation (
142 - from_id character varying(31),  
143 - from_type character varying(255),  
144 - to_id character varying(31),  
145 - to_type character varying(255),  
146 - relation_type_group character varying(255),  
147 - relation_type character varying(255), 142 + from_id varchar(31),
  143 + from_type varchar(255),
  144 + to_id varchar(31),
  145 + to_type varchar(255),
  146 + relation_type_group varchar(255),
  147 + relation_type varchar(255),
148 additional_info varchar, 148 additional_info varchar,
149 CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type) 149 CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type)
150 ); 150 );
151 151
152 CREATE TABLE IF NOT EXISTS rule ( 152 CREATE TABLE IF NOT EXISTS rule (
153 - id character varying(31) NOT NULL CONSTRAINT rule_pkey PRIMARY KEY, 153 + id varchar(31) NOT NULL CONSTRAINT rule_pkey PRIMARY KEY,
154 action varchar, 154 action varchar,
155 additional_info varchar, 155 additional_info varchar,
156 filters varchar, 156 filters varchar,
157 - name character varying(255),  
158 - plugin_token character varying(255), 157 + name varchar(255),
  158 + plugin_token varchar(255),
159 processor varchar, 159 processor varchar,
160 - search_text character varying(255),  
161 - state character varying(255),  
162 - tenant_id character varying(31), 160 + search_text varchar(255),
  161 + state varchar(255),
  162 + tenant_id varchar(31),
163 weight integer 163 weight integer
164 ); 164 );
165 165
166 CREATE TABLE IF NOT EXISTS tb_user ( 166 CREATE TABLE IF NOT EXISTS tb_user (
167 - id character varying(31) NOT NULL CONSTRAINT tb_user_pkey PRIMARY KEY, 167 + id varchar(31) NOT NULL CONSTRAINT tb_user_pkey PRIMARY KEY,
168 additional_info varchar, 168 additional_info varchar,
169 - authority character varying(255),  
170 - customer_id character varying(31),  
171 - email character varying(255) UNIQUE,  
172 - first_name character varying(255),  
173 - last_name character varying(255),  
174 - search_text character varying(255),  
175 - tenant_id character varying(31) 169 + authority varchar(255),
  170 + customer_id varchar(31),
  171 + email varchar(255) UNIQUE,
  172 + first_name varchar(255),
  173 + last_name varchar(255),
  174 + search_text varchar(255),
  175 + tenant_id varchar(31)
176 ); 176 );
177 177
178 CREATE TABLE IF NOT EXISTS tenant ( 178 CREATE TABLE IF NOT EXISTS tenant (
179 - id character varying(31) NOT NULL CONSTRAINT tenant_pkey PRIMARY KEY, 179 + id varchar(31) NOT NULL CONSTRAINT tenant_pkey PRIMARY KEY,
180 additional_info varchar, 180 additional_info varchar,
181 - address character varying(255),  
182 - address2 character varying(255),  
183 - city character varying(255),  
184 - country character varying(255),  
185 - email character varying(255),  
186 - phone character varying(255),  
187 - region character varying(255),  
188 - search_text character varying(255),  
189 - state character varying(255),  
190 - title character varying(255),  
191 - zip character varying(255) 181 + address varchar,
  182 + address2 varchar,
  183 + city varchar(255),
  184 + country varchar(255),
  185 + email varchar(255),
  186 + phone varchar(255),
  187 + region varchar(255),
  188 + search_text varchar(255),
  189 + state varchar(255),
  190 + title varchar(255),
  191 + zip varchar(255)
192 ); 192 );
193 193
194 CREATE TABLE IF NOT EXISTS ts_kv ( 194 CREATE TABLE IF NOT EXISTS ts_kv (
195 - entity_type character varying(255) NOT NULL,  
196 - entity_id character varying(31) NOT NULL,  
197 - key character varying(255) NOT NULL, 195 + entity_type varchar(255) NOT NULL,
  196 + entity_id varchar(31) NOT NULL,
  197 + key varchar(255) NOT NULL,
198 ts bigint NOT NULL, 198 ts bigint NOT NULL,
199 bool_v boolean, 199 bool_v boolean,
200 - str_v character varying(255), 200 + str_v varchar,
201 long_v bigint, 201 long_v bigint,
202 dbl_v double precision, 202 dbl_v double precision,
203 CONSTRAINT ts_kv_unq_key UNIQUE (entity_type, entity_id, key, ts) 203 CONSTRAINT ts_kv_unq_key UNIQUE (entity_type, entity_id, key, ts)
204 ); 204 );
205 205
206 CREATE TABLE IF NOT EXISTS ts_kv_latest ( 206 CREATE TABLE IF NOT EXISTS ts_kv_latest (
207 - entity_type character varying(255) NOT NULL,  
208 - entity_id character varying(31) NOT NULL,  
209 - key character varying(255) NOT NULL, 207 + entity_type varchar(255) NOT NULL,
  208 + entity_id varchar(31) NOT NULL,
  209 + key varchar(255) NOT NULL,
210 ts bigint NOT NULL, 210 ts bigint NOT NULL,
211 bool_v boolean, 211 bool_v boolean,
212 - str_v character varying(255), 212 + str_v varchar,
213 long_v bigint, 213 long_v bigint,
214 dbl_v double precision, 214 dbl_v double precision,
215 CONSTRAINT ts_kv_latest_unq_key UNIQUE (entity_type, entity_id, key) 215 CONSTRAINT ts_kv_latest_unq_key UNIQUE (entity_type, entity_id, key)
216 ); 216 );
217 217
218 CREATE TABLE IF NOT EXISTS user_credentials ( 218 CREATE TABLE IF NOT EXISTS user_credentials (
219 - id character varying(31) NOT NULL CONSTRAINT user_credentials_pkey PRIMARY KEY,  
220 - activate_token character varying(255) UNIQUE, 219 + id varchar(31) NOT NULL CONSTRAINT user_credentials_pkey PRIMARY KEY,
  220 + activate_token varchar(255) UNIQUE,
221 enabled boolean, 221 enabled boolean,
222 - password character varying(255),  
223 - reset_token character varying(255) UNIQUE,  
224 - user_id character varying(31) UNIQUE 222 + password varchar(255),
  223 + reset_token varchar(255) UNIQUE,
  224 + user_id varchar(31) UNIQUE
225 ); 225 );
226 226
227 CREATE TABLE IF NOT EXISTS widget_type ( 227 CREATE TABLE IF NOT EXISTS widget_type (
228 - id character varying(31) NOT NULL CONSTRAINT widget_type_pkey PRIMARY KEY,  
229 - alias character varying(255),  
230 - bundle_alias character varying(255), 228 + id varchar(31) NOT NULL CONSTRAINT widget_type_pkey PRIMARY KEY,
  229 + alias varchar(255),
  230 + bundle_alias varchar(255),
231 descriptor varchar(1000000), 231 descriptor varchar(1000000),
232 - name character varying(255),  
233 - tenant_id character varying(31) 232 + name varchar(255),
  233 + tenant_id varchar(31)
234 ); 234 );
235 235
236 CREATE TABLE IF NOT EXISTS widgets_bundle ( 236 CREATE TABLE IF NOT EXISTS widgets_bundle (
237 - id character varying(31) NOT NULL CONSTRAINT widgets_bundle_pkey PRIMARY KEY,  
238 - alias character varying(255),  
239 - search_text character varying(255),  
240 - tenant_id character varying(31),  
241 - title character varying(255) 237 + id varchar(31) NOT NULL CONSTRAINT widgets_bundle_pkey PRIMARY KEY,
  238 + alias varchar(255),
  239 + search_text varchar(255),
  240 + tenant_id varchar(31),
  241 + title varchar(255)
242 ); 242 );