modules/b2b_logic: fix b2b_logic lable for dbtext

 - allow scenario, e1_sid and e2_sid fields to be NULL

db/schema/b2b_logic.xml

@@ -9,7 +9,7 @@
 
 <table id="b2b_logic" xmlns:db="http://docbook.org/ns/docbook">
     <name>b2b_logic</name>
-    <version>2</version>
+    <version>3</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>Table for the b2b_logic module. More information can be found at: &OPENSIPS_MOD_DOC;b2b_logic.html
@@ -39,6 +39,7 @@
         <name>scenario</name>
         <type>string</type>
         <size>&user_len;</size>
+        <null/>
         <description>Scenario id</description>
     </column>
 
@@ -123,6 +124,7 @@
         <name>e1_sid</name>
         <type>string</type>
         <size>&user_len;</size>
+        <null/>
         <description>E1 Scenario ID</description>
     </column>
 
@@ -159,6 +161,7 @@
         <name>e2_sid</name>
         <type>string</type>
         <size>&user_len;</size>
+        <null/>
         <description>E2 Scenario ID</description>
     </column>
 

modules/b2b_logic/b2b_logic.c

@@ -48,7 +48,7 @@
 #include "b2b_load.h"
 #include "b2bl_db.h"
 
-#define TABLE_VERSION 2
+#define TABLE_VERSION 3
 
 /** Functions declarations */
 static int mod_init(void);

scripts/db_berkeley/opensips/version

@@ -19,7 +19,7 @@ aliases|1009
 b2b_entities|
 b2b_entities|1
 b2b_logic|
-b2b_logic|2
+b2b_logic|3
 b2b_sca|
 b2b_sca|1
 cachedb|

scripts/dbtext/opensips/b2b_logic

@@ -1 +1 @@
-id(int,auto) si_key(string) scenario(string) sstate(int) next_sstate(int) sparam0(string,null) sparam1(string,null) sparam2(string,null) sparam3(string,null) sparam4(string,null) sdp(string,null) lifetime(int) e1_type(int) e1_sid(string) e1_from(string) e1_to(string) e1_key(string) e2_type(int) e2_sid(string) e2_from(string) e2_to(string) e2_key(string) e3_type(int,null) e3_sid(string,null) e3_from(string,null) e3_to(string,null) e3_key(string,null) 
+id(int,auto) si_key(string) scenario(string,null) sstate(int) next_sstate(int) sparam0(string,null) sparam1(string,null) sparam2(string,null) sparam3(string,null) sparam4(string,null) sdp(string,null) lifetime(int) e1_type(int) e1_sid(string,null) e1_from(string) e1_to(string) e1_key(string) e2_type(int) e2_sid(string,null) e2_from(string) e2_to(string) e2_key(string) e3_type(int,null) e3_sid(string,null) e3_from(string,null) e3_to(string,null) e3_key(string,null) 

scripts/dbtext/opensips/version

@@ -4,7 +4,7 @@ active_watchers:11
 address:5
 aliases:1009
 b2b_entities:1
-b2b_logic:2
+b2b_logic:3
 b2b_sca:1
 cachedb:2
 carrierfailureroute:2

scripts/mysql/b2b-create.sql

@@ -32,11 +32,11 @@ CREATE TABLE b2b_entities (
 
 CREATE INDEX b2b_entities_param ON b2b_entities (param);
 
-INSERT INTO version (table_name, table_version) values ('b2b_logic','2');
+INSERT INTO version (table_name, table_version) values ('b2b_logic','3');
 CREATE TABLE b2b_logic (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     si_key CHAR(64) NOT NULL,
-    scenario CHAR(64) NOT NULL,
+    scenario CHAR(64),
     sstate INT(2) NOT NULL,
     next_sstate INT(2) NOT NULL,
     sparam0 CHAR(64),
@@ -47,12 +47,12 @@ CREATE TABLE b2b_logic (
     sdp TEXT(64),
     lifetime INT(10) DEFAULT 0 NOT NULL,
     e1_type INT(2) NOT NULL,
-    e1_sid CHAR(64) NOT NULL,
+    e1_sid CHAR(64),
     e1_from CHAR(128) NOT NULL,
     e1_to CHAR(128) NOT NULL,
     e1_key CHAR(64) NOT NULL,
     e2_type INT(2) NOT NULL,
-    e2_sid CHAR(64) NOT NULL,
+    e2_sid CHAR(64),
     e2_from CHAR(128) NOT NULL,
     e2_to CHAR(128) NOT NULL,
     e2_key CHAR(64) NOT NULL,

scripts/oracle/b2b-create.sql

@@ -40,7 +40,7 @@ BEGIN map2users('b2b_entities'); END;
 /
 CREATE INDEX ORA_b2b_entities_param  ON b2b_entities (param);
 
-INSERT INTO version (table_name, table_version) values ('b2b_logic','2');
+INSERT INTO version (table_name, table_version) values ('b2b_logic','3');
 CREATE TABLE b2b_logic (
     id NUMBER(10) PRIMARY KEY,
     si_key VARCHAR2(64),

scripts/postgres/b2b-create.sql

@@ -33,11 +33,11 @@ CREATE TABLE b2b_entities (
 ALTER SEQUENCE b2b_entities_id_seq MAXVALUE 2147483647 CYCLE;
 CREATE INDEX b2b_entities_b2b_entities_param ON b2b_entities (param);
 
-INSERT INTO version (table_name, table_version) values ('b2b_logic','2');
+INSERT INTO version (table_name, table_version) values ('b2b_logic','3');
 CREATE TABLE b2b_logic (
     id SERIAL PRIMARY KEY NOT NULL,
     si_key VARCHAR(64) NOT NULL,
-    scenario VARCHAR(64) NOT NULL,
+    scenario VARCHAR(64),
     sstate INTEGER NOT NULL,
     next_sstate INTEGER NOT NULL,
     sparam0 VARCHAR(64),
@@ -48,12 +48,12 @@ CREATE TABLE b2b_logic (
     sdp TEXT,
     lifetime INTEGER DEFAULT 0 NOT NULL,
     e1_type INTEGER NOT NULL,
-    e1_sid VARCHAR(64) NOT NULL,
+    e1_sid VARCHAR(64),
     e1_from VARCHAR(128) NOT NULL,
     e1_to VARCHAR(128) NOT NULL,
     e1_key VARCHAR(64) NOT NULL,
     e2_type INTEGER NOT NULL,
-    e2_sid VARCHAR(64) NOT NULL,
+    e2_sid VARCHAR(64),
     e2_from VARCHAR(128) NOT NULL,
     e2_to VARCHAR(128) NOT NULL,
     e2_key VARCHAR(64) NOT NULL,

scripts/sqlite/b2b-create.sql

@@ -32,11 +32,11 @@ CREATE TABLE b2b_entities (
 
 CREATE INDEX ORA_b2b_entities_param  ON b2b_entities (param);
 
-INSERT INTO version (table_name, table_version) values ('b2b_logic','2');
+INSERT INTO version (table_name, table_version) values ('b2b_logic','3');
 CREATE TABLE b2b_logic (
     id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
     si_key CHAR(64) NOT NULL,
-    scenario CHAR(64) NOT NULL,
+    scenario CHAR(64),
     sstate INTEGER NOT NULL,
     next_sstate INTEGER NOT NULL,
     sparam0 CHAR(64),
@@ -47,12 +47,12 @@ CREATE TABLE b2b_logic (
     sdp TEXT(64),
     lifetime INTEGER DEFAULT 0 NOT NULL,
     e1_type INTEGER NOT NULL,
-    e1_sid CHAR(64) NOT NULL,
+    e1_sid CHAR(64),
     e1_from CHAR(128) NOT NULL,
     e1_to CHAR(128) NOT NULL,
     e1_key CHAR(64) NOT NULL,
     e2_type INTEGER NOT NULL,
-    e2_sid CHAR(64) NOT NULL,
+    e2_sid CHAR(64),
     e2_from CHAR(128) NOT NULL,
     e2_to CHAR(128) NOT NULL,
     e2_key CHAR(64) NOT NULL,