- Presence related tables added

db/schema/presentity.xml

@@ -0,0 +1,49 @@
+<?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 role="presence"
+    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>presentity</name>
+    <version>1</version>
+    
+    <column id="presentity.presid">
+	<name>presid</name>
+	<type>unsigned int</type>
+	<size>10</size>
+	<my:type>INT(10) UNSIGNED AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
+    </column>
+	
+    <column id="presentity.uri">
+	<name>uri</name>
+	<type>string</type>
+	<size>&uri_len;</size>
+    </column>
+
+    <column>
+	<name>pdomain</name>
+	<type>string</type>
+	<size>128</size>
+    </column>
+
+    <index>
+	<name>presentity_key</name>
+	<colref linkend="presentity.presid"/>
+	<unique/>
+    </index>
+
+    <index>
+	<name>presentity_key2</name>
+	<colref linkend="presentity.uri"/>
+    </index>
+</table>

db/schema/presentity_contact.xml

@@ -0,0 +1,110 @@
+<?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 role="presence"
+    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>presentity_contact</name>
+    <version>1</version>
+    
+    <column id="prescontact.contactid">
+	<name>contactid</name>
+	<type>unsigned int</type>
+	<size>10</size>
+	<my:type>INT(10) UNSIGNED AUTO_INCREMENT</my:type>
+	<pg:type>SERIAL</pg:type>
+	<dt:type>int,auto</dt:type>
+    </column>
+	
+    <column id="prescontact.presid">
+	<name>presid</name>
+	<type>unsigned int</type>
+	<size>10</size>
+    </column>
+
+    <column>
+	<name>basic</name>
+	<type>string</type>
+	<size>32</size>
+	<default>offline</default>
+    </column>
+
+    <column>
+	<name>status</name>
+	<type>string</type>
+	<size>32</size>
+    </column>
+
+    <column id="prescontact.location">
+	<name>location</name>
+	<type>string</type>
+	<size>128</size>
+    </column>
+
+    <column>
+	<name>expires</name>
+	<type>datetime</type>
+	<default>2020-05-28 21:32:15</default>
+    </column>
+
+    <column id="prescontact.placeid">
+	<name>placeid</name>
+	<type>int</type>
+	<size>10</size>
+	<null/>
+    </column>
+
+    <column>
+	<name>priority</name>
+	<type>float</type>
+	<default>0.5</default>
+    </column>
+
+    <column>
+	<name>contact</name>
+	<type>string</type>
+	<size>&uri_len;</size>
+	<null/>
+    </column>
+
+    <column>
+	<name>tupleid</name>
+	<type>string</type>
+	<size>64</size>
+    </column>
+
+    <column>
+	<name>prescaps</name>
+	<type>int</type>
+	<size>10</size>
+    </column>
+
+    <index>
+	<name>pc_idx1</name>
+	<colref linkend="prescontact.contactid"/>
+	<unique/>
+    </index>
+
+    <index>
+	<name>presid_index</name>
+	<colref linkend="prescontact.presid"/>
+    </index>
+
+    <index>
+	<name>location_index</name>
+	<colref linkend="prescontact.location"/>
+    </index>
+
+    <index>
+	<name>placeid_index</name>
+	<colref linkend="prescontact.placeid"/>
+    </index>
+</table>

db/schema/ser.xml

@@ -62,6 +62,11 @@
     <xi:include href="speed_dial.xml"/>
     <xi:include href="sd_attrs.xml"/>
 
+    <!-- Presence related tables -->
+    <xi:include href="presentity.xml"/>
+    <xi:include href="presentity_contact.xml"/>
+    <xi:include href="watcherinfo.xml"/>
+
     <!-- User with read/write access -->
     <user>
 	<username>ser</username>
@@ -75,5 +80,4 @@
 	<password>47serro11</password>
 	<privileges>SELECT</privileges>
     </user>
-
 </database>

db/schema/version.xml

@@ -103,4 +103,16 @@
 	<value col="tn"><xi:include href="lcr.xml" xpointer="xpointer(table/name/text())"/></value>
 	<value col="tv"><xi:include href="lcr.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
+    <row>
+	<value col="tn"><xi:include href="presentity.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="presentity.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
+    <row role="presence">
+	<value col="tn"><xi:include href="presentity_contact.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="presentity_contact.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
+    <row role="presence">
+	<value col="tn"><xi:include href="watcherinfo.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="watcherinfo.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
 </table>

db/schema/watcherinfo.xml

@@ -0,0 +1,105 @@
+<?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 role="presence">
+    <name>watcherinfo</name>
+    <version>1</version>
+    
+    <column id="watcherinfo.r_uri">
+	<name>r_uri</name>
+	<type>string</type>
+	<size>&uri_len;</size>
+    </column>
+	
+    <column id="watcherinfo.w_uri">
+	<name>w_uri</name>
+	<type>string</type>
+	<size>&uri_len;</size>
+    </column>
+
+    <column>
+	<name>display_name</name>
+	<type>string</type>
+	<size>128</size>
+    </column>
+
+    <column id="watcherinfo.s_id">
+	<name>s_id</name>
+	<type>string</type>
+	<size>64</size>
+    </column>
+
+    <column>
+	<name>package</name>
+	<type>string</type>
+	<size>32</size>
+	<default>presence</default>
+    </column>
+
+    <column>
+	<name>status</name>
+	<type>string</type>
+	<size>32</size>
+	<default>pending</default>
+    </column>
+
+    <column>
+	<name>event</name>
+	<type>string</type>
+	<size>32</size>
+    </column>
+
+    <column>
+	<name>expires</name>
+	<type>int</type>
+    </column>
+
+    <column>
+	<name>accepts</name>
+	<type>int</type>
+    </column>
+
+    <column>
+	<name>presid</name>
+	<type>unsigned int</type>
+	<size>10</size>
+    </column>
+
+    <column>
+	<name>server_contact</name>
+	<type>string</type>
+	<size>&uri_len;</size>
+    </column>
+
+    <column>
+	<name>dialog</name>
+	<type>binary</type>
+    </column>
+
+    <column>
+	<name>doc_index</name>
+	<type>int</type>
+    </column>
+
+    <index>
+	<name>wi_idx1</name>
+	<colref linkend="watcherinfo.s_id"/>
+	<unique/>
+    </index>
+
+    <index>
+	<name>wi_ruri_idx</name>
+	<colref linkend="watcherinfo.r_uri"/>
+    </index>
+
+    <index>
+	<name>wi_wuri_idx</name>
+	<colref linkend="watcherinfo.w_uri"/>
+    </index>
+</table>