<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4100
#### Description
add ims_usrloc_scscf definitions You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4110
-- Commit Summary --
* lib/srdb1/schema: ims_usrloc_scscf definitions
-- File Changes --
A src/lib/srdb1/schema/contact.xml (100) A src/lib/srdb1/schema/impu.xml (99) A src/lib/srdb1/schema/impu_contact.xml (52) A src/lib/srdb1/schema/impu_subscriber.xml (52) A src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml (16) A src/lib/srdb1/schema/subscriber_scscf.xml (123)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4110.patch https://github.com/kamailio/kamailio/pull/4110.diff
@linuxmaniac commented on this pull request.
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; + +]> + +<table id="subscriber_scscf" xmlns:db="http://docbook.org/ns/docbook"> + <name>subscriber</name>
having ``subscriber`` name interferes with `db_berkeley`
``` diff --git a/utils/kamctl/db_berkeley/kamailio/subscriber b/utils/kamctl/db_berkeley/kamailio/subscriber index 9289b67694..5611a298eb 100644 --- a/utils/kamctl/db_berkeley/kamailio/subscriber +++ b/utils/kamctl/db_berkeley/kamailio/subscriber @@ -1,10 +1,10 @@ METADATA_COLUMNS -id(int) username(str) domain(str) password(str) ha1(str) ha1b(str) +id(int) watcher_uri(str) watcher_contact(str) presentity_uri(str) event(int) expires(datetime) version(int) local_cseq(int) call_id(str) from_tag(str) from_tag(str) record_route(str) sockinfo_str(str) METADATA_KEY -1 2 + METADATA_READONLY 0 METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|''|''|'' +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL ``` ``` diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 7eed3ef264..eb4e312439 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -26,6 +26,8 @@ carrierfailureroute| carrierfailureroute|2 carrierroute| carrierroute|3 +contact| +contact|6 cpl| cpl|1 dbaliases| @@ -68,6 +70,12 @@ imc_members| imc_members|1 imc_rooms| imc_rooms|1 +impu| +impu|6 +impu_contact| +impu_contact|6 +impu_subscriber| +impu_subscriber|6 lcr_gw| lcr_gw|3 lcr_rule| @@ -127,7 +135,7 @@ sip_trace|4 speed_dial| speed_dial|2 subscriber| -subscriber|7 +subscriber|6 topos_d| topos_d|2 topos_t| ```
Regarding the overlapping of tables, we are probably having a similar issue with the "location" table from #4108.
The naming overlapping of the IMS tables was also discussed in this old issue #2575. It was suggested there to rename the IMS tables, e.g. to add an "ims_" prefix.
@linuxmaniac pushed 1 commit.
1163a06cc7c230dd880107128805b719b95a39ae lib/srdb1/schema: ims_usrloc_scscf definitions
@linuxmaniac pushed 1 commit.
e26ab929f4ae30373f253e36f5c0c834fcdfa13a lib/srdb1/schema: ims_usrloc_scscf definitions
Merged #4110 into master.
-
Henning Westerholt -
Victor Seva