- Size of avp value increased to 255

- uid-based grp table
- explicit string lengths in i18n table
- silo table format updated

db/schema/entities.xml

@@ -6,4 +6,4 @@
 <!ENTITY hf_len "255">
 <!ENTITY method_len "16">
 <!ENTITY avp_name_len "32">
-<!ENTITY avp_val_len "64">
+<!ENTITY avp_val_len "255">

db/schema/grp.xml

@@ -9,21 +9,15 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>grp</name>
-    <version>2</version>
+    <version>3</version>
     
-    <column id="username">
-	<name>username</name>
+    <column id="grp.uid">
+	<name>uid</name>
 	<type>string</type>
 	<default></default>
 	<size>&user_len;</size>
     </column>
-    <column id="domain">
-	<name>domain</name>
-	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
-    </column>
-    <column id="grp">
+    <column id="grp.grp">
 	<name>grp</name>
 	<type>string</type>
 	<default></default>
@@ -36,8 +30,7 @@
     </column>
     <index>
 	<name>grp_idx</name>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-	<colref linkend="grp"/>
+	<colref linkend="grp.uid"/>
+	<colref linkend="grp.grp"/>
     </index>
 </table>

db/schema/i18n.xml

@@ -19,16 +19,19 @@
     <column>
 	<name>reason_re</name>
 	<type>string</type>
+	<size>255</size>
 	<default><null/></default>
 	<null/>
     </column>
     <column id="i18n.lang">
 	<name>lang</name>
 	<type>string</type>
+	<size>32</size>
     </column>
     <column id="i18n.nr">
 	<name>new_reason</name>
 	<type>string</type>
+	<size>255</size>
 	<null/>
     </column>
     <index>

db/schema/silo.xml

@@ -11,7 +11,7 @@
     xmlns:pg="http://iptel.org/dbschema/postgres"
     xmlns:dt="http://iptel.org/dbschema/dbtext">
     <name>silo</name>
-    <version>3</version>
+    <version>4</version>
 
     <column id="silo.mid">
 	<name>mid</name>
@@ -22,19 +22,19 @@
     </column>
 
     <column>
-	<name>src_addr</name>
+	<name>from</name>
 	<type>string</type>
 	<size>255</size>
     </column>
 
     <column>
-	<name>dst_addr</name>
+	<name>to</name>
 	<type>string</type>
 	<size>255</size>
     </column>
 
     <column>
-	<name>r_uri</name>
+	<name>ruri</name>
 	<type>string</type>
 	<size>&uri_len;</size>
     </column>

scripts/dbtext/ser_db/grp

@@ -1 +1 @@
-username(str) domain(str) grp(str) last_modified(int) 
+uid(str) grp(str) last_modified(int) 

scripts/dbtext/ser_db/silo

@@ -1 +1 @@
-mid(int,auto) src_addr(str) dst_addr(str) r_uri(str) uid(str) inc_time(int) exp_time(int) ctype(str) body(str) 
+mid(int,auto) from(str) to(str) ruri(str) uid(str) inc_time(int) exp_time(int) ctype(str) body(str) 

scripts/dbtext/ser_db/version

@@ -9,7 +9,7 @@ global_attrs:1
 domain_attrs:1
 user_attrs:3
 phonebook:1
-silo:3
+silo:4
 uri:2
 server_monitoring:1
 trusted:1

scripts/mysql/my_create.sql

@@ -16,7 +16,7 @@ INSERT INTO version (table_name, table_version) VALUES ('global_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('domain_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
-INSERT INTO version (table_name, table_version) VALUES ('silo', '3');
+INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
 INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
@@ -122,7 +122,7 @@ INSERT INTO attr_types (name, raw_type) VALUES ('gflags', '0');
 CREATE TABLE global_attrs (
     name VARCHAR(32) NOT NULL,
     type INT NOT NULL DEFAULT '0',
-    value VARCHAR(64),
+    value VARCHAR(255),
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     UNIQUE KEY global_attrs_idx (name, value)
 );
@@ -131,7 +131,7 @@ CREATE TABLE domain_attrs (
     did VARCHAR(64),
     name VARCHAR(32) NOT NULL,
     type INT NOT NULL DEFAULT '0',
-    value VARCHAR(64),
+    value VARCHAR(255),
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     UNIQUE KEY domain_attr_idx (did, name, value),
     KEY domain_did (did, flags)
@@ -140,7 +140,7 @@ CREATE TABLE domain_attrs (
 CREATE TABLE user_attrs (
     uid VARCHAR(64) NOT NULL,
     name VARCHAR(32) NOT NULL,
-    value VARCHAR(64),
+    value VARCHAR(255),
     type INT NOT NULL DEFAULT '0',
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     UNIQUE KEY userattrs_idx (uid, name, value)
@@ -240,18 +240,17 @@ CREATE TABLE lcr (
 );
 
 CREATE TABLE grp (
-    username VARCHAR(64) NOT NULL DEFAULT '',
-    domain VARCHAR(128) NOT NULL DEFAULT '',
+    uid VARCHAR(64) NOT NULL DEFAULT '',
     grp VARCHAR(64) NOT NULL DEFAULT '',
     last_modified DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
-    KEY grp_idx (username, domain, grp)
+    KEY grp_idx (uid, grp)
 );
 
 CREATE TABLE silo (
     mid INT AUTO_INCREMENT NOT NULL,
-    src_addr VARCHAR(255) NOT NULL,
-    dst_addr VARCHAR(255) NOT NULL,
-    r_uri VARCHAR(255) NOT NULL,
+    from VARCHAR(255) NOT NULL,
+    to VARCHAR(255) NOT NULL,
+    ruri VARCHAR(255) NOT NULL,
     uid VARCHAR(64) NOT NULL,
     inc_time DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
     exp_time DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
@@ -283,7 +282,7 @@ CREATE TABLE speed_dial (
 CREATE TABLE sd_attrs (
     id VARCHAR(64) NOT NULL,
     name VARCHAR(32) NOT NULL,
-    value VARCHAR(64),
+    value VARCHAR(255),
     type INT NOT NULL DEFAULT '0',
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     UNIQUE KEY userattrs_idx (id, name, value)
@@ -336,9 +335,9 @@ CREATE TABLE watcherinfo (
 
 CREATE TABLE i18n (
     code INT NOT NULL,
-    reason_re VARCHAR DEFAULT NULL,
-    lang VARCHAR NOT NULL,
-    new_reason VARCHAR,
+    reason_re VARCHAR(255) DEFAULT NULL,
+    lang VARCHAR(32) NOT NULL,
+    new_reason VARCHAR(255),
     KEY i18n_idx (code)
 );
 

scripts/oracle/or_create.sql

@@ -13,7 +13,7 @@ INSERT INTO version (table_name, table_version) VALUES ('global_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('domain_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
-INSERT INTO version (table_name, table_version) VALUES ('silo', '3');
+INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
 INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
@@ -116,7 +116,7 @@ INSERT INTO attr_types (name, raw_type) VALUES ('gflags', '0');
 CREATE TABLE global_attrs (
     name string(32) NOT NULL,
     type int NOT NULL DEFAULT '0',
-    value string(64),
+    value string(255),
     flags int NOT NULL DEFAULT '0',
     global_attrs_idx UNIQUE (name, value, )
 );
@@ -125,7 +125,7 @@ CREATE TABLE domain_attrs (
     did string(64),
     name string(32) NOT NULL,
     type int NOT NULL DEFAULT '0',
-    value string(64),
+    value string(255),
     flags int NOT NULL DEFAULT '0',
     domain_attr_idx UNIQUE (did, name, value, ),
 
@@ -134,7 +134,7 @@ CREATE TABLE domain_attrs (
 CREATE TABLE user_attrs (
     uid string(64) NOT NULL,
     name string(32) NOT NULL,
-    value string(64),
+    value string(255),
     type int NOT NULL DEFAULT '0',
     flags int NOT NULL DEFAULT '0',
     userattrs_idx UNIQUE (uid, name, value, )
@@ -229,17 +229,16 @@ CREATE TABLE lcr (
 );
 
 CREATE TABLE grp (
-    username string(64) NOT NULL DEFAULT '',
-    domain string(128) NOT NULL DEFAULT '',
+    uid string(64) NOT NULL DEFAULT '',
     grp string(64) NOT NULL DEFAULT '',
     last_modified datetime NOT NULL DEFAULT '1970-01-01 00:00:00'
 );
 
 CREATE TABLE silo (
     mid int NOT NULL,
-    src_addr string(255) NOT NULL,
-    dst_addr string(255) NOT NULL,
-    r_uri string(255) NOT NULL,
+    from string(255) NOT NULL,
+    to string(255) NOT NULL,
+    ruri string(255) NOT NULL,
     uid string(64) NOT NULL,
     inc_time datetime NOT NULL DEFAULT '1970-01-01 00:00:00',
     exp_time datetime NOT NULL DEFAULT '1970-01-01 00:00:00',
@@ -271,7 +270,7 @@ CREATE TABLE speed_dial (
 CREATE TABLE sd_attrs (
     id string(64) NOT NULL,
     name string(32) NOT NULL,
-    value string(64),
+    value string(255),
     type int NOT NULL DEFAULT '0',
     flags int NOT NULL DEFAULT '0',
     userattrs_idx UNIQUE (id, name, value, )
@@ -321,9 +320,9 @@ CREATE TABLE watcherinfo (
 
 CREATE TABLE i18n (
     code int NOT NULL,
-    reason_re string DEFAULT NULL,
-    lang string NOT NULL,
-    new_reason string
+    reason_re string(255) DEFAULT NULL,
+    lang string(32) NOT NULL,
+    new_reason string(255)
 );
 
 INSERT INTO i18n (code, lang, new_reason) VALUES ('100', 'en_US.ascii', 'Trying');

scripts/postgres/pg_create.sql

@@ -13,7 +13,7 @@ INSERT INTO version (table_name, table_version) VALUES ('global_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('domain_attrs', '1');
 INSERT INTO version (table_name, table_version) VALUES ('user_attrs', '3');
 INSERT INTO version (table_name, table_version) VALUES ('phonebook', '1');
-INSERT INTO version (table_name, table_version) VALUES ('silo', '3');
+INSERT INTO version (table_name, table_version) VALUES ('silo', '4');
 INSERT INTO version (table_name, table_version) VALUES ('uri', '2');
 INSERT INTO version (table_name, table_version) VALUES ('server_monitoring', '1');
 INSERT INTO version (table_name, table_version) VALUES ('trusted', '1');
@@ -123,7 +123,7 @@ INSERT INTO attr_types (name, raw_type) VALUES ('gflags', '0');
 CREATE TABLE global_attrs (
     name VARCHAR(32) NOT NULL,
     type INTEGER NOT NULL DEFAULT '0',
-    value VARCHAR(64),
+    value VARCHAR(255),
     flags INTEGER NOT NULL DEFAULT '0',
     CONSTRAINT global_attrs_idx UNIQUE (name, value)
 );
@@ -132,7 +132,7 @@ CREATE TABLE domain_attrs (
     did VARCHAR(64),
     name VARCHAR(32) NOT NULL,
     type INTEGER NOT NULL DEFAULT '0',
-    value VARCHAR(64),
+    value VARCHAR(255),
     flags INTEGER NOT NULL DEFAULT '0',
     CONSTRAINT domain_attr_idx UNIQUE (did, name, value)
 );
@@ -142,7 +142,7 @@ CREATE INDEX domain_did ON domain_attrs (did, flags);
 CREATE TABLE user_attrs (
     uid VARCHAR(64) NOT NULL,
     name VARCHAR(32) NOT NULL,
-    value VARCHAR(64),
+    value VARCHAR(255),
     type INTEGER NOT NULL DEFAULT '0',
     flags INTEGER NOT NULL DEFAULT '0',
     CONSTRAINT userattrs_idx UNIQUE (uid, name, value)
@@ -248,19 +248,18 @@ CREATE INDEX lcr_idx2 ON lcr (from_uri);
 CREATE INDEX lcr_idx3 ON lcr (grp_id);
 
 CREATE TABLE grp (
-    username VARCHAR(64) NOT NULL DEFAULT '',
-    domain VARCHAR(128) NOT NULL DEFAULT '',
+    uid VARCHAR(64) NOT NULL DEFAULT '',
     grp VARCHAR(64) NOT NULL DEFAULT '',
     last_modified TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00'
 );
 
-CREATE INDEX grp_idx ON grp (username, domain, grp);
+CREATE INDEX grp_idx ON grp (uid, grp);
 
 CREATE TABLE silo (
     mid SERIAL NOT NULL,
-    src_addr VARCHAR(255) NOT NULL,
-    dst_addr VARCHAR(255) NOT NULL,
-    r_uri VARCHAR(255) NOT NULL,
+    from VARCHAR(255) NOT NULL,
+    to VARCHAR(255) NOT NULL,
+    ruri VARCHAR(255) NOT NULL,
     uid VARCHAR(64) NOT NULL,
     inc_time TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00',
     exp_time TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00',
@@ -293,7 +292,7 @@ CREATE INDEX speeddial_uid ON speed_dial (uid);
 CREATE TABLE sd_attrs (
     id VARCHAR(64) NOT NULL,
     name VARCHAR(32) NOT NULL,
-    value VARCHAR(64),
+    value VARCHAR(255),
     type INTEGER NOT NULL DEFAULT '0',
     flags INTEGER NOT NULL DEFAULT '0',
     CONSTRAINT userattrs_idx UNIQUE (id, name, value)
@@ -349,9 +348,9 @@ CREATE INDEX wi_wuri_idx ON watcherinfo (w_uri);
 
 CREATE TABLE i18n (
     code INTEGER NOT NULL,
-    reason_re VARCHAR DEFAULT NULL,
-    lang VARCHAR NOT NULL,
-    new_reason VARCHAR
+    reason_re VARCHAR(255) DEFAULT NULL,
+    lang VARCHAR(32) NOT NULL,
+    new_reason VARCHAR(255)
 );
 
 CREATE INDEX i18n_idx ON i18n (code);