[sr-dev] git:master: * core

[Juha Heinanen]

Module: sip-router
Branch: master
Commit: adc19f419c86897ff73934ea3791dcf4da564061
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adc19f419c86897ff73934ea3791dcf4da564061

Author: Juha Heinanen <jh at tutpro.com>
Committer: Juha Heinanen <jh at tutpro.com>
Date:   Mon Jun 22 17:36:59 2009 +0300

* core

* Updated gw and lcr table schemas.

---

 lib/srdb1/schema/gw.xml  |   25 +++++++++----------------
 lib/srdb1/schema/lcr.xml |   21 +++++++++------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/lib/srdb1/schema/gw.xml b/lib/srdb1/schema/gw.xml
index 554439d..e73d61b 100644
--- a/lib/srdb1/schema/gw.xml
+++ b/lib/srdb1/schema/gw.xml
@@ -10,7 +10,7 @@
 
 <table id="gw" xmlns:db="http://docbook.org/ns/docbook">
     <name>gw</name>
-    <version>9</version>
+    <version>10</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table contains Least Cost Routing Gateway definitions for the LCR module.
@@ -27,6 +27,12 @@
         <type db="dbtext">int,auto</type>
     </column>
 
+    <column id="lcr_id">
+        <name>lcr_id</name>
+        <type>unsigned short</type>
+        <description>LCR instance identifier</description>
+    </column>
+
     <column id="gw_name">
         <name>gw_name</name>
         <type>string</type>
@@ -101,13 +107,6 @@
     </column>
 
     <column>
-        <name>ping</name>
-        <type>unsigned char</type>
-        <default>0</default>
-        <description>Is gateway eligible for aliveness check (0 = no, 1 = yes)</description>
-    </column>
-
-    <column>
         <name>flags</name>
         <type>unsigned int</type>
         <default>&DEFAULT_FLAGS;</default>
@@ -115,14 +114,8 @@
     </column>
 
     <index>
-        <name>gw_name_idx</name>
-        <colref linkend="gw_name"/>
-        <unique/>
-    </index>
-
-    <index>
-        <name>grp_id_idx</name>
-        <colref linkend="grp_id"/>
+        <name>lcr_id_idx</name>
+        <colref linkend="lcr_id"/>
     </index>
 
 </table>
diff --git a/lib/srdb1/schema/lcr.xml b/lib/srdb1/schema/lcr.xml
index 8137db9..a2f055c 100644
--- a/lib/srdb1/schema/lcr.xml
+++ b/lib/srdb1/schema/lcr.xml
@@ -9,7 +9,7 @@
 
 <table id="lcr" xmlns:db="http://docbook.org/ns/docbook">
     <name>lcr</name>
-    <version>2</version>
+    <version>3</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table is used by the lcr (Least Cost Routing) rules.
@@ -26,6 +26,12 @@
         <type db="dbtext">int,auto</type>
     </column>
 
+    <column id="lcr_id">
+        <name>lcr_id</name>
+        <type>unsigned short</type>
+        <description>LCR instance identifier</description>
+    </column>
+
     <column id="prefix">
         <name>prefix</name>
         <type>string</type>
@@ -58,17 +64,8 @@
     </column>
 
     <index>
-        <name>prefix_idx</name>
-        <colref linkend="prefix"/>
+        <name>lcr_id_idx</name>
+        <colref linkend="lcr_id"/>
     </index>
 
-    <index>
-        <name>from_uri_idx</name>
-        <colref linkend="from_uri"/>
-    </index>
-
-    <index>
-        <name>grp_id_idx</name>
-        <colref linkend="grp_id"/>
-    </index>
 </table>