[sr-dev] git:master: lib/srdb1: update custom sql functions for uid tables

[Daniel-Constantin Mierla]

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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Wed Jan 23 12:55:51 2013 +0100

lib/srdb1: update custom sql functions for uid tables

---

 lib/srdb1/schema/uid_domain.xml                    |    4 ++--
 lib/srdb1/schema/uid_uri.xml                       |    2 +-
 utils/kamctl/db_berkeley/kamailio/uid_global_attrs |    2 --
 utils/kamctl/db_berkeley/kamailio/version          |    2 ++
 utils/kamctl/dbtext/kamailio/uid_global_attrs      |    1 -
 utils/kamctl/dbtext/kamailio/version               |    1 +
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/srdb1/schema/uid_domain.xml b/lib/srdb1/schema/uid_domain.xml
index ee7e417..b40be63 100644
--- a/lib/srdb1/schema/uid_domain.xml
+++ b/lib/srdb1/schema/uid_domain.xml
@@ -216,7 +216,7 @@ create function todomain (pdid varchar(64)) returns varchar(128)
 READS SQL DATA
 begin
     declare tdomain varchar(128) default NULL;
-	select domain into tdomain from domain where did=pdid and 
+	select domain into tdomain from uid_domain where did=pdid and 
         canonical(flags) limit 1;
 	return tdomain;
 end
@@ -238,7 +238,7 @@ create function todid (pdomain varchar(128)) returns varchar(64)
 READS SQL DATA
 begin
     declare tdid varchar(64) default NULL;
-    select did into tdid from domain where domain=pdomain and 
+    select did into tdid from uid_domain where domain=pdomain and 
         active(flags) limit 1;
 	return tdid;
 end
diff --git a/lib/srdb1/schema/uid_uri.xml b/lib/srdb1/schema/uid_uri.xml
index 14df1ed..d6a00d5 100644
--- a/lib/srdb1/schema/uid_uri.xml
+++ b/lib/srdb1/schema/uid_uri.xml
@@ -124,7 +124,7 @@ begin
         set tdid = todid(substr(puri FROM i + 1));
 	    set puri = left(puri, i - 1);
 	end if;
-	select uid into tuid from uri where scheme=tscheme and
+	select uid into tuid from uid_uri where scheme=tscheme and
         username=puri and did=tdid and active(flags);
 	return tuid;
 end
diff --git a/utils/kamctl/db_berkeley/kamailio/uid_global_attrs b/utils/kamctl/db_berkeley/kamailio/uid_global_attrs
index 1f38fd5..13286a5 100644
--- a/utils/kamctl/db_berkeley/kamailio/uid_global_attrs
+++ b/utils/kamctl/db_berkeley/kamailio/uid_global_attrs
@@ -8,5 +8,3 @@ METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
 NIL|NIL|0|NIL|0
-uid_global_attrs|
-uid_global_attrs|1
diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version
index d943184..eb1d8e7 100644
--- a/utils/kamctl/db_berkeley/kamailio/version
+++ b/utils/kamctl/db_berkeley/kamailio/version
@@ -114,6 +114,8 @@ uid_domain|
 uid_domain|2
 uid_domain_attrs|
 uid_domain_attrs|1
+uid_global_attrs|
+uid_global_attrs|1
 uid_uri|
 uid_uri|3
 uid_uri_attrs|
diff --git a/utils/kamctl/dbtext/kamailio/uid_global_attrs b/utils/kamctl/dbtext/kamailio/uid_global_attrs
index 95f5806..46ab50c 100644
--- a/utils/kamctl/dbtext/kamailio/uid_global_attrs
+++ b/utils/kamctl/dbtext/kamailio/uid_global_attrs
@@ -1,2 +1 @@
 id(int,auto) name(string) type(int) value(string,null) flags(int) 
-uid_global_attrs:1
diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version
index 714c133..9a3fe62 100644
--- a/utils/kamctl/dbtext/kamailio/version
+++ b/utils/kamctl/dbtext/kamailio/version
@@ -52,6 +52,7 @@ uacreg:1
 uid_credentials:7
 uid_domain:2
 uid_domain_attrs:1
+uid_global_attrs:1
 uid_uri:3
 uid_uri_attrs:2
 uid_user_attrs:3