- type of 'scheme' column in uri_attrs table changed from int to string

- 'scheme' column added to primary key

db/schema/uri.xml

@@ -57,6 +57,7 @@
 	<name>uri_idx1</name>
 	<colref linkend="uri.username"/>
 	<colref linkend="uri.did"/>
+	<colref linkend="uri.scheme"/>
     </index>
 
     <index>

db/schema/uri_attrs.xml

@@ -9,7 +9,7 @@
 
 <table>
     <name>uri_attrs</name>
-    <version>1</version>
+    <version>2</version>
 
     <column id="uriattrs.username">
 	<name>username</name>
@@ -53,14 +53,15 @@
 
     <column id="uriattrs.scheme">
         <name>scheme</name>
-        <type>int</type>
-        <default>0</default>
+        <type>string</type>
+	<size>8</size>
+        <default>sip</default>
         <description>
             URI scheme:
-              - SIP  = 1
-              - SIPS = 2
-              - TEL  = 3
-              - TELS = 4
+              - SIP  
+              - SIPS 
+              - TEL  
+              - TELS 
         </description>
     </column>
 
@@ -71,6 +72,7 @@
 	<colref linkend="uriattrs.did"/>
 	<colref linkend="uriattrs.name"/>
 	<colref linkend="uriattrs.value"/>
+	<colref linkend="uriattrs.scheme"/>
     </index>
 
 </table>

scripts/dbtext/ser_db/uri_attrs

@@ -1 +1 @@
-username(str) did(str) name(str) value(str,null) type(int) flags(int) scheme(int) 
+username(str) did(str) name(str) value(str,null) type(int) flags(int) scheme(str) 

scripts/mysql/my_create.sql

@@ -124,7 +124,7 @@ CREATE TABLE user_attrs (
     UNIQUE KEY userattrs_idx (uid, name, value)
 );
 
-INSERT INTO version (table_name, table_version) values ('uri_attrs','1');
+INSERT INTO version (table_name, table_version) values ('uri_attrs','2');
 CREATE TABLE uri_attrs (
     username VARCHAR(64) NOT NULL,
     did VARCHAR(64) NOT NULL,
@@ -132,8 +132,8 @@ CREATE TABLE uri_attrs (
     value VARCHAR(255),
     type INT NOT NULL DEFAULT '0',
     flags INT UNSIGNED NOT NULL DEFAULT '0',
-    scheme INT NOT NULL DEFAULT '0',
-    UNIQUE KEY uriattrs_idx (username, did, name, value)
+    scheme VARCHAR(8) NOT NULL DEFAULT 'sip',
+    UNIQUE KEY uriattrs_idx (username, did, name, value, scheme)
 );
 
 INSERT INTO version (table_name, table_version) values ('domain','2');
@@ -271,7 +271,7 @@ CREATE TABLE uri (
     username VARCHAR(64) NOT NULL,
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     scheme VARCHAR(8) NOT NULL DEFAULT 'sip',
-    KEY uri_idx1 (username, did),
+    KEY uri_idx1 (username, did, scheme),
     KEY uri_uid (uid)
 );
 

scripts/oracle/or_create.sql

@@ -122,7 +122,7 @@ CREATE TABLE user_attrs (
     userattrs_idx UNIQUE (uid, name, value, )
 );
 
-INSERT INTO version (table_name, table_version) values ('uri_attrs','1');
+INSERT INTO version (table_name, table_version) values ('uri_attrs','2');
 CREATE TABLE uri_attrs (
     username string(64) NOT NULL,
     did string(64) NOT NULL,
@@ -130,8 +130,8 @@ CREATE TABLE uri_attrs (
     value string(255),
     type int NOT NULL DEFAULT '0',
     flags int NOT NULL DEFAULT '0',
-    scheme int NOT NULL DEFAULT '0',
-    uriattrs_idx UNIQUE (username, did, name, value, )
+    scheme string(8) NOT NULL DEFAULT 'sip',
+    uriattrs_idx UNIQUE (username, did, name, value, scheme, )
 );
 
 INSERT INTO version (table_name, table_version) values ('domain','2');

scripts/postgres/pg_create.sql

@@ -129,8 +129,8 @@ CREATE TABLE uri_attrs (
     value VARCHAR(255),
     type INTEGER NOT NULL DEFAULT '0',
     flags INTEGER NOT NULL DEFAULT '0',
-    scheme INTEGER NOT NULL DEFAULT '0',
-    CONSTRAINT uriattrs_idx UNIQUE (username, did, name, value)
+    scheme VARCHAR(8) NOT NULL DEFAULT 'sip',
+    CONSTRAINT uriattrs_idx UNIQUE (username, did, name, value, scheme)
 );
 
 CREATE TABLE domain (
@@ -263,7 +263,7 @@ CREATE TABLE uri (
     scheme VARCHAR(8) NOT NULL DEFAULT 'sip'
 );
 
-CREATE INDEX uri_idx1 ON uri (username, did);
+CREATE INDEX uri_idx1 ON uri (username, did, scheme);
 CREATE INDEX uri_uid ON uri (uid);
 
 CREATE TABLE speed_dial (