- db schema update

db/schema/Makefile

@@ -5,26 +5,29 @@
 # File containing SER database description
 DOC_ROOT = ser.xml
 
+ROOT=../..
+STYLESHEETS=$(ROOT)/doc/stylesheets/dbschema/xsl
+
 # Stylesheet used to generate MySQL database schema
-MYSQL_XSL = ../../doc/stylesheets/dbschema/xsl/mysql.xsl
+MYSQL_XSL = $(STYLESHEETS)/mysql.xsl
 
 # Stylesheet used to generate Postgres database schema
-POSTGRES_XSL = ../../doc/stylesheets/dbschema/xsl/postgres.xsl
+POSTGRES_XSL = $(STYLESHEETS)/postgres.xsl
 
 # Stylesheet used to generate dbtext database schema
-DBTEXT_XSL = ../../doc/stylesheets/dbschema/xsl/dbtext.xsl
+DBTEXT_XSL = $(STYLESHEETS)/dbtext.xsl
 
 # Stylesheet used to generate oracle database schema
-ORACLE_XSL = ../../doc/stylesheets/dbschema/xsl/oracle.xsl
+ORACLE_XSL = $(STYLESHEETS)/oracle.xsl
 
 # Stylesheet used to generate docbook documentation
-DOCBOOK_XSL = ../../doc/stylesheets/dbschema/xsl/docbook.xsl
+DOCBOOK_XSL = $(STYLESHEETS)/docbook.xsl
 
 # Enable/disable DTD validation
-VALIDATE = 1
+VALIDATE = 0
 
 # XML Catalog used to resolve entities
-CATALOG = ../../doc/catalog.xml
+CATALOG = $(ROOT)/doc/catalog.xml
 
 XSLTPROC = /usr/bin/xsltproc
 XSLTPROC_FLAGS = --xinclude
@@ -35,32 +38,56 @@ endif
 
 all: dbtext mysql postgres oracle docbook
 
-.PHONY: mysql
+.PHONY: mysql mysql_clean
 mysql:
 	XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \
-	    --stringparam prefix mysql $(MYSQL_XSL) $(DOC_ROOT)
+	    --stringparam dir "$(ROOT)/scripts/mysql" \
+	    --stringparam prefix "my_" \
+	    $(MYSQL_XSL) $(DOC_ROOT)
+
+mysql_clean:
+	rm -f $(ROOT)/scripts/mysql/my_*
 
-.PHONY: postgres
+.PHONY: postgres postgres_clean
 postgres:
 	XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \
-	    --stringparam prefix postgres $(POSTGRES_XSL) $(DOC_ROOT)
+	    --stringparam dir "$(ROOT)/scripts/postgres" \
+	    --stringparam prefix "pg_" \
+	    $(POSTGRES_XSL) $(DOC_ROOT)
 
-.PHONY: oracle
+postgres_clean:
+	rm -f $(ROOT)/scripts/postgres/pg_*
+
+.PHONY: oracle oracle_clean
 oracle:
 	XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \
-	    --stringparam prefix oracle $(ORACLE_XSL) $(DOC_ROOT)
+	    --stringparam dir "$(ROOT)/scripts/oracle" \
+	    --stringparam prefix "or_" \
+	    $(ORACLE_XSL) $(DOC_ROOT)
+
+oracle_clean:
+	rm -f $ROOT/scripts/oracles/or_*
 
-.PHONY: dbtext
+.PHONY: dbtext dbtext_clean
 dbtext:
 	XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \
-	    --stringparam prefix dbtext $(DBTEXT_XSL) $(DOC_ROOT)
+	--stringparam dir "$(ROOT)/scripts/dbtext/ser_db" \
+	--stringparam prefix "" \
+	$(DBTEXT_XSL) $(DOC_ROOT)
 
-.PHONY: docbook
+dbtext_clean:
+	rm -f $ROOT/scripts/dbtext/ser_db/*
+
+.PHONY: docbook docbook_clean
 docbook:
-	XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \
-	    --stringparam prefix docbook $(DOCBOOK_XSL) $(DOC_ROOT)
+#	XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \
+#           --stringparam dir "($ROOT)/doc/database" \
+#	    --stringparam prefix "" \
+#	    $(DOCBOOK_XSL) $(DOC_ROOT)
+
+docbook_clean:
+
 
 .PHONY: clean
-clean:
-	rm -rf mysql postgres oracle dbtext docbook
+clean: mysql_clean postgres_clean oracle_clean dbtext_clean dbtext_clean docbook_clean
 

db/schema/admin_privileges.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table xmlns:my="http://iptel.org/dbschema/mysql">
-    <name>admin_privileges</name>
-    <version>1</version>
-
-    <column id="username">
-	<name>username</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="priv_name">
-	<name>priv_name</name>
-	<type>string</type>
-	<default></default>
-	<size>64</size>
-    </column>
-    <column id="priv_value">
-	<name>priv_value</name>
-	<type>string</type>
-	<default>0</default>
-	<size>64</size>
-    </column>
-    <index>
-	<name>adminpriv_idx1</name>
-	<colref linkend="username"/>
-	<colref linkend="priv_name"/>
-	<colref linkend="priv_value"/>
-	<colref linkend="domain"/>
-    </index>
-</table>

db/schema/domain.xml

@@ -7,23 +7,55 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:my="http://iptel.org/dbschema/mysql"
+    xmlns:dt="http://iptel.org/dbschema/dbtext">
+    xmlns:pg="http://iptel.org/dbschema/postgres">
     <name>domain</name>
-    <version>1</version>
+    <version>2</version>
 
-    <column id="domain">
+    <column id="domain.did">
+	<name>did</name>
+	<type>string</type>
+	<size>&id_len;</size>
+	<description>
+	    Unique identifier of the domain.
+	</description>
+    </column>
+
+    <column id="domain.domain">
 	<name>domain</name>
 	<type>string</type>
-	<default></default>
 	<size>&domain_len;</size>
+	<description>
+	    Domain name.
+	</description>
     </column>
+
     <column>
 	<name>last_modified</name>
 	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
+	<my:type>timestamp</my:type>
+	<description>
+	    Date and time of the last modification of the domain.
+	</description>
     </column>
+    
+    <column>
+	<name>flags</name>
+	<type>unsigned int</type>
+	<default>0</default>
+	<description>
+	    Various flags (disabled, canon).
+	</description>
+	<description>
+	    Various domain flags, such as IS_CANON, IS_ACTIVE.
+	</description>
+    </column>
+
     <index>
-	<name>domain_idx1</name>
-	<colref linkend="domain"/>
+	<name>domain_idx</name>
+	<unique/>
+	<colref linkend="domain.did"/>
+	<colref linkend="domain.domain"/>
     </index>
 </table>

db/schema/entities.xml

@@ -1,6 +1,9 @@
 <!ENTITY user_len "64">
 <!ENTITY domain_len "128">
+<!ENTITY realm_len "64">
 <!ENTITY uri_len "255">
-<!ENTITY uuid_len "255">
+<!ENTITY id_len "64">
 <!ENTITY hf_len "255">
 <!ENTITY method_len "16">
+<!ENTITY avp_name_len "32">
+<!ENTITY avp_val_len "64">

db/schema/gw.xml

@@ -7,43 +7,52 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table>
     <name>gw</name>
     <version>2</version>
-    <column id="gw_name">
+
+    <column id="gw.gw_name">
 	<name>gw_name</name>
 	<type>string</type>
 	<size>128</size>
     </column>
+
     <column>
 	<name>ip_addr</name>
 	<type>unsigned int</type>
     </column>
+
     <column>
 	<name>port</name>
 	<type>unsigned short</type>
 	<null/>
     </column>
+
     <column>
 	<name>uri_scheme</name>
 	<type>unsigned char</type>
 	<null/>
     </column>
+
     <column>
 	<name>transport</name>
 	<type>unsigned short</type>
 	<null/>
     </column>
-    <column id="grp_id">
+
+    <column id="gw.grp_id">
 	<name>grp_id</name>
 	<type>int</type>
     </column>
+
     <index>
 	<name>gw_idx1</name>
-	<colref linkend="gw_name"/>
+	<colref linkend="gw.gw_name"/>
+	<unique/>
     </index>
+
     <index>
 	<name>gw_idx2</name>
-	<colref linkend="grp_id"/>
+	<colref linkend="gw.grp_id"/>
     </index>
 </table>

db/schema/gw_grp.xml

@@ -7,17 +7,29 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:my="http://iptel.org/dbschema/mysql"
+    xmlns:pg="http://iptel.org/dbschema/postgres"
+    xmlns:dt="http://iptel.org/dbschema/dbtext">
     <name>gw_grp</name>
     <version>2</version>
 
-    <column>
+    <column id="gw_grp.id">
 	<name>grp_id</name>
-	<type auto_increment="yes">int</type>
+	<type>int</type>
+	<my:type>INT AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
     </column>
+
     <column>
 	<name>grp_name</name>
 	<type>string</type>
 	<size>64</size>
     </column>
+
+    <index>
+	<name>gwgrp_idx</name>
+	<unique/>
+	<colref linkend="gw_grp.id"/>
+    </index>
 </table>

db/schema/lcr.xml

@@ -7,40 +7,47 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table>
     <name>lcr</name>
     <version>1</version>
-    <column id="prefix">
+
+    <column id="lcr.prefix">
 	<name>prefix</name>
 	<type>string</type>
 	<size>16</size>
     </column>
-    <column id="from_uri">
+
+    <column id="lcr.from_uri">
 	<name>from_uri</name>
 	<type>string</type>
 	<default>%</default>
 	<size>&uri_len;</size>
     </column>
-    <column id="grp_id">
+
+    <column id="lcr.grp_id">
 	<name>grp_id</name>
 	<type>int</type>
 	<null/>
     </column>
+
     <column>
 	<name>priority</name>
 	<type>int</type>
 	<null/>
     </column>
+
     <index>
 	<name>lcr_idx1</name>
-	<colref linkend="prefix"/>
+	<colref linkend="lcr.prefix"/>
     </index>
+
     <index>
 	<name>lcr_idx2</name>
-	<colref linkend="from_uri"/>
+	<colref linkend="lcr.from_uri"/>
     </index>
+
     <index>
 	<name>lcr_idx3</name>
-	<colref linkend="grp_id"/>
+	<colref linkend="lcr.grp_id"/>
     </index>
 </table>

db/schema/location.xml

@@ -7,89 +7,75 @@
 
 ]>
 
-<table id="location" xmlns:my="http://iptel.org/dbschema/mysql">
+<table id="location">
     <name>location</name>
-    <version>6</version>
-    <column id="username">
-	<name>username</name>
-	<type>string</type>
-	<default></default>
-	<size>&user_len;</size>
-    </column>
-    <column id="domain">
-	<name>domain</name>
+    <version>8</version>
+
+    <column id="location.uid">
+	<name>uid</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&id_len;</size>
     </column>
-    <column id="contact">
+
+    <column id="location.contact">
 	<name>contact</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
     </column>
+
     <column>
 	<name>received</name>
 	<type>string</type>
         <null/>
-	<default><null/></default>
 	<size>&uri_len;</size>
     </column>
+
     <column>
 	<name>expires</name>
 	<type>datetime</type>
 	<default>1970-01-01 00:00:00</default>
     </column>
+
     <column>
 	<name>q</name>
 	<type>float</type>
 	<default>1.0</default>
     </column>
+
     <column>
 	<name>callid</name>
 	<type>string</type>
-	<default>default_callid</default>
+	<null/>
 	<size>&uri_len;</size>
     </column>
+
     <column>
 	<name>cseq</name>
 	<type>unsigned int</type>
-	<default>42</default>
-    </column>
-    <column>
-	<name>last_modified</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-    <column>
-	<name>replicate</name>
-	<type>unsigned int</type>
-	<default>0</default>
-    </column>
-    <column>
-	<name>state</name>
-	<type>unsigned int</type>
-	<default>0</default>
+	<null/>
     </column>
+
     <column>
 	<name>flags</name>
 	<type>unsigned int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>user_agent</name>
 	<type>string</type>
-	<default></default>
 	<size>64</size>
+	<null/>
     </column>
+
     <index>
 	<name>location_key</name>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-	<colref linkend="contact"/>
+	<unique/>
+	<colref linkend="location.uid"/>
+	<colref linkend="location.contact"/>
     </index>
     <index>
 	<name>location_contact</name>
-	<colref linkend="contact"/>
+	<colref linkend="location.contact"/>
     </index>
 </table>

db/schema/missed_calls.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
+<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN" 
   "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
 
 <!ENTITY % entities SYSTEM "entities.xml">
@@ -7,100 +7,264 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:db="http://docbook.org/ns/docbook"
+    xmlns:my="http://iptel.org/dbschema/mysql"
+    xmlns:pg="http://iptel.org/dbschema/postgres"
+    xmlns:dt="http://iptel.org/dbschema/dbtext">
     <name>missed_calls</name>
-    <version>2</version>
+    <version>3</version>
+
+    <column id="mc.id">
+	<name>id</name>
+	<type>int</type>
+	<my:type>INT AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
+	<description>
+	    ID that uniquely identifies every record. Useful for post-processing.
+	</description>
+    </column>
+
+    <column>
+	<name>from_uid</name>
+	<type>string</type>
+	<size>&id_len;</size>
+	<null/>
+	<description>
+	    The UID (Unique ID) of the originator of transaction (usually caller).
+	</description>
+    </column>
+
+    <column>
+	<name>to_uid</name>
+	<type>string</type>
+	<size>&id_len;</size>
+	<null/>
+	<description>
+	    The UUID of the user identified by the Request-URI (intended
+	    recipient of the transaction).
+	</description>
+    </column>
+
+    <column>
+	<name>to_did</name>
+	<type>string</type>
+	<size>&id_len;</size>
+	<null/>
+	<description>
+	    The domain id of the callee.
+	</description>
+    </column>
+
+    <column>
+	<name>from_did</name>
+	<type>string</type>
+	<size>&id_len;</size>
+	<null/>
+	<description>
+	    The domain id of the caller.
+	</description>
+    </column>
+
     <column>
 	<name>sip_from</name>
 	<type>string</type>
-	<default></default>
 	<size>&hf_len;</size>
+	<null/>
+	<description>
+	    The body of the From header field, including display name and all
+	    parameters URI and header field parameters.
+	</description>
     </column>
+
     <column>
 	<name>sip_to</name>
 	<type>string</type>
-	<default></default>
 	<size>&hf_len;</size>
+	<null/>
+	<description>
+	    The body of the To header field, including display name and all
+	    parameters URI and header field parameters.
+	</description>
     </column>
+
     <column>
 	<name>sip_status</name>
 	<type>string</type>
-	<default></default>
 	<size>128</size>
+	<null/>
+	<description>
+	    The status code of the final SIP reply that finished the
+	    transaction being accounted.
+	</description>
     </column>
+
     <column>
 	<name>sip_method</name>
 	<type>string</type>
-	<default></default>
 	<size>&method_len;</size>
+	<null/>
+	<description>
+	    The method of the SIP request that created the transaction being
+	    accounted.
+	</description>
     </column>
+
     <column>
-	<name>i_uri</name>
+	<name>inbound_ruri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
+	<null/>
+	<description>
+	    Inbound Request-URI. This is the value of the Request-URI as
+	    received by SER from the previous (upstream) element (typically
+	    generated by the SIP phone of the caller).
+	</description>
     </column>
+
     <column>
-	<name>o_uri</name>
+	<name>outbound_ruri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
+	<null/>
+	<description>
+	    Outbound Request-URI. This is the value of the Request-URI when the
+	    request leaves SER, i.e. after applying all the modifications and
+	    rewrites in the configuration file of SER. The next downstream
+	    element (typically the SIP phone of the callee) will see exactly
+	    this value of the Request-URI.
+	</description>
     </column>
+
     <column>
 	<name>from_uri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
+	<null/>
+	<description>
+	    The SIP URI extracted from From header field. This is just the
+	    plain SIP URI without display name and header field parameters
+	    (if From header field contains angle brackets then this
+	    column contains the string between the angle brackets).
+	</description>
     </column>
+
     <column>
 	<name>to_uri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
+	<null/>
+	<description>
+	    The SIP URI extracted from To header field. This is just the plain
+	    SIP URI without display name and header field parameters (if To
+	    header field contains angle brackets then this column contains the
+	    string between the angle brackets).
+	</description>
     </column>
-    <column>
+
+    <column id="mc.sip_callid">
 	<name>sip_callid</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
+	<null/>
+	<description>
+	    The value of the Call-ID header field. This value uniquely
+	    identifies a call.
+	</description>
+    </column>
+
+    <column id="mc.sip_cseq">
+	<name>sip_cseq</name>
+	<type>int</type>
+	<null/>
+	<description>
+	    CSeq number.
+	</description>
     </column>
-    <column id="username">
-	<name>username</name>
+
+    <column id="mc.username">
+	<name>digest_username</name>
 	<type>string</type>
-	<default></default>
 	<size>&user_len;</size>
+	<null/>
+	<description>
+	    The value of username attribute from digest credentials
+	</description>
     </column>
-    <column id="domain">
-	<name>domain</name>
+
+    <column id="mc.realm">
+	<name>digest_realm</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&uri_len;</size>
+	<null/>
+	<description>
+	    Digest realm.
+	</description>
     </column>
+
     <column>
-	<name>fromtag</name>
+	<name>from_tag</name>
 	<type>string</type>
-	<default></default>
 	<size>128</size>
+	<null/>
+	<description>
+	    The value of the tag parameter in From header field.
+	</description>
     </column>
+
     <column>
-	<name>totag</name>
+	<name>to_tag</name>
 	<type>string</type>
-	<default></default>
 	<size>128</size>
+	<null/>
+	<description>
+	    The value of the tag parameter in To header field.
+	</description>
     </column>
+
     <column>
-	<name>time</name>
+	<name>request_timestamp</name>
 	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
+	<description>
+	    The date and time of the request arrival to the proxy.
+	</description>
     </column>
+
     <column>
-	<name>timestamp</name>
+	<name>response_timestamp</name>
 	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
+	<description>
+	    The date and time when the final response was sent out.
+	</description>
+    </column>
+
+    <column>
+	<name>flags</name>
+	<type>unsigned int</type>
+	<default>0</default>
+	<description>
+	    Various flags (caller_deleted, callee_deleted).
+	</description>
     </column>
+
+    <column>
+	<name>attrs</name>
+	<type>string</type>
+	<size>255</size>
+	<null/>
+	<description>
+	    Attribute-value pairs.
+	</description>
+    </column>
+
     <index>
-	<name>mc_user</name>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
+	<name>id_key</name>
+	<unique/>
+	<colref linkend="mc.id"/>
+    </index>
+
+    <index role="serweb">
+	<name>cid_key</name>
+	<colref linkend="mc.sip_callid"/>
     </index>
 </table>

db/schema/pending.xml

@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table xmlns:my="http://iptel.org/dbschema/mysql">
-    <name>pending</name>
-    <version>4</version>
-
-    <column id="phplib_id">
-	<name>phplib_id</name>
-	<type>string</type>
-	<default></default>
-	<size>32</size>
-    </column>
-    <column id="username">
-	<name>username</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>
-	<name>password</name>
-	<type>string</type>
-	<default></default>
-	<size>25</size>
-    </column>
-    <column>
-	<name>first_name</name>
-	<type>string</type>
-	<default></default>
-	<size>25</size>
-    </column>
-    <column>
-	<name>last_name</name>
-	<type>string</type>
-	<default></default>
-	<size>45</size>
-    </column>
-    <column>
-	<name>phone</name>
-	<type>string</type>
-	<default></default>
-	<size>15</size>
-    </column>
-    <column>
-	<name>email_address</name>
-	<type>string</type>
-	<default></default>
-	<size>50</size>
-    </column>
-    <column>
-	<name>datetime_created</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-    <column>
-	<name>datetime_modified</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-    <column>
-	<name>confirmation</name>
-	<type>string</type>
-	<default></default>
-	<size>64</size>
-    </column>
-    <column>
-	<name>flag</name>
-	<type>string</type>
-	<default>o</default>
-	<size>1</size>
-    </column>
-    <column>
-	<name>sendnotification</name>
-	<type>string</type>
-	<default></default>
-	<size>50</size>
-    </column>
-    <column>
-	<name>greeting</name>
-	<type>string</type>
-	<default></default>
-	<size>50</size>
-    </column>
-    <column>
-	<name>ha1</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>ha1b</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>allow_find</name>
-	<type>string</type>
-	<default></default>
-	<size>1</size>
-    </column>
-    <column>
-	<name>timezone</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>rpid</name>
-	<type>string</type>
-	<default></default>
-	<size>&uri_len;</size>
-    </column>
-    <column>
-	<name>domn</name>
-	<type>unsigned int</type>
-	<default>0</default>
-	<size>10</size>
-    </column>
-    <column>
-	<name>uuid</name>
-	<type>string</type>
-	<default></default>
-	<size>&uuid_len;</size>
-    </column>
-    <index>
-	<name>pending_idx1</name>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-    </index>
-    <index>
-	<name>user_2</name>
-	<colref linkend="username"/>
-    </index>
-    <index>
-	<name>php</name>
-	<colref linkend="phplib_id"/>
-    </index>
-</table>

db/schema/phonebook.xml

@@ -7,47 +7,54 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:my="http://iptel.org/dbschema/mysql"
+    xmlns:pg="http://iptel.org/dbschema/postgres"
+    xmlns:dt="http://iptel.org/dbschema/dbtext"
+    role="serweb">
     <name>phonebook</name>
     <version>1</version>
 
-    <column id="id">
+    <column id="pb.id">
 	<name>id</name>
 	<type>unsigned int</type>
-	<default>0</default>
+	<my:type>INT AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
     </column>
-    <column>
-	<name>username</name>
-	<type>string</type>
-	<default></default>
-	<size>&user_len;</size>
-    </column>
-    <column>
-	<name>domain</name>
+
+    <column id="pb.uid">
+	<name>uid</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&id_len;</size>
     </column>
+
     <column>
 	<name>fname</name>
 	<type>string</type>
-	<default></default>
 	<size>32</size>
+	<null/>
     </column>
+
     <column>
 	<name>lname</name>
 	<type>string</type>
-	<default></default>
 	<size>32</size>
+	<null/>
     </column>
+
     <column>
 	<name>sip_uri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
     </column>
+
     <index>
 	<name>pb_idx</name>
-	<colref linkend="id"/>
+	<unique/>
+	<colref linkend="pb.id"/>
+    </index>
+    <index>
+	<name>pb_uid</name>
+	<colref linkend="pb.uid"/>
     </index>
 </table>

db/schema/server_monitoring.xml

@@ -7,7 +7,7 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table role="serweb" xmlns:my="http://iptel.org/dbschema/mysql">
     <name>server_monitoring</name>
     <version>1</version>
 
@@ -16,30 +16,35 @@
 	<type>datetime</type>
 	<default>1970-01-01 00:00:00</default>
     </column>
-    <column id="id">
+
+    <column id="sm.id">
 	<name>id</name>
 	<type>int</type>
 	<default>0</default>
     </column>
-    <column id="param">
+
+    <column id="sm.param">
 	<name>param</name>
 	<type>string</type>
 	<default></default>
 	<size>32</size>
     </column>
+
     <column>
 	<name>value</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>increment</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <index>
 	<name>sm_idx1</name>
-	<colref linkend="id"/>
-	<colref linkend="param"/>
+	<colref linkend="sm.id"/>
+	<colref linkend="sm.param"/>
     </index>
 </table>

db/schema/server_monitoring_agg.xml

@@ -7,78 +7,91 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table role="serweb">
     <name>server_monitoring_agg</name>
     <version>1</version>
 
-    <column id="param">
+    <column id="smagg.param">
 	<name>param</name>
 	<type>string</type>
 	<default></default>
 	<size>32</size>
     </column>
+
     <column>
 	<name>s_value</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>s_increment</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>last_aggregated_increment</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>av</name>
 	<type>double</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>mv</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>ad</name>
 	<type>double</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>lv</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>min_val</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>max_val</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>min_inc</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>max_inc</name>
 	<type>int</type>
 	<default>0</default>
     </column>
+
     <column>
 	<name>lastupdate</name>
 	<type>datetime</type>
 	<default>1970-01-01 00:00:00</default>
     </column>
+
     <index>
 	<name>smagg_idx1</name>
-	<colref linkend="param"/>
+	<colref linkend="smagg.param"/>
     </index>
 </table>

db/schema/silo.xml

@@ -7,67 +7,72 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:my="http://iptel.org/dbschema/mysql"
+    xmlns:pg="http://iptel.org/dbschema/postgres"
+    xmlns:dt="http://iptel.org/dbschema/dbtext">
     <name>silo</name>
     <version>3</version>
 
-    <column id="mid">
+    <column id="silo.mid">
 	<name>mid</name>
-	<type auto_increment="yes">unsigned int</type>
+	<type>int</type>
+	<my:type>INT AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
     </column>
+
     <column>
 	<name>src_addr</name>
 	<type>string</type>
-	<default></default>
 	<size>255</size>
     </column>
+
     <column>
 	<name>dst_addr</name>
 	<type>string</type>
-	<default></default>
 	<size>255</size>
     </column>
+
     <column>
 	<name>r_uri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
     </column>
+
     <column>
-	<name>username</name>
-	<type>string</type>
-	<default></default>
-	<size>&user_len;</size>
-    </column>
-    <column>
-	<name>domain</name>
+	<name>uid</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&id_len;</size>
     </column>
+
     <column>
 	<name>inc_time</name>
 	<type>datetime</type>
 	<default>1970-01-01 00:00:00</default>
     </column>
+
     <column>
 	<name>exp_time</name>
 	<type>datetime</type>
 	<default>1970-01-01 00:00:00</default>
     </column>
+
     <column>
 	<name>ctype</name>
 	<type>string</type>
 	<default>text/plain</default>
 	<size>128</size>
     </column>
+
     <column>
 	<name>body</name>
 	<type>binary</type>
 	<default></default>
     </column>
+
     <index>
+	<unique/>
 	<name>silo_idx1</name>
-	<colref linkend="mid"/>
+	<colref linkend="silo.mid"/>
     </index>
 </table>

db/schema/speed_dial.xml

@@ -7,69 +7,60 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table xmlns:my="http://iptel.org/dbschema/mysql"
+    xmlns:pg="http://iptel.org/dbschema/postgres"
+    xmlns:dt="http://iptel.org/dbschema/dbtext">
     <name>speed_dial</name>
     <version>2</version>
 
-    <column>
-	<name>uuid</name>
-	<type>string</type>
-	<default></default>
-	<size>&uuid_len;</size>
+    <column id="sd.id">
+	<name>id</name>
+	<type>int</type>
+	<my:type>INT AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
     </column>
-    <column id="username">
-	<name>username</name>
-	<type>string</type>
-	<default></default>
-	<size>&user_len;</size>
-    </column>
-    <column id="domain">
-	<name>domain</name>
+
+    <column id="sd.uid">
+	<name>uid</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&id_len;</size>
     </column>
-    <column id="sd_username">
-	<name>sd_username</name>
+
+    <column id="sd.dial_username">
+	<name>dial_username</name>
 	<type>string</type>
-	<default></default>
 	<size>&user_len;</size>
     </column>
-    <column id="sd_domain">
-	<name>sd_domain</name>
+
+    <column id="sd.dial_did">
+	<name>dial_did</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&id_len;</size>
     </column>
+
     <column>
 	<name>new_uri</name>
 	<type>string</type>
-	<default></default>
 	<size>&uri_len;</size>
     </column>
-    <column>
-	<name>fname</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>lname</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>description</name>
-	<type>string</type>
-	<default></default>
-	<size>64</size>
-    </column>
+
     <index>
 	<name>speeddial_idx1</name>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-	<colref linkend="sd_username"/>
-	<colref linkend="sd_domain"/>
+	<unique/>
+	<colref linkend="sd.uid"/>
+	<colref linkend="sd.dial_did"/>
+	<colref linkend="sd.dial_username"/>
+    </index>
+
+    <index>
+	<unique/>
+	<name>speeddial_id</name>
+	<colref linkend="sd.id"/>
+    </index>
+
+    <index>
+	<name>speeddial_uid</name>
+	<colref linkend="sd.uid"/>
     </index>
 </table>

db/schema/subscriber.xml

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table xmlns:my="http://iptel.org/dbschema/mysql">
-    <name>subscriber</name>
-    <version>5</version>
-
-    <column id="username">
-	<name>username</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>
-	<name>password</name>
-	<type>string</type>
-	<default></default>
-	<size>25</size>
-    </column>
-    <column>
-	<name>first_name</name>
-	<type>string</type>
-	<default></default>
-	<size>25</size>
-    </column>
-    <column>
-	<name>last_name</name>
-	<type>string</type>
-	<default></default>
-	<size>45</size>
-    </column>
-    <column>
-	<name>phone</name>
-	<type>string</type>
-	<default></default>
-	<size>15</size>
-    </column>
-    <column>
-	<name>email_address</name>
-	<type>string</type>
-	<default></default>
-	<size>50</size>
-    </column>
-    <column>
-	<name>datetime_created</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-    <column>
-	<name>datetime_modified</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
-    </column>
-    <column>
-	<name>confirmation</name>
-	<type>string</type>
-	<default></default>
-	<size>64</size>
-    </column>
-    <column>
-	<name>flag</name>
-	<type>string</type>
-	<default>o</default>
-	<size>1</size>
-    </column>
-    <column>
-	<name>ha1</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>ha1b</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>allow_find</name>
-	<type>string</type>
-	<default></default>
-	<size>1</size>
-    </column>
-    <column>
-	<name>timezone</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>rpid</name>
-	<type>string</type>
-	<default></default>
-	<size>&uri_len;</size>
-    </column>
-    <column>
-	<name>domn</name>
-	<type>unsigned int</type>
-	<default>0</default>
-	<size>10</size>
-    </column>
-    <column>
-	<name>uuid</name>
-	<type>string</type>
-	<default></default>
-	<size>&uuid_len;</size>
-    </column>
-    <index>
-	<unique/>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-    </index>
-    <index>
-	<name>sub_idx1</name>
-	<colref linkend="username"/>
-    </index>
-    <index>
-	<name>phplib_id</name>
-	<colref linkend="phplib_id"/>
-    </index>
-</table>

db/schema/trusted.xml

@@ -7,28 +7,33 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table>
     <name>trusted</name>
     <version>1</version>
-    <column id="src_ip">
+
+    <column id="trusted.src_ip">
 	<name>src_ip</name>
 	<type>string</type>
 	<size>39</size>
     </column>
-    <column id="proto">
+
+    <column id="trusted.proto">
 	<name>proto</name>
 	<type>string</type>
 	<size>4</size>
     </column>
-    <column id="from_pattern">
+
+    <column id="trusted.from_pattern">
 	<name>from_pattern</name>
 	<type>string</type>
 	<size>64</size>
     </column>
+
     <index>
 	<name>trusted_idx</name>
-	<colref linkend="src_ip"/>
-	<colref linkend="proto"/>
-	<colref linkend="from_pattern"/>
+	<unique/>
+	<colref linkend="trusted.src_ip"/>
+	<colref linkend="trusted.proto"/>
+	<colref linkend="trusted.from_pattern"/>
     </index>
 </table>

db/schema/uri.xml

@@ -7,36 +7,49 @@
 
 ]>
 
-<table xmlns:my="http://iptel.org/dbschema/mysql">
+<table>
     <name>uri</name>
-    <version>1</version>
-    <column id="username">
-	<name>username</name>
+    <version>2</version>
+
+    <column id="uri.uid">
+	<name>uid</name>
 	<type>string</type>
-	<default></default>
-	<size>&user_len;</size>
+	<size>&id_len;</size>
     </column>
-    <column id="domain">
-	<name>domain</name>
+
+    <column id="uri.did">
+	<name>did</name>
 	<type>string</type>
-	<default></default>
-	<size>&domain_len;</size>
+	<size>&id_len;</size>
     </column>
-    <column id="uri_user">
-	<name>uri_user</name>
+
+    <column id="uri.username">
+	<name>username</name>
 	<type>string</type>
-	<default></default>
 	<size>&user_len;</size>
     </column>
-    <column>
-	<name>last_modified</name>
-	<type>datetime</type>
-	<default>1970-01-01 00:00:00</default>
+
+    <column id="uri.flags">
+	<name>flags</name>
+	<type>unsigned int</type>
+	<default>0</default>
+	<description>
+	    Various flags (is_from, is_to, is_disabled, is_canon).
+	</description>
     </column>
+
     <index>
 	<name>uri_idx1</name>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-	<colref linkend="uri_user"/>
+	<unique/>
+	<colref linkend="uri.username"/>
+	<colref linkend="uri.did"/>
+	<colref linkend="uri.flags"/>
+    </index>
+
+    <index>
+	<name>uri_uid</name>
+	<unique/>
+	<colref linkend="uri.uid"/>
+	<colref linkend="uri.flags"/>
     </index>
 </table>

db/schema/usr_preferences.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table xmlns:my="http://iptel.org/dbschema/mysql">
-    <name>usr_preferences</name>
-    <version>2</version>
-    <column>
-	<name>uuid</name>
-	<type>string</type>
-	<default></default>
-	<size>&uuid_len;</size>
-    </column>
-    <column id="username">
-	<name>username</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="attribute">
-	<name>attribute</name>
-	<type>string</type>
-	<default></default>
-	<size>32</size>
-    </column>
-    <column>
-	<name>value</name>
-	<type>string</type>
-	<default></default>
-	<size>128</size>
-    </column>
-    <column>
-	<name>type</name>
-	<type>int</type>
-	<default>0</default>
-    </column>
-    <column>
-	<name>modified</name>
-	<type>datetime</type>
-    </column>
-    <index>
-	<name>up_idx</name>
-	<colref linkend="attribute"/>
-	<colref linkend="username"/>
-	<colref linkend="domain"/>
-    </index>
-</table>

db/schema/usr_preferences_types.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
-  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
-
-<!ENTITY % entities SYSTEM "entities.xml">
-%entities;
-
-]>
-
-<table xmlns:my="http://iptel.org/dbschema/mysql">
-    <name>usr_preferences_types</name>
-    <version>1</version>
-    <column id="att_name">
-	<name>att_name</name>
-	<type>string</type>
-	<default></default>
-	<size>32</size>
-    </column>
-    <column>
-	<name>att_rich_type</name>
-	<type>string</type>
-	<default>string</default>
-	<size>32</size>
-    </column>
-    <column>
-	<name>att_raw_type</name>
-	<type>int</type>
-	<default>2</default>
-    </column>
-    <column>
-	<name>att_type_spec</name>
-	<type>string</type>
-	<size>255</size>
-	<null/>
-    </column>
-    <column>
-	<name>default_value</name>
-	<type>string</type>
-	<default></default>
-	<size>100</size>
-    </column>
-    <index>
-	<name>upt_idx1</name>
-	<colref linkend="att_name"/>
-    </index>
-</table>

db/schema/version.xml

@@ -25,40 +25,46 @@
 	<value col="tv"><xi:include href="acc.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn"><xi:include href="aliases.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="aliases.xml" xpointer="xpointer(table/version/text())"/></value>
-    </row>
-    <row>
-	<value col="tn"><xi:include href="grp.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="grp.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="missed_calls.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="missed_calls.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
 	<value col="tn"><xi:include href="location.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="location.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn"><xi:include href="missed_calls.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="missed_calls.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="credentials.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="credentials.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn"><xi:include href="pending.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="pending.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="domain.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="domain.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
+
     <row>
-	<value col="tn"><xi:include href="phonebook.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="phonebook.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="attr_types.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="attr_types.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn"><xi:include href="subscriber.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="subscriber.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="global_attrs.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="global_attrs.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn"><xi:include href="silo.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="silo.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="domain_attrs.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="domain_attrs.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn"><xi:include href="domain.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="domain.xml" xpointer="xpointer(table/version/text())"/></value>
+	<value col="tn"><xi:include href="user_attrs.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="user_attrs.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
+
+    <row>
+	<value col="tn"><xi:include href="phonebook.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="phonebook.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
+    <row>
+	<value col="tn"><xi:include href="silo.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="silo.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
 	<value col="tn"><xi:include href="uri.xml" xpointer="xpointer(table/name/text())"/></value>
@@ -68,14 +74,6 @@
 	<value col="tn"><xi:include href="server_monitoring.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="server_monitoring.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
-    <row>
-	<value col="tn"><xi:include href="usr_preferences.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="usr_preferences.xml" xpointer="xpointer(table/version/text())"/></value>
-    </row>
-    <row>
-	<value col="tn"><xi:include href="usr_preferences_types.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="usr_preferences_types.xml" xpointer="xpointer(table/version/text())"/></value>
-    </row>
     <row>
 	<value col="tn"><xi:include href="trusted.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="trusted.xml" xpointer="xpointer(table/version/text())"/></value>
@@ -85,14 +83,14 @@
 	<value col="tn"><xi:include href="server_monitoring_agg.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="server_monitoring_agg.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
-    <row>
-	<value col="tn"><xi:include href="admin_privileges.xml" xpointer="xpointer(table/name/text())"/></value>
-	<value col="tv"><xi:include href="admin_privileges.xml" xpointer="xpointer(table/version/text())"/></value>
-    </row>
     <row>
 	<value col="tn"><xi:include href="speed_dial.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="speed_dial.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
+    <row>
+	<value col="tn"><xi:include href="sd_attrs.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="sd_attrs.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
     <row>
 	<value col="tn"><xi:include href="gw.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="gw.xml" xpointer="xpointer(table/version/text())"/></value>