<!-- 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
db_schema for ims_usrloc_pcscf module
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4108
-- Commit Summary --
* lib/srdb1/schema: ims_usrloc_pcscf definitions * utils/kamctl: regenerate db table definitions
-- File Changes --
A src/lib/srdb1/schema/kamailio-ims_usrloc_pcscf.xml (12) A src/lib/srdb1/schema/location_pcscf.xml (436) A utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql (52) M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (99) A utils/kamctl/oracle/ims_usrloc_pcscf-create.sql (60) A utils/kamctl/postgres/ims_usrloc_pcscf-create.sql (52) A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod (167) A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table (51) M utils/kamctl/xhttp_pi/pi_framework.xml (218)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4108.patch https://github.com/kamailio/kamailio/pull/4108.diff
@linuxmaniac pushed 2 commits.
4128006bf4615fa82b40d0da1c0714f9032477ca lib/srdb1/schema: ims_usrloc_pcscf definitions a005e25bdc4740c8dae7eb8b8866a4ffbb7c4aad utils/kamctl: regenerate db table definitions
@linuxmaniac pushed 2 commits.
9caa3bc7cabfe5554fbaec5e7df66d8fb7cf96b0 lib/srdb1/schema: ims_usrloc_pcscf definitions 0d7d388182cc3b0d1747b001acaf87f96003bdb6 utils/kamctl: regenerate db table definitions
@henningw commented on this pull request.
Thanks for the PR. I have reviewed and added only one comment, where I was not sure if it was an intentional change. The CHAR to VARCHAR conversion is fine, I think - we are using VARCHAR everywhere usually.
- `protocol` INT(10) DEFAULT NULL,
+ `mode` VARCHAR(10) DEFAULT NULL, + `ck` VARCHAR(100) DEFAULT NULL, + `ik` VARCHAR(100) DEFAULT NULL, + `ealg` VARCHAR(20) DEFAULT NULL, + `ialg` VARCHAR(20) DEFAULT NULL, + `port_pc` INT(11) UNSIGNED DEFAULT NULL, + `port_ps` INT(11) UNSIGNED DEFAULT NULL, + `port_uc` INT(11) UNSIGNED DEFAULT NULL, + `port_us` INT(11) UNSIGNED DEFAULT NULL, + `spi_pc` INT(11) UNSIGNED DEFAULT NULL, + `spi_ps` INT(11) UNSIGNED DEFAULT NULL, + `spi_uc` INT(11) UNSIGNED DEFAULT NULL, + `spi_us` INT(11) UNSIGNED DEFAULT NULL, + `t_security_type` INT(11) DEFAULT NULL, + `t_protocol` INT(10) DEFAULT NULL,
This was char(5) before, maybe we want to convert to VARCHAR instead of INT?
@linuxmaniac commented on this pull request.
- `protocol` INT(10) DEFAULT NULL,
+ `mode` VARCHAR(10) DEFAULT NULL, + `ck` VARCHAR(100) DEFAULT NULL, + `ik` VARCHAR(100) DEFAULT NULL, + `ealg` VARCHAR(20) DEFAULT NULL, + `ialg` VARCHAR(20) DEFAULT NULL, + `port_pc` INT(11) UNSIGNED DEFAULT NULL, + `port_ps` INT(11) UNSIGNED DEFAULT NULL, + `port_uc` INT(11) UNSIGNED DEFAULT NULL, + `port_us` INT(11) UNSIGNED DEFAULT NULL, + `spi_pc` INT(11) UNSIGNED DEFAULT NULL, + `spi_ps` INT(11) UNSIGNED DEFAULT NULL, + `spi_uc` INT(11) UNSIGNED DEFAULT NULL, + `spi_us` INT(11) UNSIGNED DEFAULT NULL, + `t_security_type` INT(11) DEFAULT NULL, + `t_protocol` INT(10) DEFAULT NULL,
yes, copy paste error from my side. Thanks!
@linuxmaniac pushed 2 commits.
0ec4c4485c10601576eb9944a5e0719e24759637 lib/srdb1/schema: ims_usrloc_pcscf definitions e1c52fb930364c2eda267265c205b9730b4c835f utils/kamctl: regenerate db table definitions
Merged #4108 into master.
Thanks, merged
Was there a particular reason you only included a subset of the database tables in the re-generation commit? E.g. the dbtext tables are missing.