kamctl: regenerated mysql creation scripts

utils/kamctl/mysql/acc-create.sql

@@ -1,38 +1,38 @@
 INSERT INTO version (table_name, table_version) values ('acc','5');
-CREATE TABLE acc (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    method VARCHAR(16) DEFAULT '' NOT NULL,
-    from_tag VARCHAR(64) DEFAULT '' NOT NULL,
-    to_tag VARCHAR(64) DEFAULT '' NOT NULL,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
-    sip_code VARCHAR(3) DEFAULT '' NOT NULL,
-    sip_reason VARCHAR(128) DEFAULT '' NOT NULL,
-    time DATETIME NOT NULL
+CREATE TABLE `acc` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `method` VARCHAR(16) DEFAULT '' NOT NULL,
+    `from_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `to_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `callid` VARCHAR(255) DEFAULT '' NOT NULL,
+    `sip_code` VARCHAR(3) DEFAULT '' NOT NULL,
+    `sip_reason` VARCHAR(128) DEFAULT '' NOT NULL,
+    `time` DATETIME NOT NULL
 );
 
-CREATE INDEX callid_idx ON acc (callid);
+CREATE INDEX callid_idx ON acc (`callid`);
 
 INSERT INTO version (table_name, table_version) values ('acc_cdrs','2');
-CREATE TABLE acc_cdrs (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    start_time DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL,
-    end_time DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL,
-    duration FLOAT(10,3) DEFAULT 0 NOT NULL
+CREATE TABLE `acc_cdrs` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `start_time` DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL,
+    `end_time` DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL,
+    `duration` FLOAT(10,3) DEFAULT 0 NOT NULL
 );
 
-CREATE INDEX start_time_idx ON acc_cdrs (start_time);
+CREATE INDEX start_time_idx ON acc_cdrs (`start_time`);
 
 INSERT INTO version (table_name, table_version) values ('missed_calls','4');
-CREATE TABLE missed_calls (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    method VARCHAR(16) DEFAULT '' NOT NULL,
-    from_tag VARCHAR(64) DEFAULT '' NOT NULL,
-    to_tag VARCHAR(64) DEFAULT '' NOT NULL,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
-    sip_code VARCHAR(3) DEFAULT '' NOT NULL,
-    sip_reason VARCHAR(128) DEFAULT '' NOT NULL,
-    time DATETIME NOT NULL
+CREATE TABLE `missed_calls` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `method` VARCHAR(16) DEFAULT '' NOT NULL,
+    `from_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `to_tag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `callid` VARCHAR(255) DEFAULT '' NOT NULL,
+    `sip_code` VARCHAR(3) DEFAULT '' NOT NULL,
+    `sip_reason` VARCHAR(128) DEFAULT '' NOT NULL,
+    `time` DATETIME NOT NULL
 );
 
-CREATE INDEX callid_idx ON missed_calls (callid);
+CREATE INDEX callid_idx ON missed_calls (`callid`);
 

utils/kamctl/mysql/alias_db-create.sql

@@ -1,13 +1,13 @@
 INSERT INTO version (table_name, table_version) values ('dbaliases','1');
-CREATE TABLE dbaliases (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    alias_username VARCHAR(64) DEFAULT '' NOT NULL,
-    alias_domain VARCHAR(64) DEFAULT '' NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL
+CREATE TABLE `dbaliases` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `alias_username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `alias_domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL
 );
 
-CREATE INDEX alias_user_idx ON dbaliases (alias_username);
-CREATE INDEX alias_idx ON dbaliases (alias_username, alias_domain);
-CREATE INDEX target_idx ON dbaliases (username, domain);
+CREATE INDEX alias_user_idx ON dbaliases (`alias_username`);
+CREATE INDEX alias_idx ON dbaliases (`alias_username`, `alias_domain`);
+CREATE INDEX target_idx ON dbaliases (`username`, `domain`);
 

utils/kamctl/mysql/auth_db-create.sql

@@ -1,15 +1,15 @@
 INSERT INTO version (table_name, table_version) values ('subscriber','6');
-CREATE TABLE subscriber (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    password VARCHAR(25) DEFAULT '' NOT NULL,
-    email_address VARCHAR(64) DEFAULT '' NOT NULL,
-    ha1 VARCHAR(64) DEFAULT '' NOT NULL,
-    ha1b VARCHAR(64) DEFAULT '' NOT NULL,
-    rpid VARCHAR(64) DEFAULT NULL,
-    CONSTRAINT account_idx UNIQUE (username, domain)
+CREATE TABLE `subscriber` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `password` VARCHAR(25) DEFAULT '' NOT NULL,
+    `email_address` VARCHAR(64) DEFAULT '' NOT NULL,
+    `ha1` VARCHAR(64) DEFAULT '' NOT NULL,
+    `ha1b` VARCHAR(64) DEFAULT '' NOT NULL,
+    `rpid` VARCHAR(64) DEFAULT NULL,
+    CONSTRAINT account_idx UNIQUE (`username`, `domain`)
 );
 
-CREATE INDEX username_idx ON subscriber (username);
+CREATE INDEX username_idx ON subscriber (`username`);
 

utils/kamctl/mysql/avpops-create.sql

@@ -1,15 +1,15 @@
 INSERT INTO version (table_name, table_version) values ('usr_preferences','2');
-CREATE TABLE usr_preferences (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    uuid VARCHAR(64) DEFAULT '' NOT NULL,
-    username VARCHAR(128) DEFAULT 0 NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    attribute VARCHAR(32) DEFAULT '' NOT NULL,
-    type INT(11) DEFAULT 0 NOT NULL,
-    value VARCHAR(128) DEFAULT '' NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL
+CREATE TABLE `usr_preferences` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `uuid` VARCHAR(64) DEFAULT '' NOT NULL,
+    `username` VARCHAR(128) DEFAULT 0 NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `attribute` VARCHAR(32) DEFAULT '' NOT NULL,
+    `type` INT(11) DEFAULT 0 NOT NULL,
+    `value` VARCHAR(128) DEFAULT '' NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL
 );
 
-CREATE INDEX ua_idx ON usr_preferences (uuid, attribute);
-CREATE INDEX uda_idx ON usr_preferences (username, domain, attribute);
+CREATE INDEX ua_idx ON usr_preferences (`uuid`, `attribute`);
+CREATE INDEX uda_idx ON usr_preferences (`username`, `domain`, `attribute`);
 

utils/kamctl/mysql/carrierroute-create.sql

@@ -1,42 +1,42 @@
 INSERT INTO version (table_name, table_version) values ('carrierroute','3');
-CREATE TABLE carrierroute (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    carrier INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    domain INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    scan_prefix VARCHAR(64) DEFAULT '' NOT NULL,
-    flags INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    mask INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    prob FLOAT DEFAULT 0 NOT NULL,
-    strip INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    rewrite_host VARCHAR(128) DEFAULT '' NOT NULL,
-    rewrite_prefix VARCHAR(64) DEFAULT '' NOT NULL,
-    rewrite_suffix VARCHAR(64) DEFAULT '' NOT NULL,
-    description VARCHAR(255) DEFAULT NULL
+CREATE TABLE `carrierroute` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `carrier` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `domain` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `scan_prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `flags` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `mask` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `prob` FLOAT DEFAULT 0 NOT NULL,
+    `strip` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `rewrite_host` VARCHAR(128) DEFAULT '' NOT NULL,
+    `rewrite_prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `rewrite_suffix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `description` VARCHAR(255) DEFAULT NULL
 );
 
 INSERT INTO version (table_name, table_version) values ('carrierfailureroute','2');
-CREATE TABLE carrierfailureroute (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    carrier INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    domain INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    scan_prefix VARCHAR(64) DEFAULT '' NOT NULL,
-    host_name VARCHAR(128) DEFAULT '' NOT NULL,
-    reply_code VARCHAR(3) DEFAULT '' NOT NULL,
-    flags INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    mask INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    next_domain INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    description VARCHAR(255) DEFAULT NULL
+CREATE TABLE `carrierfailureroute` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `carrier` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `domain` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `scan_prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `host_name` VARCHAR(128) DEFAULT '' NOT NULL,
+    `reply_code` VARCHAR(3) DEFAULT '' NOT NULL,
+    `flags` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `mask` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `next_domain` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `description` VARCHAR(255) DEFAULT NULL
 );
 
 INSERT INTO version (table_name, table_version) values ('carrier_name','1');
-CREATE TABLE carrier_name (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    carrier VARCHAR(64) DEFAULT NULL
+CREATE TABLE `carrier_name` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `carrier` VARCHAR(64) DEFAULT NULL
 );
 
 INSERT INTO version (table_name, table_version) values ('domain_name','1');
-CREATE TABLE domain_name (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    domain VARCHAR(64) DEFAULT NULL
+CREATE TABLE `domain_name` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `domain` VARCHAR(64) DEFAULT NULL
 );
 

utils/kamctl/mysql/cpl-create.sql

@@ -1,10 +1,10 @@
 INSERT INTO version (table_name, table_version) values ('cpl','1');
-CREATE TABLE cpl (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    cpl_xml TEXT,
-    cpl_bin TEXT,
-    CONSTRAINT account_idx UNIQUE (username, domain)
+CREATE TABLE `cpl` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `cpl_xml` TEXT,
+    `cpl_bin` TEXT,
+    CONSTRAINT account_idx UNIQUE (`username`, `domain`)
 );
 

utils/kamctl/mysql/dialog-create.sql

@@ -1,41 +1,41 @@
 INSERT INTO version (table_name, table_version) values ('dialog','7');
-CREATE TABLE dialog (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    hash_entry INT(10) UNSIGNED NOT NULL,
-    hash_id INT(10) UNSIGNED NOT NULL,
-    callid VARCHAR(255) NOT NULL,
-    from_uri VARCHAR(128) NOT NULL,
-    from_tag VARCHAR(64) NOT NULL,
-    to_uri VARCHAR(128) NOT NULL,
-    to_tag VARCHAR(64) NOT NULL,
-    caller_cseq VARCHAR(20) NOT NULL,
-    callee_cseq VARCHAR(20) NOT NULL,
-    caller_route_set VARCHAR(512),
-    callee_route_set VARCHAR(512),
-    caller_contact VARCHAR(128) NOT NULL,
-    callee_contact VARCHAR(128) NOT NULL,
-    caller_sock VARCHAR(64) NOT NULL,
-    callee_sock VARCHAR(64) NOT NULL,
-    state INT(10) UNSIGNED NOT NULL,
-    start_time INT(10) UNSIGNED NOT NULL,
-    timeout INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    sflags INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    iflags INT(10) UNSIGNED DEFAULT 0 NOT NULL,
-    toroute_name VARCHAR(32),
-    req_uri VARCHAR(128) NOT NULL,
-    xdata VARCHAR(512)
+CREATE TABLE `dialog` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `hash_entry` INT(10) UNSIGNED NOT NULL,
+    `hash_id` INT(10) UNSIGNED NOT NULL,
+    `callid` VARCHAR(255) NOT NULL,
+    `from_uri` VARCHAR(128) NOT NULL,
+    `from_tag` VARCHAR(64) NOT NULL,
+    `to_uri` VARCHAR(128) NOT NULL,
+    `to_tag` VARCHAR(64) NOT NULL,
+    `caller_cseq` VARCHAR(20) NOT NULL,
+    `callee_cseq` VARCHAR(20) NOT NULL,
+    `caller_route_set` VARCHAR(512),
+    `callee_route_set` VARCHAR(512),
+    `caller_contact` VARCHAR(128) NOT NULL,
+    `callee_contact` VARCHAR(128) NOT NULL,
+    `caller_sock` VARCHAR(64) NOT NULL,
+    `callee_sock` VARCHAR(64) NOT NULL,
+    `state` INT(10) UNSIGNED NOT NULL,
+    `start_time` INT(10) UNSIGNED NOT NULL,
+    `timeout` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `sflags` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `iflags` INT(10) UNSIGNED DEFAULT 0 NOT NULL,
+    `toroute_name` VARCHAR(32),
+    `req_uri` VARCHAR(128) NOT NULL,
+    `xdata` VARCHAR(512)
 );
 
-CREATE INDEX hash_idx ON dialog (hash_entry, hash_id);
+CREATE INDEX hash_idx ON dialog (`hash_entry`, `hash_id`);
 
 INSERT INTO version (table_name, table_version) values ('dialog_vars','1');
-CREATE TABLE dialog_vars (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    hash_entry INT(10) UNSIGNED NOT NULL,
-    hash_id INT(10) UNSIGNED NOT NULL,
-    dialog_key VARCHAR(128) NOT NULL,
-    dialog_value VARCHAR(512) NOT NULL
+CREATE TABLE `dialog_vars` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `hash_entry` INT(10) UNSIGNED NOT NULL,
+    `hash_id` INT(10) UNSIGNED NOT NULL,
+    `dialog_key` VARCHAR(128) NOT NULL,
+    `dialog_value` VARCHAR(512) NOT NULL
 );
 
-CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id);
+CREATE INDEX hash_idx ON dialog_vars (`hash_entry`, `hash_id`);
 

utils/kamctl/mysql/dialplan-create.sql

@@ -1,13 +1,13 @@
 INSERT INTO version (table_name, table_version) values ('dialplan','2');
-CREATE TABLE dialplan (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    dpid INT(11) NOT NULL,
-    pr INT(11) NOT NULL,
-    match_op INT(11) NOT NULL,
-    match_exp VARCHAR(64) NOT NULL,
-    match_len INT(11) NOT NULL,
-    subst_exp VARCHAR(64) NOT NULL,
-    repl_exp VARCHAR(64) NOT NULL,
-    attrs VARCHAR(64) NOT NULL
+CREATE TABLE `dialplan` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `dpid` INT(11) NOT NULL,
+    `pr` INT(11) NOT NULL,
+    `match_op` INT(11) NOT NULL,
+    `match_exp` VARCHAR(64) NOT NULL,
+    `match_len` INT(11) NOT NULL,
+    `subst_exp` VARCHAR(64) NOT NULL,
+    `repl_exp` VARCHAR(64) NOT NULL,
+    `attrs` VARCHAR(64) NOT NULL
 );
 

utils/kamctl/mysql/dispatcher-create.sql

@@ -1,11 +1,11 @@
 INSERT INTO version (table_name, table_version) values ('dispatcher','4');
-CREATE TABLE dispatcher (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    setid INT DEFAULT 0 NOT NULL,
-    destination VARCHAR(192) DEFAULT '' NOT NULL,
-    flags INT DEFAULT 0 NOT NULL,
-    priority INT DEFAULT 0 NOT NULL,
-    attrs VARCHAR(128) DEFAULT '' NOT NULL,
-    description VARCHAR(64) DEFAULT '' NOT NULL
+CREATE TABLE `dispatcher` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `setid` INT DEFAULT 0 NOT NULL,
+    `destination` VARCHAR(192) DEFAULT '' NOT NULL,
+    `flags` INT DEFAULT 0 NOT NULL,
+    `priority` INT DEFAULT 0 NOT NULL,
+    `attrs` VARCHAR(128) DEFAULT '' NOT NULL,
+    `description` VARCHAR(64) DEFAULT '' NOT NULL
 );
 

utils/kamctl/mysql/domain-create.sql

@@ -1,20 +1,20 @@
 INSERT INTO version (table_name, table_version) values ('domain','2');
-CREATE TABLE domain (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    domain VARCHAR(64) NOT NULL,
-    did VARCHAR(64) DEFAULT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    CONSTRAINT domain_idx UNIQUE (domain)
+CREATE TABLE `domain` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `domain` VARCHAR(64) NOT NULL,
+    `did` VARCHAR(64) DEFAULT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    CONSTRAINT domain_idx UNIQUE (`domain`)
 );
 
 INSERT INTO version (table_name, table_version) values ('domain_attrs','1');
-CREATE TABLE domain_attrs (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    did VARCHAR(64) NOT NULL,
-    name VARCHAR(32) NOT NULL,
-    type INT UNSIGNED NOT NULL,
-    value VARCHAR(255) NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    CONSTRAINT domain_attrs_idx UNIQUE (did, name, value)
+CREATE TABLE `domain_attrs` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `did` VARCHAR(64) NOT NULL,
+    `name` VARCHAR(32) NOT NULL,
+    `type` INT UNSIGNED NOT NULL,
+    `value` VARCHAR(255) NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    CONSTRAINT domain_attrs_idx UNIQUE (`did`, `name`, `value`)
 );
 

utils/kamctl/mysql/domainpolicy-create.sql

@@ -1,13 +1,13 @@
 INSERT INTO version (table_name, table_version) values ('domainpolicy','2');
-CREATE TABLE domainpolicy (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    rule VARCHAR(255) NOT NULL,
-    type VARCHAR(255) NOT NULL,
-    att VARCHAR(255),
-    val VARCHAR(128),
-    description VARCHAR(255) NOT NULL,
-    CONSTRAINT rav_idx UNIQUE (rule, att, val)
+CREATE TABLE `domainpolicy` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `rule` VARCHAR(255) NOT NULL,
+    `type` VARCHAR(255) NOT NULL,
+    `att` VARCHAR(255),
+    `val` VARCHAR(128),
+    `description` VARCHAR(255) NOT NULL,
+    CONSTRAINT rav_idx UNIQUE (`rule`, `att`, `val`)
 );
 
-CREATE INDEX rule_idx ON domainpolicy (rule);
+CREATE INDEX rule_idx ON domainpolicy (`rule`);
 

utils/kamctl/mysql/drouting-create.sql

@@ -1,39 +1,39 @@
 INSERT INTO version (table_name, table_version) values ('dr_gateways','3');
-CREATE TABLE dr_gateways (
-    gwid INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    type INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    address VARCHAR(128) NOT NULL,
-    strip INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    pri_prefix VARCHAR(64) DEFAULT NULL,
-    attrs VARCHAR(255) DEFAULT NULL,
-    description VARCHAR(128) DEFAULT '' NOT NULL
+CREATE TABLE `dr_gateways` (
+    `gwid` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `type` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `address` VARCHAR(128) NOT NULL,
+    `strip` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `pri_prefix` VARCHAR(64) DEFAULT NULL,
+    `attrs` VARCHAR(255) DEFAULT NULL,
+    `description` VARCHAR(128) DEFAULT '' NOT NULL
 );
 
 INSERT INTO version (table_name, table_version) values ('dr_rules','3');
-CREATE TABLE dr_rules (
-    ruleid INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    groupid VARCHAR(255) NOT NULL,
-    prefix VARCHAR(64) NOT NULL,
-    timerec VARCHAR(255) NOT NULL,
-    priority INT(11) DEFAULT 0 NOT NULL,
-    routeid VARCHAR(64) NOT NULL,
-    gwlist VARCHAR(255) NOT NULL,
-    description VARCHAR(128) DEFAULT '' NOT NULL
+CREATE TABLE `dr_rules` (
+    `ruleid` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `groupid` VARCHAR(255) NOT NULL,
+    `prefix` VARCHAR(64) NOT NULL,
+    `timerec` VARCHAR(255) NOT NULL,
+    `priority` INT(11) DEFAULT 0 NOT NULL,
+    `routeid` VARCHAR(64) NOT NULL,
+    `gwlist` VARCHAR(255) NOT NULL,
+    `description` VARCHAR(128) DEFAULT '' NOT NULL
 );
 
 INSERT INTO version (table_name, table_version) values ('dr_gw_lists','1');
-CREATE TABLE dr_gw_lists (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    gwlist VARCHAR(255) NOT NULL,
-    description VARCHAR(128) DEFAULT '' NOT NULL
+CREATE TABLE `dr_gw_lists` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `gwlist` VARCHAR(255) NOT NULL,
+    `description` VARCHAR(128) DEFAULT '' NOT NULL
 );
 
 INSERT INTO version (table_name, table_version) values ('dr_groups','2');
-CREATE TABLE dr_groups (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    domain VARCHAR(128) DEFAULT '' NOT NULL,
-    groupid INT(11) UNSIGNED DEFAULT 0 NOT NULL,
-    description VARCHAR(128) DEFAULT '' NOT NULL
+CREATE TABLE `dr_groups` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(128) DEFAULT '' NOT NULL,
+    `groupid` INT(11) UNSIGNED DEFAULT 0 NOT NULL,
+    `description` VARCHAR(128) DEFAULT '' NOT NULL
 );
 

utils/kamctl/mysql/group-create.sql

@@ -1,19 +1,19 @@
 INSERT INTO version (table_name, table_version) values ('grp','2');
-CREATE TABLE grp (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    grp VARCHAR(64) DEFAULT '' NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    CONSTRAINT account_group_idx UNIQUE (username, domain, grp)
+CREATE TABLE `grp` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `grp` VARCHAR(64) DEFAULT '' NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    CONSTRAINT account_group_idx UNIQUE (`username`, `domain`, `grp`)
 );
 
 INSERT INTO version (table_name, table_version) values ('re_grp','1');
-CREATE TABLE re_grp (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    reg_exp VARCHAR(128) DEFAULT '' NOT NULL,
-    group_id INT(11) DEFAULT 0 NOT NULL
+CREATE TABLE `re_grp` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `reg_exp` VARCHAR(128) DEFAULT '' NOT NULL,
+    `group_id` INT(11) DEFAULT 0 NOT NULL
 );
 
-CREATE INDEX group_idx ON re_grp (group_id);
+CREATE INDEX group_idx ON re_grp (`group_id`);
 

utils/kamctl/mysql/htable-create.sql

@@ -1,10 +1,10 @@
 INSERT INTO version (table_name, table_version) values ('htable','2');
-CREATE TABLE htable (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    key_name VARCHAR(64) DEFAULT '' NOT NULL,
-    key_type INT DEFAULT 0 NOT NULL,
-    value_type INT DEFAULT 0 NOT NULL,
-    key_value VARCHAR(128) DEFAULT '' NOT NULL,
-    expires INT DEFAULT 0 NOT NULL
+CREATE TABLE `htable` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `key_name` VARCHAR(64) DEFAULT '' NOT NULL,
+    `key_type` INT DEFAULT 0 NOT NULL,
+    `value_type` INT DEFAULT 0 NOT NULL,
+    `key_value` VARCHAR(128) DEFAULT '' NOT NULL,
+    `expires` INT DEFAULT 0 NOT NULL
 );
 

utils/kamctl/mysql/imc-create.sql

@@ -1,19 +1,19 @@
 INSERT INTO version (table_name, table_version) values ('imc_rooms','1');
-CREATE TABLE imc_rooms (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    name VARCHAR(64) NOT NULL,
-    domain VARCHAR(64) NOT NULL,
-    flag INT(11) NOT NULL,
-    CONSTRAINT name_domain_idx UNIQUE (name, domain)
+CREATE TABLE `imc_rooms` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `name` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(64) NOT NULL,
+    `flag` INT(11) NOT NULL,
+    CONSTRAINT name_domain_idx UNIQUE (`name`, `domain`)
 );
 
 INSERT INTO version (table_name, table_version) values ('imc_members','1');
-CREATE TABLE imc_members (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    domain VARCHAR(64) NOT NULL,
-    room VARCHAR(64) NOT NULL,
-    flag INT(11) NOT NULL,
-    CONSTRAINT account_room_idx UNIQUE (username, domain, room)
+CREATE TABLE `imc_members` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(64) NOT NULL,
+    `room` VARCHAR(64) NOT NULL,
+    `flag` INT(11) NOT NULL,
+    CONSTRAINT account_room_idx UNIQUE (`username`, `domain`, `room`)
 );
 

utils/kamctl/mysql/lcr-create.sql

@@ -1,45 +1,45 @@
 INSERT INTO version (table_name, table_version) values ('lcr_gw','3');
-CREATE TABLE lcr_gw (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    lcr_id SMALLINT UNSIGNED NOT NULL,
-    gw_name VARCHAR(128),
-    ip_addr VARCHAR(50),
-    hostname VARCHAR(64),
-    port SMALLINT UNSIGNED,
-    params VARCHAR(64),
-    uri_scheme TINYINT UNSIGNED,
-    transport TINYINT UNSIGNED,
-    strip TINYINT UNSIGNED,
-    prefix VARCHAR(16) DEFAULT NULL,
-    tag VARCHAR(64) DEFAULT NULL,
-    flags INT UNSIGNED DEFAULT 0 NOT NULL,
-    defunct INT UNSIGNED DEFAULT NULL
+CREATE TABLE `lcr_gw` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `lcr_id` SMALLINT UNSIGNED NOT NULL,
+    `gw_name` VARCHAR(128),
+    `ip_addr` VARCHAR(50),
+    `hostname` VARCHAR(64),
+    `port` SMALLINT UNSIGNED,
+    `params` VARCHAR(64),
+    `uri_scheme` TINYINT UNSIGNED,
+    `transport` TINYINT UNSIGNED,
+    `strip` TINYINT UNSIGNED,
+    `prefix` VARCHAR(16) DEFAULT NULL,
+    `tag` VARCHAR(64) DEFAULT NULL,
+    `flags` INT UNSIGNED DEFAULT 0 NOT NULL,
+    `defunct` INT UNSIGNED DEFAULT NULL
 );
 
-CREATE INDEX lcr_id_idx ON lcr_gw (lcr_id);
+CREATE INDEX lcr_id_idx ON lcr_gw (`lcr_id`);
 
 INSERT INTO version (table_name, table_version) values ('lcr_rule_target','1');
-CREATE TABLE lcr_rule_target (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    lcr_id SMALLINT UNSIGNED NOT NULL,
-    rule_id INT UNSIGNED NOT NULL,
-    gw_id INT UNSIGNED NOT NULL,
-    priority TINYINT UNSIGNED NOT NULL,
-    weight INT UNSIGNED DEFAULT 1 NOT NULL,
-    CONSTRAINT rule_id_gw_id_idx UNIQUE (rule_id, gw_id)
+CREATE TABLE `lcr_rule_target` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `lcr_id` SMALLINT UNSIGNED NOT NULL,
+    `rule_id` INT UNSIGNED NOT NULL,
+    `gw_id` INT UNSIGNED NOT NULL,
+    `priority` TINYINT UNSIGNED NOT NULL,
+    `weight` INT UNSIGNED DEFAULT 1 NOT NULL,
+    CONSTRAINT rule_id_gw_id_idx UNIQUE (`rule_id`, `gw_id`)
 );
 
-CREATE INDEX lcr_id_idx ON lcr_rule_target (lcr_id);
+CREATE INDEX lcr_id_idx ON lcr_rule_target (`lcr_id`);
 
 INSERT INTO version (table_name, table_version) values ('lcr_rule','2');
-CREATE TABLE lcr_rule (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    lcr_id SMALLINT UNSIGNED NOT NULL,
-    prefix VARCHAR(16) DEFAULT NULL,
-    from_uri VARCHAR(64) DEFAULT NULL,
-    request_uri VARCHAR(64) DEFAULT NULL,
-    stopper INT UNSIGNED DEFAULT 0 NOT NULL,
-    enabled INT UNSIGNED DEFAULT 1 NOT NULL,
-    CONSTRAINT lcr_id_prefix_from_uri_idx UNIQUE (lcr_id, prefix, from_uri)
+CREATE TABLE `lcr_rule` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `lcr_id` SMALLINT UNSIGNED NOT NULL,
+    `prefix` VARCHAR(16) DEFAULT NULL,
+    `from_uri` VARCHAR(64) DEFAULT NULL,
+    `request_uri` VARCHAR(64) DEFAULT NULL,
+    `stopper` INT UNSIGNED DEFAULT 0 NOT NULL,
+    `enabled` INT UNSIGNED DEFAULT 1 NOT NULL,
+    CONSTRAINT lcr_id_prefix_from_uri_idx UNIQUE (`lcr_id`, `prefix`, `from_uri`)
 );
 

utils/kamctl/mysql/matrix-create.sql

@@ -1,9 +1,9 @@
 INSERT INTO version (table_name, table_version) values ('matrix','1');
-CREATE TABLE matrix (
-    first INT(10) NOT NULL,
-    second SMALLINT(10) NOT NULL,
-    res INT(10) NOT NULL
+CREATE TABLE `matrix` (
+    `first` INT(10) NOT NULL,
+    `second` SMALLINT(10) NOT NULL,
+    `res` INT(10) NOT NULL
 );
 
-CREATE INDEX matrix_idx ON matrix (first, second);
+CREATE INDEX matrix_idx ON matrix (`first`, `second`);
 

utils/kamctl/mysql/mohqueue-create.sql

@@ -1,24 +1,24 @@
 INSERT INTO version (table_name, table_version) values ('mohqcalls','1');
-CREATE TABLE mohqcalls (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    mohq_id INT(10) UNSIGNED NOT NULL,
-    call_id VARCHAR(100) NOT NULL,
-    call_status INT UNSIGNED NOT NULL,
-    call_from VARCHAR(100) NOT NULL,
-    call_contact VARCHAR(100),
-    call_time DATETIME NOT NULL,
-    CONSTRAINT mohqcalls_idx UNIQUE (call_id)
+CREATE TABLE `mohqcalls` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `mohq_id` INT(10) UNSIGNED NOT NULL,
+    `call_id` VARCHAR(100) NOT NULL,
+    `call_status` INT UNSIGNED NOT NULL,
+    `call_from` VARCHAR(100) NOT NULL,
+    `call_contact` VARCHAR(100),
+    `call_time` DATETIME NOT NULL,
+    CONSTRAINT mohqcalls_idx UNIQUE (`call_id`)
 );
 
 INSERT INTO version (table_name, table_version) values ('mohqueues','1');
-CREATE TABLE mohqueues (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    name VARCHAR(25) NOT NULL,
-    uri VARCHAR(100) NOT NULL,
-    mohdir VARCHAR(100),
-    mohfile VARCHAR(100) NOT NULL,
-    debug INT NOT NULL,
-    CONSTRAINT mohqueue_uri_idx UNIQUE (uri),
-    CONSTRAINT mohqueue_name_idx UNIQUE (name)
+CREATE TABLE `mohqueues` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `name` VARCHAR(25) NOT NULL,
+    `uri` VARCHAR(100) NOT NULL,
+    `mohdir` VARCHAR(100),
+    `mohfile` VARCHAR(100) NOT NULL,
+    `debug` INT NOT NULL,
+    CONSTRAINT mohqueue_uri_idx UNIQUE (`uri`),
+    CONSTRAINT mohqueue_name_idx UNIQUE (`name`)
 );
 

utils/kamctl/mysql/msilo-create.sql

@@ -1,19 +1,19 @@
 INSERT INTO version (table_name, table_version) values ('silo','8');
-CREATE TABLE silo (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    src_addr VARCHAR(128) DEFAULT '' NOT NULL,
-    dst_addr VARCHAR(128) DEFAULT '' NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    inc_time INT DEFAULT 0 NOT NULL,
-    exp_time INT DEFAULT 0 NOT NULL,
-    snd_time INT DEFAULT 0 NOT NULL,
-    ctype VARCHAR(32) DEFAULT 'text/plain' NOT NULL,
-    body BLOB,
-    extra_hdrs TEXT,
-    callid VARCHAR(128) DEFAULT '' NOT NULL,
-    status INT DEFAULT 0 NOT NULL
+CREATE TABLE `silo` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `src_addr` VARCHAR(128) DEFAULT '' NOT NULL,
+    `dst_addr` VARCHAR(128) DEFAULT '' NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `inc_time` INT DEFAULT 0 NOT NULL,
+    `exp_time` INT DEFAULT 0 NOT NULL,
+    `snd_time` INT DEFAULT 0 NOT NULL,
+    `ctype` VARCHAR(32) DEFAULT 'text/plain' NOT NULL,
+    `body` BLOB,
+    `extra_hdrs` TEXT,
+    `callid` VARCHAR(128) DEFAULT '' NOT NULL,
+    `status` INT DEFAULT 0 NOT NULL
 );
 
-CREATE INDEX account_idx ON silo (username, domain);
+CREATE INDEX account_idx ON silo (`username`, `domain`);
 

utils/kamctl/mysql/mtree-create.sql

@@ -1,17 +1,17 @@
 INSERT INTO version (table_name, table_version) values ('mtree','1');
-CREATE TABLE mtree (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    tprefix VARCHAR(32) DEFAULT '' NOT NULL,
-    tvalue VARCHAR(128) DEFAULT '' NOT NULL,
-    CONSTRAINT tprefix_idx UNIQUE (tprefix)
+CREATE TABLE `mtree` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `tprefix` VARCHAR(32) DEFAULT '' NOT NULL,
+    `tvalue` VARCHAR(128) DEFAULT '' NOT NULL,
+    CONSTRAINT tprefix_idx UNIQUE (`tprefix`)
 );
 
 INSERT INTO version (table_name, table_version) values ('mtrees','2');
-CREATE TABLE mtrees (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    tname VARCHAR(128) DEFAULT '' NOT NULL,
-    tprefix VARCHAR(32) DEFAULT '' NOT NULL,
-    tvalue VARCHAR(128) DEFAULT '' NOT NULL,
-    CONSTRAINT tname_tprefix_tvalue_idx UNIQUE (tname, tprefix, tvalue)
+CREATE TABLE `mtrees` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `tname` VARCHAR(128) DEFAULT '' NOT NULL,
+    `tprefix` VARCHAR(32) DEFAULT '' NOT NULL,
+    `tvalue` VARCHAR(128) DEFAULT '' NOT NULL,
+    CONSTRAINT tname_tprefix_tvalue_idx UNIQUE (`tname`, `tprefix`, `tvalue`)
 );
 

utils/kamctl/mysql/pdt-create.sql

@@ -1,9 +1,9 @@
 INSERT INTO version (table_name, table_version) values ('pdt','1');
-CREATE TABLE pdt (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    sdomain VARCHAR(128) NOT NULL,
-    prefix VARCHAR(32) NOT NULL,
-    domain VARCHAR(128) DEFAULT '' NOT NULL,
-    CONSTRAINT sdomain_prefix_idx UNIQUE (sdomain, prefix)
+CREATE TABLE `pdt` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `sdomain` VARCHAR(128) NOT NULL,
+    `prefix` VARCHAR(32) NOT NULL,
+    `domain` VARCHAR(128) DEFAULT '' NOT NULL,
+    CONSTRAINT sdomain_prefix_idx UNIQUE (`sdomain`, `prefix`)
 );
 

utils/kamctl/mysql/permissions-create.sql

@@ -1,21 +1,21 @@
 INSERT INTO version (table_name, table_version) values ('trusted','5');
-CREATE TABLE trusted (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    src_ip VARCHAR(50) NOT NULL,
-    proto VARCHAR(4) NOT NULL,
-    from_pattern VARCHAR(64) DEFAULT NULL,
-    tag VARCHAR(64)
+CREATE TABLE `trusted` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `src_ip` VARCHAR(50) NOT NULL,
+    `proto` VARCHAR(4) NOT NULL,
+    `from_pattern` VARCHAR(64) DEFAULT NULL,
+    `tag` VARCHAR(64)
 );
 
-CREATE INDEX peer_idx ON trusted (src_ip);
+CREATE INDEX peer_idx ON trusted (`src_ip`);
 
 INSERT INTO version (table_name, table_version) values ('address','6');
-CREATE TABLE address (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    grp INT(11) UNSIGNED DEFAULT 1 NOT NULL,
-    ip_addr VARCHAR(50) NOT NULL,
-    mask INT DEFAULT 32 NOT NULL,
-    port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL,
-    tag VARCHAR(64)
+CREATE TABLE `address` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `grp` INT(11) UNSIGNED DEFAULT 1 NOT NULL,
+    `ip_addr` VARCHAR(50) NOT NULL,
+    `mask` INT DEFAULT 32 NOT NULL,
+    `port` SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL,
+    `tag` VARCHAR(64)
 );
 

utils/kamctl/mysql/pipelimit-create.sql

@@ -1,8 +1,8 @@
 INSERT INTO version (table_name, table_version) values ('pl_pipes','1');
-CREATE TABLE pl_pipes (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    pipeid VARCHAR(64) DEFAULT '' NOT NULL,
-    algorithm VARCHAR(32) DEFAULT '' NOT NULL,
-    plimit INT DEFAULT 0 NOT NULL
+CREATE TABLE `pl_pipes` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `pipeid` VARCHAR(64) DEFAULT '' NOT NULL,
+    `algorithm` VARCHAR(32) DEFAULT '' NOT NULL,
+    `plimit` INT DEFAULT 0 NOT NULL
 );
 

utils/kamctl/mysql/presence-create.sql

@@ -1,113 +1,113 @@
 INSERT INTO version (table_name, table_version) values ('presentity','4');
-CREATE TABLE presentity (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    domain VARCHAR(64) NOT NULL,
-    event VARCHAR(64) NOT NULL,
-    etag VARCHAR(64) NOT NULL,
-    expires INT(11) NOT NULL,
-    received_time INT(11) NOT NULL,
-    body BLOB NOT NULL,
-    sender VARCHAR(128) NOT NULL,
-    priority INT(11) DEFAULT 0 NOT NULL,
-    CONSTRAINT presentity_idx UNIQUE (username, domain, event, etag)
+CREATE TABLE `presentity` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(64) NOT NULL,
+    `event` VARCHAR(64) NOT NULL,
+    `etag` VARCHAR(64) NOT NULL,
+    `expires` INT(11) NOT NULL,
+    `received_time` INT(11) NOT NULL,
+    `body` BLOB NOT NULL,
+    `sender` VARCHAR(128) NOT NULL,
+    `priority` INT(11) DEFAULT 0 NOT NULL,
+    CONSTRAINT presentity_idx UNIQUE (`username`, `domain`, `event`, `etag`)
 );
 
-CREATE INDEX presentity_expires ON presentity (expires);
-CREATE INDEX account_idx ON presentity (username, domain, event);
+CREATE INDEX presentity_expires ON presentity (`expires`);
+CREATE INDEX account_idx ON presentity (`username`, `domain`, `event`);
 
 INSERT INTO version (table_name, table_version) values ('active_watchers','11');
-CREATE TABLE active_watchers (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    presentity_uri VARCHAR(128) NOT NULL,
-    watcher_username VARCHAR(64) NOT NULL,
-    watcher_domain VARCHAR(64) NOT NULL,
-    to_user VARCHAR(64) NOT NULL,
-    to_domain VARCHAR(64) NOT NULL,
-    event VARCHAR(64) DEFAULT 'presence' NOT NULL,
-    event_id VARCHAR(64),
-    to_tag VARCHAR(64) NOT NULL,
-    from_tag VARCHAR(64) NOT NULL,
-    callid VARCHAR(255) NOT NULL,
-    local_cseq INT(11) NOT NULL,
-    remote_cseq INT(11) NOT NULL,
-    contact VARCHAR(128) NOT NULL,
-    record_route TEXT,
-    expires INT(11) NOT NULL,
-    status INT(11) DEFAULT 2 NOT NULL,
-    reason VARCHAR(64) NOT NULL,
-    version INT(11) DEFAULT 0 NOT NULL,
-    socket_info VARCHAR(64) NOT NULL,
-    local_contact VARCHAR(128) NOT NULL,
-    from_user VARCHAR(64) NOT NULL,
-    from_domain VARCHAR(64) NOT NULL,
-    updated INT(11) NOT NULL,
-    updated_winfo INT(11) NOT NULL,
-    CONSTRAINT active_watchers_idx UNIQUE (callid, to_tag, from_tag)
+CREATE TABLE `active_watchers` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `presentity_uri` VARCHAR(128) NOT NULL,
+    `watcher_username` VARCHAR(64) NOT NULL,
+    `watcher_domain` VARCHAR(64) NOT NULL,
+    `to_user` VARCHAR(64) NOT NULL,
+    `to_domain` VARCHAR(64) NOT NULL,
+    `event` VARCHAR(64) DEFAULT 'presence' NOT NULL,
+    `event_id` VARCHAR(64),
+    `to_tag` VARCHAR(64) NOT NULL,
+    `from_tag` VARCHAR(64) NOT NULL,
+    `callid` VARCHAR(255) NOT NULL,
+    `local_cseq` INT(11) NOT NULL,
+    `remote_cseq` INT(11) NOT NULL,
+    `contact` VARCHAR(128) NOT NULL,
+    `record_route` TEXT,
+    `expires` INT(11) NOT NULL,
+    `status` INT(11) DEFAULT 2 NOT NULL,
+    `reason` VARCHAR(64) NOT NULL,
+    `version` INT(11) DEFAULT 0 NOT NULL,
+    `socket_info` VARCHAR(64) NOT NULL,
+    `local_contact` VARCHAR(128) NOT NULL,
+    `from_user` VARCHAR(64) NOT NULL,
+    `from_domain` VARCHAR(64) NOT NULL,
+    `updated` INT(11) NOT NULL,
+    `updated_winfo` INT(11) NOT NULL,
+    CONSTRAINT active_watchers_idx UNIQUE (`callid`, `to_tag`, `from_tag`)
 );
 
-CREATE INDEX active_watchers_expires ON active_watchers (expires);
-CREATE INDEX active_watchers_pres ON active_watchers (presentity_uri, event);
-CREATE INDEX updated_idx ON active_watchers (updated);
-CREATE INDEX updated_winfo_idx ON active_watchers (updated_winfo, presentity_uri);
+CREATE INDEX active_watchers_expires ON active_watchers (`expires`);
+CREATE INDEX active_watchers_pres ON active_watchers (`presentity_uri`, `event`);
+CREATE INDEX updated_idx ON active_watchers (`updated`);
+CREATE INDEX updated_winfo_idx ON active_watchers (`updated_winfo`, `presentity_uri`);
 
 INSERT INTO version (table_name, table_version) values ('watchers','3');
-CREATE TABLE watchers (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    presentity_uri VARCHAR(128) NOT NULL,
-    watcher_username VARCHAR(64) NOT NULL,
-    watcher_domain VARCHAR(64) NOT NULL,
-    event VARCHAR(64) DEFAULT 'presence' NOT NULL,
-    status INT(11) NOT NULL,
-    reason VARCHAR(64),
-    inserted_time INT(11) NOT NULL,
-    CONSTRAINT watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event)
+CREATE TABLE `watchers` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `presentity_uri` VARCHAR(128) NOT NULL,
+    `watcher_username` VARCHAR(64) NOT NULL,
+    `watcher_domain` VARCHAR(64) NOT NULL,
+    `event` VARCHAR(64) DEFAULT 'presence' NOT NULL,
+    `status` INT(11) NOT NULL,
+    `reason` VARCHAR(64),
+    `inserted_time` INT(11) NOT NULL,
+    CONSTRAINT watcher_idx UNIQUE (`presentity_uri`, `watcher_username`, `watcher_domain`, `event`)
 );
 
 INSERT INTO version (table_name, table_version) values ('xcap','4');
-CREATE TABLE xcap (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    domain VARCHAR(64) NOT NULL,
-    doc MEDIUMBLOB NOT NULL,
-    doc_type INT(11) NOT NULL,
-    etag VARCHAR(64) NOT NULL,
-    source INT(11) NOT NULL,
-    doc_uri VARCHAR(255) NOT NULL,
-    port INT(11) NOT NULL,
-    CONSTRAINT doc_uri_idx UNIQUE (doc_uri)
+CREATE TABLE `xcap` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(64) NOT NULL,
+    `doc` MEDIUMBLOB NOT NULL,
+    `doc_type` INT(11) NOT NULL,
+    `etag` VARCHAR(64) NOT NULL,
+    `source` INT(11) NOT NULL,
+    `doc_uri` VARCHAR(255) NOT NULL,
+    `port` INT(11) NOT NULL,
+    CONSTRAINT doc_uri_idx UNIQUE (`doc_uri`)
 );
 
-CREATE INDEX account_doc_type_idx ON xcap (username, domain, doc_type);
-CREATE INDEX account_doc_type_uri_idx ON xcap (username, domain, doc_type, doc_uri);
-CREATE INDEX account_doc_uri_idx ON xcap (username, domain, doc_uri);
+CREATE INDEX account_doc_type_idx ON xcap (`username`, `domain`, `doc_type`);
+CREATE INDEX account_doc_type_uri_idx ON xcap (`username`, `domain`, `doc_type`, `doc_uri`);
+CREATE INDEX account_doc_uri_idx ON xcap (`username`, `domain`, `doc_uri`);
 
 INSERT INTO version (table_name, table_version) values ('pua','7');
-CREATE TABLE pua (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    pres_uri VARCHAR(128) NOT NULL,
-    pres_id VARCHAR(255) NOT NULL,
-    event INT(11) NOT NULL,
-    expires INT(11) NOT NULL,
-    desired_expires INT(11) NOT NULL,
-    flag INT(11) NOT NULL,
-    etag VARCHAR(64) NOT NULL,
-    tuple_id VARCHAR(64),
-    watcher_uri VARCHAR(128) NOT NULL,
-    call_id VARCHAR(255) NOT NULL,
-    to_tag VARCHAR(64) NOT NULL,
-    from_tag VARCHAR(64) NOT NULL,
-    cseq INT(11) NOT NULL,
-    record_route TEXT,
-    contact VARCHAR(128) NOT NULL,
-    remote_contact VARCHAR(128) NOT NULL,
-    version INT(11) NOT NULL,
-    extra_headers TEXT NOT NULL,
-    CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+CREATE TABLE `pua` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `pres_uri` VARCHAR(128) NOT NULL,
+    `pres_id` VARCHAR(255) NOT NULL,
+    `event` INT(11) NOT NULL,
+    `expires` INT(11) NOT NULL,
+    `desired_expires` INT(11) NOT NULL,
+    `flag` INT(11) NOT NULL,
+    `etag` VARCHAR(64) NOT NULL,
+    `tuple_id` VARCHAR(64),
+    `watcher_uri` VARCHAR(128) NOT NULL,
+    `call_id` VARCHAR(255) NOT NULL,
+    `to_tag` VARCHAR(64) NOT NULL,
+    `from_tag` VARCHAR(64) NOT NULL,
+    `cseq` INT(11) NOT NULL,
+    `record_route` TEXT,
+    `contact` VARCHAR(128) NOT NULL,
+    `remote_contact` VARCHAR(128) NOT NULL,
+    `version` INT(11) NOT NULL,
+    `extra_headers` TEXT NOT NULL,
+    CONSTRAINT pua_idx UNIQUE (`etag`, `tuple_id`, `call_id`, `from_tag`)
 );
 
-CREATE INDEX expires_idx ON pua (expires);
-CREATE INDEX dialog1_idx ON pua (pres_id, pres_uri);
-CREATE INDEX dialog2_idx ON pua (call_id, from_tag);
-CREATE INDEX record_idx ON pua (pres_id);
+CREATE INDEX expires_idx ON pua (`expires`);
+CREATE INDEX dialog1_idx ON pua (`pres_id`, `pres_uri`);
+CREATE INDEX dialog2_idx ON pua (`call_id`, `from_tag`);
+CREATE INDEX record_idx ON pua (`pres_id`);
 

utils/kamctl/mysql/purple-create.sql

@@ -1,9 +1,9 @@
 INSERT INTO version (table_name, table_version) values ('purplemap','1');
-CREATE TABLE purplemap (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    sip_user VARCHAR(128) NOT NULL,
-    ext_user VARCHAR(128) NOT NULL,
-    ext_prot VARCHAR(16) NOT NULL,
-    ext_pass VARCHAR(64)
+CREATE TABLE `purplemap` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `sip_user` VARCHAR(128) NOT NULL,
+    `ext_user` VARCHAR(128) NOT NULL,
+    `ext_prot` VARCHAR(16) NOT NULL,
+    `ext_pass` VARCHAR(64)
 );
 

utils/kamctl/mysql/registrar-create.sql

@@ -1,31 +1,31 @@
 INSERT INTO version (table_name, table_version) values ('aliases','8');
-CREATE TABLE aliases (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    ruid VARCHAR(64) DEFAULT '' NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT NULL,
-    contact VARCHAR(255) DEFAULT '' NOT NULL,
-    received VARCHAR(128) DEFAULT NULL,
-    path VARCHAR(512) DEFAULT NULL,
-    expires DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL,
-    q FLOAT(10,2) DEFAULT 1.0 NOT NULL,
-    callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL,
-    cseq INT(11) DEFAULT 1 NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    flags INT(11) DEFAULT 0 NOT NULL,
-    cflags INT(11) DEFAULT 0 NOT NULL,
-    user_agent VARCHAR(255) DEFAULT '' NOT NULL,
-    socket VARCHAR(64) DEFAULT NULL,
-    methods INT(11) DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT NULL,
-    reg_id INT(11) DEFAULT 0 NOT NULL,
-    server_id INT(11) DEFAULT 0 NOT NULL,
-    connection_id INT(11) DEFAULT 0 NOT NULL,
-    keepalive INT(11) DEFAULT 0 NOT NULL,
-    partition INT(11) DEFAULT 0 NOT NULL,
-    CONSTRAINT ruid_idx UNIQUE (ruid)
+CREATE TABLE `aliases` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `ruid` VARCHAR(64) DEFAULT '' NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT NULL,
+    `contact` VARCHAR(255) DEFAULT '' NOT NULL,
+    `received` VARCHAR(128) DEFAULT NULL,
+    `path` VARCHAR(512) DEFAULT NULL,
+    `expires` DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL,
+    `q` FLOAT(10,2) DEFAULT 1.0 NOT NULL,
+    `callid` VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL,
+    `cseq` INT(11) DEFAULT 1 NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    `flags` INT(11) DEFAULT 0 NOT NULL,
+    `cflags` INT(11) DEFAULT 0 NOT NULL,
+    `user_agent` VARCHAR(255) DEFAULT '' NOT NULL,
+    `socket` VARCHAR(64) DEFAULT NULL,
+    `methods` INT(11) DEFAULT NULL,
+    `instance` VARCHAR(255) DEFAULT NULL,
+    `reg_id` INT(11) DEFAULT 0 NOT NULL,
+    `server_id` INT(11) DEFAULT 0 NOT NULL,
+    `connection_id` INT(11) DEFAULT 0 NOT NULL,
+    `keepalive` INT(11) DEFAULT 0 NOT NULL,
+    `partition` INT(11) DEFAULT 0 NOT NULL,
+    CONSTRAINT ruid_idx UNIQUE (`ruid`)
 );
 
-CREATE INDEX account_contact_idx ON aliases (username, domain, contact);
-CREATE INDEX expires_idx ON aliases (expires);
+CREATE INDEX account_contact_idx ON aliases (`username`, `domain`, `contact`);
+CREATE INDEX expires_idx ON aliases (`expires`);
 

utils/kamctl/mysql/rls-create.sql

@@ -1,51 +1,51 @@
 INSERT INTO version (table_name, table_version) values ('rls_presentity','1');
-CREATE TABLE rls_presentity (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    rlsubs_did VARCHAR(255) NOT NULL,
-    resource_uri VARCHAR(128) NOT NULL,
-    content_type VARCHAR(255) NOT NULL,
-    presence_state BLOB NOT NULL,
-    expires INT(11) NOT NULL,
-    updated INT(11) NOT NULL,
-    auth_state INT(11) NOT NULL,
-    reason VARCHAR(64) NOT NULL,
-    CONSTRAINT rls_presentity_idx UNIQUE (rlsubs_did, resource_uri)
+CREATE TABLE `rls_presentity` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `rlsubs_did` VARCHAR(255) NOT NULL,
+    `resource_uri` VARCHAR(128) NOT NULL,
+    `content_type` VARCHAR(255) NOT NULL,
+    `presence_state` BLOB NOT NULL,
+    `expires` INT(11) NOT NULL,
+    `updated` INT(11) NOT NULL,
+    `auth_state` INT(11) NOT NULL,
+    `reason` VARCHAR(64) NOT NULL,
+    CONSTRAINT rls_presentity_idx UNIQUE (`rlsubs_did`, `resource_uri`)
 );
 
-CREATE INDEX rlsubs_idx ON rls_presentity (rlsubs_did);
-CREATE INDEX updated_idx ON rls_presentity (updated);
-CREATE INDEX expires_idx ON rls_presentity (expires);
+CREATE INDEX rlsubs_idx ON rls_presentity (`rlsubs_did`);
+CREATE INDEX updated_idx ON rls_presentity (`updated`);
+CREATE INDEX expires_idx ON rls_presentity (`expires`);
 
 INSERT INTO version (table_name, table_version) values ('rls_watchers','3');
-CREATE TABLE rls_watchers (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    presentity_uri VARCHAR(128) NOT NULL,
-    to_user VARCHAR(64) NOT NULL,
-    to_domain VARCHAR(64) NOT NULL,
-    watcher_username VARCHAR(64) NOT NULL,
-    watcher_domain VARCHAR(64) NOT NULL,
-    event VARCHAR(64) DEFAULT 'presence' NOT NULL,
-    event_id VARCHAR(64),
-    to_tag VARCHAR(64) NOT NULL,
-    from_tag VARCHAR(64) NOT NULL,
-    callid VARCHAR(255) NOT NULL,
-    local_cseq INT(11) NOT NULL,
-    remote_cseq INT(11) NOT NULL,
-    contact VARCHAR(128) NOT NULL,
-    record_route TEXT,
-    expires INT(11) NOT NULL,
-    status INT(11) DEFAULT 2 NOT NULL,
-    reason VARCHAR(64) NOT NULL,
-    version INT(11) DEFAULT 0 NOT NULL,
-    socket_info VARCHAR(64) NOT NULL,
-    local_contact VARCHAR(128) NOT NULL,
-    from_user VARCHAR(64) NOT NULL,
-    from_domain VARCHAR(64) NOT NULL,
-    updated INT(11) NOT NULL,
-    CONSTRAINT rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
+CREATE TABLE `rls_watchers` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `presentity_uri` VARCHAR(128) NOT NULL,
+    `to_user` VARCHAR(64) NOT NULL,
+    `to_domain` VARCHAR(64) NOT NULL,
+    `watcher_username` VARCHAR(64) NOT NULL,
+    `watcher_domain` VARCHAR(64) NOT NULL,
+    `event` VARCHAR(64) DEFAULT 'presence' NOT NULL,
+    `event_id` VARCHAR(64),
+    `to_tag` VARCHAR(64) NOT NULL,
+    `from_tag` VARCHAR(64) NOT NULL,
+    `callid` VARCHAR(255) NOT NULL,
+    `local_cseq` INT(11) NOT NULL,
+    `remote_cseq` INT(11) NOT NULL,
+    `contact` VARCHAR(128) NOT NULL,
+    `record_route` TEXT,
+    `expires` INT(11) NOT NULL,
+    `status` INT(11) DEFAULT 2 NOT NULL,
+    `reason` VARCHAR(64) NOT NULL,
+    `version` INT(11) DEFAULT 0 NOT NULL,
+    `socket_info` VARCHAR(64) NOT NULL,
+    `local_contact` VARCHAR(128) NOT NULL,
+    `from_user` VARCHAR(64) NOT NULL,
+    `from_domain` VARCHAR(64) NOT NULL,
+    `updated` INT(11) NOT NULL,
+    CONSTRAINT rls_watcher_idx UNIQUE (`callid`, `to_tag`, `from_tag`)
 );
 
-CREATE INDEX rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event);
-CREATE INDEX rls_watchers_expires ON rls_watchers (expires);
-CREATE INDEX updated_idx ON rls_watchers (updated);
+CREATE INDEX rls_watchers_update ON rls_watchers (`watcher_username`, `watcher_domain`, `event`);
+CREATE INDEX rls_watchers_expires ON rls_watchers (`expires`);
+CREATE INDEX updated_idx ON rls_watchers (`updated`);
 

utils/kamctl/mysql/rtpproxy-create.sql

@@ -1,10 +1,10 @@
 INSERT INTO version (table_name, table_version) values ('rtpproxy','1');
-CREATE TABLE rtpproxy (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    setid VARCHAR(32) DEFAULT 00 NOT NULL,
-    url VARCHAR(64) DEFAULT '' NOT NULL,
-    flags INT DEFAULT 0 NOT NULL,
-    weight INT DEFAULT 1 NOT NULL,
-    description VARCHAR(64) DEFAULT '' NOT NULL
+CREATE TABLE `rtpproxy` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `setid` VARCHAR(32) DEFAULT 00 NOT NULL,
+    `url` VARCHAR(64) DEFAULT '' NOT NULL,
+    `flags` INT DEFAULT 0 NOT NULL,
+    `weight` INT DEFAULT 1 NOT NULL,
+    `description` VARCHAR(64) DEFAULT '' NOT NULL
 );
 

utils/kamctl/mysql/sca-create.sql

@@ -1,21 +1,21 @@
 INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1');
-CREATE TABLE sca_subscriptions (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    subscriber VARCHAR(255) NOT NULL,
-    aor VARCHAR(255) NOT NULL,
-    event INT DEFAULT 0 NOT NULL,
-    expires INT(11) DEFAULT 0 NOT NULL,
-    state INT DEFAULT 0 NOT NULL,
-    app_idx INT DEFAULT 0 NOT NULL,
-    call_id VARCHAR(255) NOT NULL,
-    from_tag VARCHAR(64) NOT NULL,
-    to_tag VARCHAR(64) NOT NULL,
-    record_route TEXT,
-    notify_cseq INT(11) NOT NULL,
-    subscribe_cseq INT(11) NOT NULL,
-    CONSTRAINT sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag)
+CREATE TABLE `sca_subscriptions` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `subscriber` VARCHAR(255) NOT NULL,
+    `aor` VARCHAR(255) NOT NULL,
+    `event` INT DEFAULT 0 NOT NULL,
+    `expires` INT(11) DEFAULT 0 NOT NULL,
+    `state` INT DEFAULT 0 NOT NULL,
+    `app_idx` INT DEFAULT 0 NOT NULL,
+    `call_id` VARCHAR(255) NOT NULL,
+    `from_tag` VARCHAR(64) NOT NULL,
+    `to_tag` VARCHAR(64) NOT NULL,
+    `record_route` TEXT,
+    `notify_cseq` INT(11) NOT NULL,
+    `subscribe_cseq` INT(11) NOT NULL,
+    CONSTRAINT sca_subscriptions_idx UNIQUE (`subscriber`, `call_id`, `from_tag`, `to_tag`)
 );
 
-CREATE INDEX sca_expires_idx ON sca_subscriptions (expires);
-CREATE INDEX sca_subscribers_idx ON sca_subscriptions (subscriber, event);
+CREATE INDEX sca_expires_idx ON sca_subscriptions (`expires`);
+CREATE INDEX sca_subscribers_idx ON sca_subscriptions (`subscriber`, `event`);
 

utils/kamctl/mysql/siptrace-create.sql

@@ -1,22 +1,22 @@
 INSERT INTO version (table_name, table_version) values ('sip_trace','4');
-CREATE TABLE sip_trace (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    time_stamp DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    time_us INT UNSIGNED DEFAULT 0 NOT NULL,
-    callid VARCHAR(255) DEFAULT '' NOT NULL,
-    traced_user VARCHAR(128) DEFAULT '' NOT NULL,
-    msg MEDIUMTEXT NOT NULL,
-    method VARCHAR(50) DEFAULT '' NOT NULL,
-    status VARCHAR(128) DEFAULT '' NOT NULL,
-    fromip VARCHAR(50) DEFAULT '' NOT NULL,
-    toip VARCHAR(50) DEFAULT '' NOT NULL,
-    fromtag VARCHAR(64) DEFAULT '' NOT NULL,
-    totag VARCHAR(64) DEFAULT '' NOT NULL,
-    direction VARCHAR(4) DEFAULT '' NOT NULL
+CREATE TABLE `sip_trace` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `time_stamp` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    `time_us` INT UNSIGNED DEFAULT 0 NOT NULL,
+    `callid` VARCHAR(255) DEFAULT '' NOT NULL,
+    `traced_user` VARCHAR(128) DEFAULT '' NOT NULL,
+    `msg` MEDIUMTEXT NOT NULL,
+    `method` VARCHAR(50) DEFAULT '' NOT NULL,
+    `status` VARCHAR(128) DEFAULT '' NOT NULL,
+    `fromip` VARCHAR(50) DEFAULT '' NOT NULL,
+    `toip` VARCHAR(50) DEFAULT '' NOT NULL,
+    `fromtag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `totag` VARCHAR(64) DEFAULT '' NOT NULL,
+    `direction` VARCHAR(4) DEFAULT '' NOT NULL
 );
 
-CREATE INDEX traced_user_idx ON sip_trace (traced_user);
-CREATE INDEX date_idx ON sip_trace (time_stamp);
-CREATE INDEX fromip_idx ON sip_trace (fromip);
-CREATE INDEX callid_idx ON sip_trace (callid);
+CREATE INDEX traced_user_idx ON sip_trace (`traced_user`);
+CREATE INDEX date_idx ON sip_trace (`time_stamp`);
+CREATE INDEX fromip_idx ON sip_trace (`fromip`);
+CREATE INDEX callid_idx ON sip_trace (`callid`);
 

utils/kamctl/mysql/speeddial-create.sql

@@ -1,14 +1,14 @@
 INSERT INTO version (table_name, table_version) values ('speed_dial','2');
-CREATE TABLE speed_dial (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    sd_username VARCHAR(64) DEFAULT '' NOT NULL,
-    sd_domain VARCHAR(64) DEFAULT '' NOT NULL,
-    new_uri VARCHAR(128) DEFAULT '' NOT NULL,
-    fname VARCHAR(64) DEFAULT '' NOT NULL,
-    lname VARCHAR(64) DEFAULT '' NOT NULL,
-    description VARCHAR(64) DEFAULT '' NOT NULL,
-    CONSTRAINT speed_dial_idx UNIQUE (username, domain, sd_domain, sd_username)
+CREATE TABLE `speed_dial` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `sd_username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `sd_domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `new_uri` VARCHAR(128) DEFAULT '' NOT NULL,
+    `fname` VARCHAR(64) DEFAULT '' NOT NULL,
+    `lname` VARCHAR(64) DEFAULT '' NOT NULL,
+    `description` VARCHAR(64) DEFAULT '' NOT NULL,
+    CONSTRAINT speed_dial_idx UNIQUE (`username`, `domain`, `sd_domain`, `sd_username`)
 );
 

utils/kamctl/mysql/standard-create.sql

@@ -1,6 +1,6 @@
-CREATE TABLE version (
-    table_name VARCHAR(32) NOT NULL,
-    table_version INT UNSIGNED DEFAULT 0 NOT NULL,
-    CONSTRAINT table_name_idx UNIQUE (table_name)
+CREATE TABLE `version` (
+    `table_name` VARCHAR(32) NOT NULL,
+    `table_version` INT UNSIGNED DEFAULT 0 NOT NULL,
+    CONSTRAINT table_name_idx UNIQUE (`table_name`)
 );
 

utils/kamctl/mysql/uac-create.sql

@@ -1,16 +1,16 @@
 INSERT INTO version (table_name, table_version) values ('uacreg','1');
-CREATE TABLE uacreg (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    l_uuid VARCHAR(64) DEFAULT '' NOT NULL,
-    l_username VARCHAR(64) DEFAULT '' NOT NULL,
-    l_domain VARCHAR(128) DEFAULT '' NOT NULL,
-    r_username VARCHAR(64) DEFAULT '' NOT NULL,
-    r_domain VARCHAR(128) DEFAULT '' NOT NULL,
-    realm VARCHAR(64) DEFAULT '' NOT NULL,
-    auth_username VARCHAR(64) DEFAULT '' NOT NULL,
-    auth_password VARCHAR(64) DEFAULT '' NOT NULL,
-    auth_proxy VARCHAR(64) DEFAULT '' NOT NULL,
-    expires INT DEFAULT 0 NOT NULL,
-    CONSTRAINT l_uuid_idx UNIQUE (l_uuid)
+CREATE TABLE `uacreg` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `l_uuid` VARCHAR(64) DEFAULT '' NOT NULL,
+    `l_username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `l_domain` VARCHAR(128) DEFAULT '' NOT NULL,
+    `r_username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `r_domain` VARCHAR(128) DEFAULT '' NOT NULL,
+    `realm` VARCHAR(64) DEFAULT '' NOT NULL,
+    `auth_username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `auth_password` VARCHAR(64) DEFAULT '' NOT NULL,
+    `auth_proxy` VARCHAR(64) DEFAULT '' NOT NULL,
+    `expires` INT DEFAULT 0 NOT NULL,
+    CONSTRAINT l_uuid_idx UNIQUE (`l_uuid`)
 );
 

utils/kamctl/mysql/uid_auth_db-create.sql

@@ -1,18 +1,18 @@
 INSERT INTO version (table_name, table_version) values ('uid_credentials','7');
-CREATE TABLE uid_credentials (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    auth_username VARCHAR(64) NOT NULL,
-    did VARCHAR(64) DEFAULT '_default' NOT NULL,
-    realm VARCHAR(64) NOT NULL,
-    password VARCHAR(28) DEFAULT '' NOT NULL,
-    flags INT DEFAULT 0 NOT NULL,
-    ha1 VARCHAR(32) NOT NULL,
-    ha1b VARCHAR(32) DEFAULT '' NOT NULL,
-    uid VARCHAR(64) NOT NULL
+CREATE TABLE `uid_credentials` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `auth_username` VARCHAR(64) NOT NULL,
+    `did` VARCHAR(64) DEFAULT '_default' NOT NULL,
+    `realm` VARCHAR(64) NOT NULL,
+    `password` VARCHAR(28) DEFAULT '' NOT NULL,
+    `flags` INT DEFAULT 0 NOT NULL,
+    `ha1` VARCHAR(32) NOT NULL,
+    `ha1b` VARCHAR(32) DEFAULT '' NOT NULL,
+    `uid` VARCHAR(64) NOT NULL
 );
 
-CREATE INDEX cred_idx ON uid_credentials (auth_username, did);
-CREATE INDEX uid ON uid_credentials (uid);
-CREATE INDEX did_idx ON uid_credentials (did);
-CREATE INDEX realm_idx ON uid_credentials (realm);
+CREATE INDEX cred_idx ON uid_credentials (`auth_username`, `did`);
+CREATE INDEX uid ON uid_credentials (`uid`);
+CREATE INDEX did_idx ON uid_credentials (`did`);
+CREATE INDEX realm_idx ON uid_credentials (`realm`);
 

utils/kamctl/mysql/uid_avp_db-create.sql

@@ -1,11 +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)
+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`)
 );
 

utils/kamctl/mysql/uid_domain-create.sql

@@ -1,24 +1,24 @@
 INSERT INTO version (table_name, table_version) values ('uid_domain','2');
-CREATE TABLE uid_domain (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    did VARCHAR(64) NOT NULL,
-    domain VARCHAR(64) NOT NULL,
-    flags INT UNSIGNED DEFAULT 0 NOT NULL,
-    CONSTRAINT domain_idx UNIQUE (domain)
+CREATE TABLE `uid_domain` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `did` VARCHAR(64) NOT NULL,
+    `domain` VARCHAR(64) NOT NULL,
+    `flags` INT UNSIGNED DEFAULT 0 NOT NULL,
+    CONSTRAINT domain_idx UNIQUE (`domain`)
 );
 
-CREATE INDEX did_idx ON uid_domain (did);
+CREATE INDEX did_idx ON uid_domain (`did`);
 
 INSERT INTO version (table_name, table_version) values ('uid_domain_attrs','1');
-CREATE TABLE uid_domain_attrs (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    did VARCHAR(64),
-    name VARCHAR(32) NOT NULL,
-    type INT DEFAULT 0 NOT NULL,
-    value VARCHAR(128),
-    flags INT UNSIGNED DEFAULT 0 NOT NULL,
-    CONSTRAINT domain_attr_idx UNIQUE (did, name, value)
+CREATE TABLE `uid_domain_attrs` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `did` VARCHAR(64),
+    `name` VARCHAR(32) NOT NULL,
+    `type` INT DEFAULT 0 NOT NULL,
+    `value` VARCHAR(128),
+    `flags` INT UNSIGNED DEFAULT 0 NOT NULL,
+    CONSTRAINT domain_attr_idx UNIQUE (`did`, `name`, `value`)
 );
 
-CREATE INDEX domain_did ON uid_domain_attrs (did, flags);
+CREATE INDEX domain_did ON uid_domain_attrs (`did`, `flags`);
 

utils/kamctl/mysql/uid_gflags-create.sql

@@ -1,10 +1,10 @@
 INSERT INTO version (table_name, table_version) values ('uid_global_attrs','1');
-CREATE TABLE uid_global_attrs (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    name VARCHAR(32) NOT NULL,
-    type INT DEFAULT 0 NOT NULL,
-    value VARCHAR(128),
-    flags INT UNSIGNED DEFAULT 0 NOT NULL,
-    CONSTRAINT global_attrs_idx UNIQUE (name, value)
+CREATE TABLE `uid_global_attrs` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `name` VARCHAR(32) NOT NULL,
+    `type` INT DEFAULT 0 NOT NULL,
+    `value` VARCHAR(128),
+    `flags` INT UNSIGNED DEFAULT 0 NOT NULL,
+    CONSTRAINT global_attrs_idx UNIQUE (`name`, `value`)
 );
 

utils/kamctl/mysql/uid_uri_db-create.sql

@@ -1,26 +1,26 @@
 INSERT INTO version (table_name, table_version) values ('uid_uri','3');
-CREATE TABLE uid_uri (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    uid VARCHAR(64) NOT NULL,
-    did VARCHAR(64) NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    flags INT UNSIGNED DEFAULT 0 NOT NULL,
-    scheme VARCHAR(8) DEFAULT 'sip' NOT NULL
+CREATE TABLE `uid_uri` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `uid` VARCHAR(64) NOT NULL,
+    `did` VARCHAR(64) NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `flags` INT UNSIGNED DEFAULT 0 NOT NULL,
+    `scheme` VARCHAR(8) DEFAULT 'sip' NOT NULL
 );
 
-CREATE INDEX uri_idx1 ON uid_uri (username, did, scheme);
-CREATE INDEX uri_uid ON uid_uri (uid);
+CREATE INDEX uri_idx1 ON uid_uri (`username`, `did`, `scheme`);
+CREATE INDEX uri_uid ON uid_uri (`uid`);
 
 INSERT INTO version (table_name, table_version) values ('uid_uri_attrs','2');
-CREATE TABLE uid_uri_attrs (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) NOT NULL,
-    did 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,
-    scheme VARCHAR(8) DEFAULT 'sip' NOT NULL,
-    CONSTRAINT uriattrs_idx UNIQUE (username, did, name, value, scheme)
+CREATE TABLE `uid_uri_attrs` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) NOT NULL,
+    `did` 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,
+    `scheme` VARCHAR(8) DEFAULT 'sip' NOT NULL,
+    CONSTRAINT uriattrs_idx UNIQUE (`username`, `did`, `name`, `value`, `scheme`)
 );
 

utils/kamctl/mysql/uri_db-create.sql

@@ -1,10 +1,10 @@
 INSERT INTO version (table_name, table_version) values ('uri','1');
-CREATE TABLE uri (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    uri_user VARCHAR(64) DEFAULT '' NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    CONSTRAINT account_idx UNIQUE (username, domain, uri_user)
+CREATE TABLE `uri` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `uri_user` VARCHAR(64) DEFAULT '' NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    CONSTRAINT account_idx UNIQUE (`username`, `domain`, `uri_user`)
 );
 

utils/kamctl/mysql/userblacklist-create.sql

@@ -1,21 +1,21 @@
 INSERT INTO version (table_name, table_version) values ('userblacklist','1');
-CREATE TABLE userblacklist (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT '' NOT NULL,
-    prefix VARCHAR(64) DEFAULT '' NOT NULL,
-    whitelist TINYINT(1) DEFAULT 0 NOT NULL
+CREATE TABLE `userblacklist` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT '' NOT NULL,
+    `prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `whitelist` TINYINT(1) DEFAULT 0 NOT NULL
 );
 
-CREATE INDEX userblacklist_idx ON userblacklist (username, domain, prefix);
+CREATE INDEX userblacklist_idx ON userblacklist (`username`, `domain`, `prefix`);
 
 INSERT INTO version (table_name, table_version) values ('globalblacklist','1');
-CREATE TABLE globalblacklist (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    prefix VARCHAR(64) DEFAULT '' NOT NULL,
-    whitelist TINYINT(1) DEFAULT 0 NOT NULL,
-    description VARCHAR(255) DEFAULT NULL
+CREATE TABLE `globalblacklist` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `prefix` VARCHAR(64) DEFAULT '' NOT NULL,
+    `whitelist` TINYINT(1) DEFAULT 0 NOT NULL,
+    `description` VARCHAR(255) DEFAULT NULL
 );
 
-CREATE INDEX globalblacklist_idx ON globalblacklist (prefix);
+CREATE INDEX globalblacklist_idx ON globalblacklist (`prefix`);
 

utils/kamctl/mysql/usrloc-create.sql

@@ -1,46 +1,46 @@
 INSERT INTO version (table_name, table_version) values ('location','8');
-CREATE TABLE location (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    ruid VARCHAR(64) DEFAULT '' NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT NULL,
-    contact VARCHAR(255) DEFAULT '' NOT NULL,
-    received VARCHAR(128) DEFAULT NULL,
-    path VARCHAR(512) DEFAULT NULL,
-    expires DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL,
-    q FLOAT(10,2) DEFAULT 1.0 NOT NULL,
-    callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL,
-    cseq INT(11) DEFAULT 1 NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
-    flags INT(11) DEFAULT 0 NOT NULL,
-    cflags INT(11) DEFAULT 0 NOT NULL,
-    user_agent VARCHAR(255) DEFAULT '' NOT NULL,
-    socket VARCHAR(64) DEFAULT NULL,
-    methods INT(11) DEFAULT NULL,
-    instance VARCHAR(255) DEFAULT NULL,
-    reg_id INT(11) DEFAULT 0 NOT NULL,
-    server_id INT(11) DEFAULT 0 NOT NULL,
-    connection_id INT(11) DEFAULT 0 NOT NULL,
-    keepalive INT(11) DEFAULT 0 NOT NULL,
-    partition INT(11) DEFAULT 0 NOT NULL,
-    CONSTRAINT ruid_idx UNIQUE (ruid)
+CREATE TABLE `location` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `ruid` VARCHAR(64) DEFAULT '' NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT NULL,
+    `contact` VARCHAR(255) DEFAULT '' NOT NULL,
+    `received` VARCHAR(128) DEFAULT NULL,
+    `path` VARCHAR(512) DEFAULT NULL,
+    `expires` DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL,
+    `q` FLOAT(10,2) DEFAULT 1.0 NOT NULL,
+    `callid` VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL,
+    `cseq` INT(11) DEFAULT 1 NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL,
+    `flags` INT(11) DEFAULT 0 NOT NULL,
+    `cflags` INT(11) DEFAULT 0 NOT NULL,
+    `user_agent` VARCHAR(255) DEFAULT '' NOT NULL,
+    `socket` VARCHAR(64) DEFAULT NULL,
+    `methods` INT(11) DEFAULT NULL,
+    `instance` VARCHAR(255) DEFAULT NULL,
+    `reg_id` INT(11) DEFAULT 0 NOT NULL,
+    `server_id` INT(11) DEFAULT 0 NOT NULL,
+    `connection_id` INT(11) DEFAULT 0 NOT NULL,
+    `keepalive` INT(11) DEFAULT 0 NOT NULL,
+    `partition` INT(11) DEFAULT 0 NOT NULL,
+    CONSTRAINT ruid_idx UNIQUE (`ruid`)
 );
 
-CREATE INDEX account_contact_idx ON location (username, domain, contact);
-CREATE INDEX expires_idx ON location (expires);
+CREATE INDEX account_contact_idx ON location (`username`, `domain`, `contact`);
+CREATE INDEX expires_idx ON location (`expires`);
 
 INSERT INTO version (table_name, table_version) values ('location_attrs','1');
-CREATE TABLE location_attrs (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
-    ruid VARCHAR(64) DEFAULT '' NOT NULL,
-    username VARCHAR(64) DEFAULT '' NOT NULL,
-    domain VARCHAR(64) DEFAULT NULL,
-    aname VARCHAR(64) DEFAULT '' NOT NULL,
-    atype INT(11) DEFAULT 0 NOT NULL,
-    avalue VARCHAR(255) DEFAULT '' NOT NULL,
-    last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL
+CREATE TABLE `location_attrs` (
+    `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    `ruid` VARCHAR(64) DEFAULT '' NOT NULL,
+    `username` VARCHAR(64) DEFAULT '' NOT NULL,
+    `domain` VARCHAR(64) DEFAULT NULL,
+    `aname` VARCHAR(64) DEFAULT '' NOT NULL,
+    `atype` INT(11) DEFAULT 0 NOT NULL,
+    `avalue` VARCHAR(255) DEFAULT '' NOT NULL,
+    `last_modified` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL
 );
 
-CREATE INDEX account_record_idx ON location_attrs (username, domain, ruid);
-CREATE INDEX last_modified_idx ON location_attrs (last_modified);
+CREATE INDEX account_record_idx ON location_attrs (`username`, `domain`, `ruid`);
+CREATE INDEX last_modified_idx ON location_attrs (`last_modified`);