- added version directly in tables

- version table data crosslinked

db/schema/active_sessions.xml

@@ -8,7 +8,8 @@
 ]>
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>active_sessions</name>
-
+    <version>1</version>
+    
     <column id="sid">
 	<name>sid</name>
 	<type>string</type>

db/schema/admin_privileges.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>admin_privileges</name>
+    <version>1</version>
+
     <column id="username">
 	<name>username</name>
 	<type>string</type>

db/schema/aliases.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>aliases</name>
+    <version>6</version>
+
     <column id="username">
 	<name>username</name>
 	<type>string</type>

db/schema/call_forwarding.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>call_forwarding</name>
+    <version>1</version>
+
     <column id="username">
 	<name>username</name>
 	<type>string</type>

db/schema/config.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>config</name>
+    <version>1</version>
+
     <column>
 	<name>attribute</name>
 	<type>string</type>

db/schema/domain.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>domain</name>
+    <version>1</version>
+
     <column id="domain">
 	<name>domain</name>
 	<type>string</type>

db/schema/event.xml

@@ -8,6 +8,8 @@
 ]>
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>event</name>
+    <version>1</version>
+
     <column id="id">
 	<name>id</name>
 	<type>unsigned int</type>

db/schema/grp.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>grp</name>
+    <version>2</version>
+    
     <column id="username">
 	<name>username</name>
 	<type>string</type>

db/schema/gw.xml

@@ -9,6 +9,7 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>gw</name>
+    <version>2</version>
     <column id="gw_name">
 	<name>gw_name</name>
 	<type>string</type>

db/schema/gw_grp.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>gw_grp</name>
+    <version>2</version>
+
     <column>
 	<name>grp_id</name>
 	<type auto_increment="yes">int</type>

db/schema/lcr.xml

@@ -9,6 +9,7 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>lcr</name>
+    <version>1</version>
     <column id="prefix">
 	<name>prefix</name>
 	<type>string</type>

db/schema/missed_calls.xml

@@ -9,6 +9,7 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>missed_calls</name>
+    <version>2</version>
     <column>
 	<name>sip_from</name>
 	<type>string</type>

db/schema/pending.xml

@@ -9,6 +9,8 @@
 
 <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>

db/schema/phonebook.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>phonebook</name>
+    <version>1</version>
+
     <column id="id">
 	<name>id</name>
 	<type>unsigned int</type>

db/schema/reserved.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>reserved</name>
+    <version>1</version>
+
     <description>
 	Table structure for table 'reserved' -- reserved username which should
 	be never allowed for subscription.

db/schema/server_monitoring.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>server_monitoring</name>
+    <version>1</version>
+
     <column>
 	<name>time</name>
 	<type>datetime</type>

db/schema/server_monitoring_agg.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>server_monitoring_agg</name>
+    <version>1</version>
+
     <column id="param">
 	<name>param</name>
 	<type>string</type>

db/schema/silo.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>silo</name>
+    <version>3</version>
+
     <column id="mid">
 	<name>mid</name>
 	<type auto_increment="yes">unsigned int</type>

db/schema/speed_dial.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>speed_dial</name>
+    <version>2</version>
+
     <column>
 	<name>uuid</name>
 	<type>string</type>

db/schema/subscriber.xml

@@ -9,6 +9,8 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>subscriber</name>
+    <version>5</version>
+
     <column id="phplib_id">
 	<name>phplib_id</name>
 	<type>string</type>

db/schema/trusted.xml

@@ -9,6 +9,7 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>trusted</name>
+    <version>1</version>
     <column id="src_ip">
 	<name>src_ip</name>
 	<type>string</type>

db/schema/uri.xml

@@ -9,6 +9,7 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>uri</name>
+    <version>1</version>
     <column id="username">
 	<name>username</name>
 	<type>string</type>

db/schema/usr_preferences.xml

@@ -9,6 +9,7 @@
 
 <table xmlns:my="http://iptel.org/dbschema/mysql">
     <name>usr_preferences</name>
+    <version>2</version>
     <column>
 	<name>uuid</name>
 	<type>string</type>

db/schema/usr_preferences_types.xml

@@ -9,6 +9,7 @@
 
 <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>

db/schema/version.xml

@@ -2,125 +2,125 @@
 <!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
   "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd">
 
-<table id="version" xmlns:my="http://iptel.org/dbschema/mysql" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:dt="http://iptel.org/dbschema/dbtext">
+<table id="version" xmlns:xi="http://www.w3.org/2001/XInclude">
     <name>
 	version
     </name>
-    <my:type>MyISAm</my:type>
+
     <column id="tn">
 	<name>table_name</name>
 	<type>string</type>
 	<size>32</size>
     </column>
-    
     <column id="tv">
 	<name>table_version</name>
 	<type>unsigned int</type>
 	<default>0</default>
     </column>
-
+    
     <row>
-	<value col="tn">acc</value>
-	<dt:value col="tv">2</dt:value>
+	<value col="tn"><xi:include href="acc.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="acc.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
-
     <row>
-	<value col="tn">active_sessions</value>
-	<value col="tv">1</value></row>
+	<value col="tn"><xi:include href="active_sessions.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="active_sessions.xml" xpointer="xpointer(table/version/text())"/></value>
+    </row>
     <row>
-	<value col="tn">aliases</value>
-	<value col="tv">6</value>
+	<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">event</value>
-	<value col="tv">1</value>
+	<value col="tn"><xi:include href="event.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="event.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn">grp</value>
-	<value col="tv">2</value>
+	<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>
     </row>
     <row>
-	<value col="tn">location</value>
-	<value col="tv">6</value>
+	<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">missed_calls</value>
-	<value col="tv">2</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">pending</value>
-	<value col="tv">4</value>
+	<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>
     </row>
     <row>
-	<value col="tn">phonebook</value>
-	<value col="tv">1</value>
+	<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">reserved</value>
-	<value col="tv">1</value>
+	<value col="tn"><xi:include href="reserved.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="reserved.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn">subscriber</value>
-	<value col="tv">5</value>
+	<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>
     </row>
     <row>
-	<value col="tn">config</value>
-	<value col="tv">1</value>
+	<value col="tn"><xi:include href="config.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="config.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn">silo</value>
-	<value col="tv">3</value>
+	<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">domain</value>
-	<value col="tv">1</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">uri</value>
-	<value col="tv">1</value>
+	<value col="tn"><xi:include href="uri.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="uri.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn">server_monitoring</value>
-	<value col="tv">1</value>
+	<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">usr_preferences</value>
-	<value col="tv">2</value>
+	<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">usr_preferences_types</value>
-	<value col="tv">1</value>
+	<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">trusted</value>
-	<value col="tv">1</value>
+	<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>
+	
     </row>
     <row>
-	<value col="tn">server_monitoring_agg</value>
-	<value col="tv">1</value>
+	<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">admin_privileges</value>
-	<value col="tv">1</value>
+	<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">call_forwarding</value>
-	<value col="tv">1</value>
+	<value col="tn"><xi:include href="call_forwarding.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="call_forwarding.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-	<value col="tn">speed_dial</value>
-	<value col="tv">2</value>
+	<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">gw</value>
-	<value col="tv">2</value>
+	<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>
     </row>
     <row>
-	<value col="tn">gw_grp</value>
-	<value col="tv">2</value>
+	<value col="tn"><xi:include href="gw_grp.xml" xpointer="xpointer(table/name/text())"/></value>
+	<value col="tv"><xi:include href="gw_grp.xml" xpointer="xpointer(table/version/text())"/></value>
     </row>
     <row>
-    	<value col="tn">lcr</value>
-	<value col="tv">1</value>
+	<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>
 </table>