- use 'natural' instead of naturalkey, the primary and unique indexes

  keywords are 'primary' and 'unique' too


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3025 689a6050-402a-0410-94f2-e92a70836424

lib/srdb1/schema/acc.xml

@@ -54,7 +54,7 @@
     <column id="callid">
         <name>callid</name>
 	<type>string</type>
-	<naturalkey/>
+	<natural/>
         <size>&domain_len;</size>
         <default/>
         <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description>

lib/srdb1/schema/address.xml

@@ -33,7 +33,7 @@
         <size>5</size>
         <default>0</default>
         <description>Group</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/aliases.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&user_len;</size>
         <default/>
-	<naturalkey/>
+	<natural/>
         <description>Alias Username / Phone Number </description>
     </column>
 
@@ -41,7 +41,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <default/>
-	<naturalkey/>
+	<natural/>
         <description>Domain name</description>
     </column>
 

lib/srdb1/schema/carrierroute.xml

@@ -32,7 +32,7 @@
 			  <type>unsigned int</type>
 			  <size>&table_id_len;</size>
 			  <default>0</default>
-			  <naturalkey/>
+			  <natural/>
 			  <description>This column contains the carrier id.</description>
 		  </column>
 		  

lib/srdb1/schema/cpl.xml

@@ -30,7 +30,7 @@
         <name>username</name>
         <type>string</type>
         <size>&user_len;</size>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -38,7 +38,7 @@
         <type>string</type>
         <size>64</size>
         <default/>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/dbaliases.xml

@@ -33,7 +33,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Alias username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="alias_domain">
@@ -42,7 +42,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Alias domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="username">

lib/srdb1/schema/dialog.xml

@@ -34,7 +34,7 @@
 		<size>10</size>
 		<description>Number of the hash entry in the dialog hash table
 		</description>
-		<naturalkey/>
+		<natural/>
 	</column>
 
 	<column id="hash_id">
@@ -42,7 +42,7 @@
 		<type>unsigned int</type>
 		<size>10</size>
 		<description>The ID on the hash entry</description>
-		<naturalkey/>
+		<natural/>
 	</column>
 
 	<column>

lib/srdb1/schema/dispatcher.xml

@@ -32,7 +32,7 @@
         <type>int</type>
         <description>Destination set id</description>
         <default>0</default>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="dst">

lib/srdb1/schema/domain.xml

@@ -33,7 +33,7 @@
         <size>&domain_len;</size>
         <description>Domain name</description>
         <default/>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/domainpolicy.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&rule_len;</size>
         <description>Domain policy rule name which is equal to the URI as published in the domain policy NAPTRs.</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>
@@ -40,7 +40,7 @@
         <type>string</type>
         <size>&rule_len;</size>
         <description> Domain policy rule type. In the case of federation names, this is "fed". For standard referrals according to draft-lendl-speermint-technical-policy-00, this is "std". For direct domain lookups, this is "dom". Default value is "type".</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="att">

lib/srdb1/schema/grp.xml

@@ -33,7 +33,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -42,7 +42,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="group">
@@ -51,7 +51,7 @@
         <size>&id_len;</size>
         <default/>
         <description>Group name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/gw.xml

@@ -33,7 +33,7 @@
         <type>string</type>
         <size>128</size>
         <description>Gateway Name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="grp_id">

lib/srdb1/schema/gw_grp.xml

@@ -32,6 +32,6 @@
         <type>string</type>
         <size>&id_len;</size>
         <description>Group name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 </table>

lib/srdb1/schema/imc_members.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>Username</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -40,14 +40,14 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>Domain</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="room">
         <name>room</name>
         <type>string</type>
         <size>&realm_len;</size>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/imc_rooms.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>Name of the room</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -40,7 +40,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>Domain of the room</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/lcr.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>16</size>
         <description>The Request-URI (destination) prefix.</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="from_uri">

lib/srdb1/schema/location.xml

@@ -33,7 +33,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Username / phone number </description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -42,7 +42,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="contact">

lib/srdb1/schema/missed_calls.xml

@@ -56,7 +56,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description>
-	<naturalkey/>
+	<natural/>
     </column>
     
     <column>

lib/srdb1/schema/pdt.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&uri_len;</size>
         <description>Source domain</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="prefix">

lib/srdb1/schema/pr_active_watchers.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&uri_len;</size>
         <description>Presence URI</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>
@@ -69,7 +69,7 @@
         <size>&user_len;</size>
         <default>presence</default>
         <description>Event description</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/pr_presentity.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&user_len;</size>
         <description>User name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -40,7 +40,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>Domain</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="event">
@@ -48,7 +48,7 @@
         <type>string</type>
         <size>&user_len;</size>
         <description>Event</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="etag">

lib/srdb1/schema/pr_pua.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&uri_len;</size>
         <description>URI</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>
@@ -47,7 +47,7 @@
         <type>int</type>
         <size>11</size>
         <description>Event</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/pr_watchers.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&uri_len;</size>
         <description>Presentity Uri</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="watcher_username">
@@ -55,7 +55,7 @@
         <size>&user_len;</size>
         <default>presence</default>
         <description>Event description</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/pr_xcap.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>&user_len;</size>
         <description>User name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -40,7 +40,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>Domain</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/re_grp.xml

@@ -41,7 +41,7 @@
         <size>11</size>
         <default>0</default>
         <description>Group ID</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <index>

lib/srdb1/schema/rls_presentity.xml

@@ -32,7 +32,7 @@
         <type>string</type>
         <size>512</size>
         <description>Resource list subscribe dialog id</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="resource_uri">

lib/srdb1/schema/rls_watchers.xml

@@ -54,7 +54,7 @@
         <type>string</type>
         <size>&user_len;</size>
         <description>From user</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>
@@ -62,7 +62,7 @@
         <type>string</type>
         <size>&domain_len;</size>
         <description>From domain</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/route_tree.xml

@@ -22,7 +22,7 @@
 			  <size>&table_id_len;</size>
 			  <primary/>
 			  <default>0</default>
-			  <naturalkey/>
+			  <natural/>
 			  <description>unique ID</description>
 		  </column>
 		  

lib/srdb1/schema/silo.xml

@@ -49,7 +49,7 @@
         <size>&user_len;</size>
         <default/>
         <description>SIP domain of target user</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -58,7 +58,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Username / phone number of target user</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/sip_trace.xml

@@ -40,7 +40,7 @@
         <size>&hf_len;</size>
         <default/>
         <description>call ID from SIP message</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="traced_user">

lib/srdb1/schema/speed_dial.xml

@@ -33,7 +33,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -42,7 +42,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="sd_username">

lib/srdb1/schema/subscriber.xml

@@ -33,7 +33,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -42,7 +42,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/template.xml

@@ -42,7 +42,7 @@
         <name>test123</name>
         <type>string</type>
         <size>25</size>
-        <naturalkey/><!-- This column is a natural key for non SQL databases, e.g. db_berkeley -->
+        <natural/><!-- This column is a natural key for non SQL databases, e.g. db_berkeley -->
     </column>
 
     <index>

lib/srdb1/schema/trusted.xml

@@ -34,7 +34,7 @@
         <type>string</type>
         <size>&ip_add_len;</size>
         <description>Source address is equal to source address of request</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/uri.xml

@@ -33,7 +33,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -42,7 +42,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="uri_user">
@@ -51,7 +51,7 @@
         <size>&user_len;</size>
         <default/>
         <description>Username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column>

lib/srdb1/schema/usr_preferences.xml

@@ -41,7 +41,7 @@
         <size>&uri_len;</size>
         <default>0</default>
         <description>Username / phone number</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="domain">
@@ -50,7 +50,7 @@
         <size>&domain_len;</size>
         <default/>
         <description>Domain name</description>
-	<naturalkey/>
+	<natural/>
     </column>
 
     <column id="attribute">

lib/srdb1/schema/version.xml

@@ -14,7 +14,7 @@
         <name>table_name</name>
         <type>string</type>
         <size>32</size>
-	<naturalkey/>
+	<natural/>
     </column>
     <column id="tv">
         <name>table_version</name>