Browse code

kamctl: regenerated database creation scripts

Daniel-Constantin Mierla authored on 17/06/2015 14:24:53
Showing 11 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 METADATA_COLUMNS
2
-id(int) src_ip(str) proto(str) from_pattern(str) tag(str)
2
+id(int) src_ip(str) proto(str) from_pattern(str) ruri_pattern(str) tag(str) priority(int)
3 3
 METADATA_KEY
4 4
 1 
5 5
 METADATA_READONLY
... ...
@@ -7,4 +7,4 @@ METADATA_READONLY
7 7
 METADATA_LOGFLAGS
8 8
 0
9 9
 METADATA_DEFAULTS
10
-NIL|NIL|NIL|NULL|NIL
10
+NIL|NIL|NIL|NULL|NULL|NIL|0
... ...
@@ -113,7 +113,7 @@ speed_dial|2
113 113
 subscriber|
114 114
 subscriber|6
115 115
 trusted|
116
-trusted|5
116
+trusted|6
117 117
 uacreg|
118 118
 uacreg|1
119 119
 uid_credentials|
... ...
@@ -1,10 +1,12 @@
1
-INSERT INTO version (table_name, table_version) values ('trusted','5');
1
+INSERT INTO version (table_name, table_version) values ('trusted','6');
2 2
 CREATE TABLE trusted (
3 3
     id INTEGER PRIMARY KEY NOT NULL,
4 4
     src_ip VARCHAR(50) NOT NULL,
5 5
     proto VARCHAR(4) NOT NULL,
6 6
     from_pattern VARCHAR(64) DEFAULT NULL,
7
-    tag VARCHAR(64)
7
+    ruri_pattern VARCHAR(64) DEFAULT NULL,
8
+    tag VARCHAR(64),
9
+    priority INTEGER DEFAULT 0 NOT NULL
8 10
 );
9 11
 
10 12
 CREATE INDEX trusted_peer_idx ON trusted (src_ip);
... ...
@@ -1 +1 @@
1
-id(int,auto) src_ip(string) proto(string) from_pattern(string,null) tag(string,null) 
1
+id(int,auto) src_ip(string) proto(string) from_pattern(string,null) ruri_pattern(string,null) tag(string,null) priority(int) 
... ...
@@ -51,7 +51,7 @@ silo:8
51 51
 sip_trace:4
52 52
 speed_dial:2
53 53
 subscriber:6
54
-trusted:5
54
+trusted:6
55 55
 uacreg:1
56 56
 uid_credentials:7
57 57
 uid_domain:2
... ...
@@ -1,10 +1,12 @@
1
-INSERT INTO version (table_name, table_version) values ('trusted','5');
1
+INSERT INTO version (table_name, table_version) values ('trusted','6');
2 2
 CREATE TABLE `trusted` (
3 3
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
4 4
     `src_ip` VARCHAR(50) NOT NULL,
5 5
     `proto` VARCHAR(4) NOT NULL,
6 6
     `from_pattern` VARCHAR(64) DEFAULT NULL,
7
-    `tag` VARCHAR(64)
7
+    `ruri_pattern` VARCHAR(64) DEFAULT NULL,
8
+    `tag` VARCHAR(64),
9
+    `priority` INT DEFAULT 0 NOT NULL
8 10
 );
9 11
 
10 12
 CREATE INDEX peer_idx ON trusted (`src_ip`);
... ...
@@ -1,10 +1,12 @@
1
-INSERT INTO version (table_name, table_version) values ('trusted','5');
1
+INSERT INTO version (table_name, table_version) values ('trusted','6');
2 2
 CREATE TABLE trusted (
3 3
     id NUMBER(10) PRIMARY KEY,
4 4
     src_ip VARCHAR2(50),
5 5
     proto VARCHAR2(4),
6 6
     from_pattern VARCHAR2(64) DEFAULT NULL,
7
-    tag VARCHAR2(64)
7
+    ruri_pattern VARCHAR2(64) DEFAULT NULL,
8
+    tag VARCHAR2(64),
9
+    priority NUMBER(10) DEFAULT 0 NOT NULL
8 10
 );
9 11
 
10 12
 CREATE OR REPLACE TRIGGER trusted_tr
... ...
@@ -1,10 +1,12 @@
1
-INSERT INTO version (table_name, table_version) values ('trusted','5');
1
+INSERT INTO version (table_name, table_version) values ('trusted','6');
2 2
 CREATE TABLE trusted (
3 3
     id SERIAL PRIMARY KEY NOT NULL,
4 4
     src_ip VARCHAR(50) NOT NULL,
5 5
     proto VARCHAR(4) NOT NULL,
6 6
     from_pattern VARCHAR(64) DEFAULT NULL,
7
-    tag VARCHAR(64)
7
+    ruri_pattern VARCHAR(64) DEFAULT NULL,
8
+    tag VARCHAR(64),
9
+    priority INTEGER DEFAULT 0 NOT NULL
8 10
 );
9 11
 
10 12
 CREATE INDEX trusted_peer_idx ON trusted (src_ip);
... ...
@@ -8,7 +8,9 @@
8 8
 				<col><field>src_ip</field></col>
9 9
 				<col><field>proto</field></col>
10 10
 				<col><field>from_pattern</field></col>
11
+				<col><field>ruri_pattern</field></col>
11 12
 				<col><field>tag</field></col>
13
+				<col><field>priority</field></col>
12 14
 			</query_cols>
13 15
 		</cmd>
14 16
 		<cmd><cmd_name>add</cmd_name>
... ...
@@ -18,7 +20,9 @@
18 18
 				<col><field>src_ip</field></col>
19 19
 				<col><field>proto</field></col>
20 20
 				<col><field>from_pattern</field></col>
21
+				<col><field>ruri_pattern</field></col>
21 22
 				<col><field>tag</field></col>
23
+				<col><field>priority</field></col>
22 24
 			</query_cols>
23 25
 		</cmd>
24 26
 		<cmd><cmd_name>update</cmd_name>
... ...
@@ -31,7 +35,9 @@
31 31
 				<col><field>src_ip</field></col>
32 32
 				<col><field>proto</field></col>
33 33
 				<col><field>from_pattern</field></col>
34
+				<col><field>ruri_pattern</field></col>
34 35
 				<col><field>tag</field></col>
36
+				<col><field>priority</field></col>
35 37
 			</query_cols>
36 38
 		</cmd>
37 39
 		<cmd><cmd_name>delete</cmd_name>
... ...
@@ -6,7 +6,9 @@
6 6
 		<column><field>src_ip</field><type>DB1_STR</type></column>
7 7
 		<column><field>proto</field><type>DB1_STR</type></column>
8 8
 		<column><field>from_pattern</field><type>DB1_STR</type></column>
9
+		<column><field>ruri_pattern</field><type>DB1_STR</type></column>
9 10
 		<column><field>tag</field><type>DB1_STR</type></column>
11
+		<column><field>priority</field><type>DB1_INT</type></column>
10 12
 	</db_table>
11 13
 	<!-- Declaration of address table-->
12 14
 	<db_table id="address">
... ...
@@ -468,7 +468,9 @@
468 468
 		<column><field>src_ip</field><type>DB1_STR</type></column>
469 469
 		<column><field>proto</field><type>DB1_STR</type></column>
470 470
 		<column><field>from_pattern</field><type>DB1_STR</type></column>
471
+		<column><field>ruri_pattern</field><type>DB1_STR</type></column>
471 472
 		<column><field>tag</field><type>DB1_STR</type></column>
473
+		<column><field>priority</field><type>DB1_INT</type></column>
472 474
 	</db_table>
473 475
 	<!-- Declaration of address table-->
474 476
 	<db_table id="address">
... ...
@@ -2744,7 +2746,9 @@
2744 2744
 				<col><field>src_ip</field></col>
2745 2745
 				<col><field>proto</field></col>
2746 2746
 				<col><field>from_pattern</field></col>
2747
+				<col><field>ruri_pattern</field></col>
2747 2748
 				<col><field>tag</field></col>
2749
+				<col><field>priority</field></col>
2748 2750
 			</query_cols>
2749 2751
 		</cmd>
2750 2752
 		<cmd><cmd_name>add</cmd_name>
... ...
@@ -2754,7 +2758,9 @@
2754 2754
 				<col><field>src_ip</field></col>
2755 2755
 				<col><field>proto</field></col>
2756 2756
 				<col><field>from_pattern</field></col>
2757
+				<col><field>ruri_pattern</field></col>
2757 2758
 				<col><field>tag</field></col>
2759
+				<col><field>priority</field></col>
2758 2760
 			</query_cols>
2759 2761
 		</cmd>
2760 2762
 		<cmd><cmd_name>update</cmd_name>
... ...
@@ -2767,7 +2773,9 @@
2767 2767
 				<col><field>src_ip</field></col>
2768 2768
 				<col><field>proto</field></col>
2769 2769
 				<col><field>from_pattern</field></col>
2770
+				<col><field>ruri_pattern</field></col>
2770 2771
 				<col><field>tag</field></col>
2772
+				<col><field>priority</field></col>
2771 2773
 			</query_cols>
2772 2774
 		</cmd>
2773 2775
 		<cmd><cmd_name>delete</cmd_name>