@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| ```