srdb1/kamctl: added definition of table uid_user_attrs

lib/srdb1/schema/kamailio-uid_avp_db.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE database 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;
+]>
+
+<database xmlns:xi="http://www.w3.org/2001/XInclude">
+    <name>uid_user_attrs</name>
+    <xi:include href="uid_user_attrs.xml"/>
+</database>

lib/srdb1/schema/uid_user_attrs.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE table PUBLIC "-//iptel.org//DTD DBSchema V1.0//EN"
+  "http://iptel.org/dbschema/dtd/1.0/dbschema.dtd" [
+
+<!ENTITY % entities SYSTEM "entities.xml">
+%entities;
+
+]>
+
+<table>
+  <name>uid_user_attrs</name>
+  <version>3</version>
+  <type db="mysql">&MYSQL_TABLE_TYPE;</type>
+  <description>
+	Per user attributes loaded with uid_avp_db module.
+  </description>
+
+  <column id="id">
+    <name>id</name>
+    <type>unsigned int</type>
+    <size>&table_id_len;</size>
+    <autoincrement/>
+    <primary/>
+    <type db="dbtext">int,auto</type>
+    <description>Unique ID</description>
+  </column>
+
+  <column id="userattrs.uid">
+	<name>uid</name>
+	<name db="oracle">uuid</name>
+	<type>string</type>
+	<size>&id_len;</size>
+  </column>
+
+  <column id="userattrs.name">
+	<name>name</name>
+	<type>string</type>
+	<size>&avp_name_len;</size>
+  </column>
+
+  <column id="userattrs.value">
+	<name>value</name>
+	<type>string</type>
+	<null/>
+	<size>&avp_val_len;</size>
+  </column>
+
+  <column>
+	<name>type</name>
+	<type>int</type>
+	<default>0</default>
+  </column>
+
+  <column id="userattrs.flags">
+	<name>flags</name>
+	<type>unsigned int</type>
+	<default>0</default>
+	<description>
+	  Various flags (SER_LOAD and such).
+	</description>
+  </column>
+
+  <index>
+	<unique/>
+	<name>userattrs_idx</name>
+	<colref linkend="userattrs.uid"/>
+	<colref linkend="userattrs.name"/>
+	<colref linkend="userattrs.value"/>
+  </index>
+
+</table>

utils/kamctl/db_berkeley/kamailio/uid_credentials

@@ -8,5 +8,3 @@ METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
 NIL|NIL|'_default'|NIL|''|0|NIL|''|NIL
-uid_credentials|
-uid_credentials|7

utils/kamctl/db_berkeley/kamailio/uid_user_attrs

@@ -0,0 +1,12 @@
+METADATA_COLUMNS
+id(int) uid(str) name(str) value(str) type(int) flags(int)
+METADATA_KEY
+
+METADATA_READONLY
+0
+METADATA_LOGFLAGS
+0
+METADATA_DEFAULTS
+NIL|NIL|NIL|NIL|0|0
+uid_user_attrs|
+uid_user_attrs|3

utils/kamctl/db_berkeley/kamailio/version

@@ -108,6 +108,8 @@ trusted|
 trusted|5
 uacreg|
 uacreg|1
+uid_credentials|
+uid_credentials|7
 uri|
 uri|1
 userblacklist|

utils/kamctl/db_sqlite/uid_avp_db-create.sql

@@ -0,0 +1,11 @@
+INSERT INTO version (table_name, table_version) values ('uid_user_attrs','3');
+CREATE TABLE uid_user_attrs (
+    id INTEGER PRIMARY KEY NOT NULL,
+    uid VARCHAR(64) NOT NULL,
+    name VARCHAR(32) NOT NULL,
+    value VARCHAR(128),
+    type INTEGER DEFAULT 0 NOT NULL,
+    flags INTEGER DEFAULT 0 NOT NULL,
+    CONSTRAINT uid_user_attrs_userattrs_idx UNIQUE (uid, name, value)
+);
+

utils/kamctl/dbtext/kamailio/uid_credentials

@@ -1,2 +1 @@
 id(int,auto) auth_username(string) did(string) realm(string) password(string) flags(int) ha1(string) ha1b(string) uid(string) 
-uid_credentials:7

utils/kamctl/dbtext/kamailio/uid_user_attrs

@@ -0,0 +1,2 @@
+id(int,auto) uid(string) name(string) value(string,null) type(int) flags(int) 
+uid_user_attrs:3

utils/kamctl/dbtext/kamailio/version

@@ -49,6 +49,7 @@ speed_dial:2
 subscriber:6
 trusted:5
 uacreg:1
+uid_credentials:7
 uri:1
 userblacklist:1
 usr_preferences:2

utils/kamctl/mysql/uid_avp_db-create.sql

@@ -0,0 +1,11 @@
+INSERT INTO version (table_name, table_version) values ('uid_user_attrs','3');
+CREATE TABLE uid_user_attrs (
+    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    uid VARCHAR(64) NOT NULL,
+    name VARCHAR(32) NOT NULL,
+    value VARCHAR(128),
+    type INT DEFAULT 0 NOT NULL,
+    flags INT UNSIGNED DEFAULT 0 NOT NULL,
+    CONSTRAINT userattrs_idx UNIQUE (uid, name, value)
+) ENGINE=MyISAM;
+

utils/kamctl/oracle/uid_avp_db-create.sql

@@ -0,0 +1,19 @@
+INSERT INTO version (table_name, table_version) values ('uid_user_attrs','3');
+CREATE TABLE uid_user_attrs (
+    id NUMBER(10) PRIMARY KEY,
+    uuid VARCHAR2(64),
+    name VARCHAR2(32),
+    value VARCHAR2(128),
+    type NUMBER(10) DEFAULT 0 NOT NULL,
+    flags NUMBER(10) DEFAULT 0 NOT NULL,
+    CONSTRAINT uid_user_attrs_userattrs_idx  UNIQUE (uuid, name, value)
+);
+
+CREATE OR REPLACE TRIGGER uid_user_attrs_tr
+before insert on uid_user_attrs FOR EACH ROW
+BEGIN
+  auto_id(:NEW.id);
+END uid_user_attrs_tr;
+/
+BEGIN map2users('uid_user_attrs'); END;
+/

utils/kamctl/postgres/uid_avp_db-create.sql

@@ -0,0 +1,11 @@
+INSERT INTO version (table_name, table_version) values ('uid_user_attrs','3');
+CREATE TABLE uid_user_attrs (
+    id SERIAL PRIMARY KEY NOT NULL,
+    uid VARCHAR(64) NOT NULL,
+    name VARCHAR(32) NOT NULL,
+    value VARCHAR(128),
+    type INTEGER DEFAULT 0 NOT NULL,
+    flags INTEGER DEFAULT 0 NOT NULL,
+    CONSTRAINT uid_user_attrs_userattrs_idx UNIQUE (uid, name, value)
+);
+

utils/kamctl/xhttp_pi/pi_framework.xml

@@ -716,6 +716,17 @@
 		<column><field>ha1b</field><type>DB1_STR</type></column>
 		<column><field>uid</field><type>DB1_STR</type></column>
 	</db_table>
+	<!-- Declaration of uid_user_attrs table-->
+	<db_table id="uid_user_attrs">
+		<table_name>uid_user_attrs</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>uid</field><type>DB1_STR</type></column>
+		<column><field>name</field><type>DB1_STR</type></column>
+		<column><field>value</field><type>DB1_STR</type></column>
+		<column><field>type</field><type>DB1_INT</type></column>
+		<column><field>flags</field><type>DB1_INT</type></column>
+	</db_table>
 	<!-- Declaration of uri table-->
 	<db_table id="uri">
 		<table_name>uri</table_name>
@@ -1715,6 +1726,21 @@
 			</query_cols>
 		</cmd>
 	</mod>
+	<!-- uid_user_attrs provisionning -->
+	<mod><mod_name>uid_user_attrs</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>uid_user_attrs</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field></col>
+				<col><field>uid</field></col>
+				<col><field>name</field></col>
+				<col><field>value</field></col>
+				<col><field>type</field></col>
+				<col><field>flags</field></col>
+			</query_cols>
+		</cmd>
+	</mod>
 	<!-- uri provisionning -->
 	<mod><mod_name>uri</mod_name>
 		<cmd><cmd_name>show</cmd_name>

utils/kamctl/xhttp_pi/uid_avp_db-mod

@@ -0,0 +1,15 @@
+	<!-- uid_user_attrs provisionning -->
+	<mod><mod_name>uid_user_attrs</mod_name>
+		<cmd><cmd_name>show</cmd_name>
+			<db_table_id>uid_user_attrs</db_table_id>
+			<cmd_type>DB1_QUERY</cmd_type>
+			<query_cols>
+				<col><field>id</field></col>
+				<col><field>uid</field></col>
+				<col><field>name</field></col>
+				<col><field>value</field></col>
+				<col><field>type</field></col>
+				<col><field>flags</field></col>
+			</query_cols>
+		</cmd>
+	</mod>

utils/kamctl/xhttp_pi/uid_avp_db-table

@@ -0,0 +1,11 @@
+	<!-- Declaration of uid_user_attrs table-->
+	<db_table id="uid_user_attrs">
+		<table_name>uid_user_attrs</table_name>
+		<db_url_id>mysql</db_url_id>
+		<column><field>id</field><type>DB1_INT</type></column>
+		<column><field>uid</field><type>DB1_STR</type></column>
+		<column><field>name</field><type>DB1_STR</type></column>
+		<column><field>value</field><type>DB1_STR</type></column>
+		<column><field>type</field><type>DB1_INT</type></column>
+		<column><field>flags</field><type>DB1_INT</type></column>
+	</db_table>