Regent to accomodate latest schema XML changes and postgresql XLT fix.

scripts/mysql/my_create.sql

@@ -385,7 +385,7 @@ CREATE TABLE offline_winfo (
     created_on DATETIME NOT NULL DEFAULT '2006-01-31 13:13:13',
     expires_on DATETIME NOT NULL DEFAULT '2006-01-31 13:13:13',
     dbid INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
-    KEY offline_winfo_key (dbid)
+    UNIQUE KEY offline_winfo_key (dbid)
 );
 
 INSERT INTO version (table_name, table_version) values ('rls_subscription','1');

scripts/oracle/or_create.sql

@@ -385,7 +385,7 @@ CREATE TABLE offline_winfo (
     created_on DATETIME NOT NULL DEFAULT '2006-01-31 13:13:13',
     expires_on DATETIME NOT NULL DEFAULT '2006-01-31 13:13:13',
     dbid INT(10) UNSIGNED NOT NULL,
-    KEY offline_winfo_key (dbid)
+    UNIQUE KEY offline_winfo_key (dbid)
 );
 
 INSERT INTO version (table_name, table_version) values ('rls_subscription','1');

scripts/postgres/pg_create.sql

@@ -4,6 +4,7 @@ CREATE TABLE version (
     table_version INTEGER NOT NULL DEFAULT '0'
 );
 
+INSERT INTO version (table_name, table_version) values ('acc','3');
 CREATE TABLE acc (
     id SERIAL NOT NULL,
     from_uid VARCHAR(64),
@@ -35,6 +36,7 @@ CREATE TABLE acc (
 
 CREATE INDEX acc_cid_key ON acc (sip_callid);
 
+INSERT INTO version (table_name, table_version) values ('missed_calls','3');
 CREATE TABLE missed_calls (
     id SERIAL NOT NULL,
     from_uid VARCHAR(64),
@@ -66,6 +68,7 @@ CREATE TABLE missed_calls (
 
 CREATE INDEX mc_cid_key ON missed_calls (sip_callid);
 
+INSERT INTO version (table_name, table_version) values ('credentials','7');
 CREATE TABLE credentials (
     auth_username VARCHAR(64) NOT NULL,
     did VARCHAR(64) NOT NULL DEFAULT '_default',
@@ -80,6 +83,7 @@ CREATE TABLE credentials (
 CREATE INDEX cred_idx ON credentials (auth_username, did);
 CREATE INDEX uid ON credentials (uid);
 
+INSERT INTO version (table_name, table_version) values ('attr_types','4');
 CREATE TABLE attr_types (
     name VARCHAR(32) NOT NULL,
     rich_type VARCHAR(32) NOT NULL DEFAULT 'string',
@@ -95,6 +99,7 @@ CREATE TABLE attr_types (
     CONSTRAINT upt_idx1 UNIQUE (name)
 );
 
+INSERT INTO version (table_name, table_version) values ('global_attrs','1');
 CREATE TABLE global_attrs (
     name VARCHAR(32) NOT NULL,
     type INTEGER NOT NULL DEFAULT '0',
@@ -103,6 +108,7 @@ CREATE TABLE global_attrs (
     CONSTRAINT global_attrs_idx UNIQUE (name, value)
 );
 
+INSERT INTO version (table_name, table_version) values ('domain_attrs','1');
 CREATE TABLE domain_attrs (
     did VARCHAR(64),
     name VARCHAR(32) NOT NULL,
@@ -114,6 +120,7 @@ CREATE TABLE domain_attrs (
 
 CREATE INDEX domain_did ON domain_attrs (did, flags);
 
+INSERT INTO version (table_name, table_version) values ('user_attrs','3');
 CREATE TABLE user_attrs (
     uid VARCHAR(64) NOT NULL,
     name VARCHAR(32) NOT NULL,
@@ -123,6 +130,7 @@ CREATE TABLE user_attrs (
     CONSTRAINT userattrs_idx UNIQUE (uid, name, value)
 );
 
+INSERT INTO version (table_name, table_version) values ('uri_attrs','2');
 CREATE TABLE uri_attrs (
     username VARCHAR(64) NOT NULL,
     did VARCHAR(64) NOT NULL,
@@ -134,6 +142,7 @@ CREATE TABLE uri_attrs (
     CONSTRAINT uriattrs_idx UNIQUE (username, did, name, value, scheme)
 );
 
+INSERT INTO version (table_name, table_version) values ('domain','2');
 CREATE TABLE domain (
     did VARCHAR(64) NOT NULL,
     domain VARCHAR(128) NOT NULL,
@@ -141,6 +150,7 @@ CREATE TABLE domain (
     CONSTRAINT domain_idx UNIQUE (domain)
 );
 
+INSERT INTO version (table_name, table_version) values ('domain_settings','1');
 CREATE TABLE domain_settings (
     did VARCHAR(64) NOT NULL,
     filename VARCHAR(255) NOT NULL,
@@ -153,6 +163,7 @@ CREATE TABLE domain_settings (
 
 CREATE INDEX ds_df ON domain_settings (did, filename);
 
+INSERT INTO version (table_name, table_version) values ('location','9');
 CREATE TABLE location (
     uid VARCHAR(64) NOT NULL,
     aor VARCHAR(255) NOT NULL,
@@ -170,6 +181,7 @@ CREATE TABLE location (
 
 CREATE INDEX location_contact ON location (contact);
 
+INSERT INTO version (table_name, table_version) values ('contact_attrs','1');
 CREATE TABLE contact_attrs (
     uid VARCHAR(64) NOT NULL,
     contact VARCHAR(255) NOT NULL,
@@ -180,6 +192,7 @@ CREATE TABLE contact_attrs (
     CONSTRAINT contactattrs_idx UNIQUE (uid, contact, name)
 );
 
+INSERT INTO version (table_name, table_version) values ('trusted','1');
 CREATE TABLE trusted (
     src_ip VARCHAR(39) NOT NULL,
     proto VARCHAR(4) NOT NULL,
@@ -187,6 +200,7 @@ CREATE TABLE trusted (
     CONSTRAINT trusted_idx UNIQUE (src_ip, proto, from_pattern)
 );
 
+INSERT INTO version (table_name, table_version) values ('ipmatch','1');
 CREATE TABLE ipmatch (
     ip VARCHAR(50) NOT NULL DEFAULT '',
     avp_val VARCHAR(30) DEFAULT NULL,
@@ -195,6 +209,7 @@ CREATE TABLE ipmatch (
     CONSTRAINT ipmatch_idx UNIQUE (ip, mark)
 );
 
+INSERT INTO version (table_name, table_version) values ('phonebook','1');
 CREATE TABLE phonebook (
     id SERIAL NOT NULL,
     uid VARCHAR(64) NOT NULL,
@@ -206,6 +221,7 @@ CREATE TABLE phonebook (
 
 CREATE INDEX pb_uid ON phonebook (uid);
 
+INSERT INTO version (table_name, table_version) values ('gw','3');
 CREATE TABLE gw (
     gw_name VARCHAR(128) NOT NULL,
     ip_addr INTEGER NOT NULL,
@@ -218,12 +234,14 @@ CREATE TABLE gw (
 
 CREATE INDEX gw_idx2 ON gw (grp_id);
 
+INSERT INTO version (table_name, table_version) values ('gw_grp','2');
 CREATE TABLE gw_grp (
     grp_id SERIAL NOT NULL,
     grp_name VARCHAR(64) NOT NULL,
     CONSTRAINT gwgrp_idx UNIQUE (grp_id)
 );
 
+INSERT INTO version (table_name, table_version) values ('lcr','1');
 CREATE TABLE lcr (
     prefix VARCHAR(16) NOT NULL,
     from_uri VARCHAR(255) NOT NULL DEFAULT '%',
@@ -235,6 +253,7 @@ CREATE INDEX lcr_idx1 ON lcr (prefix);
 CREATE INDEX lcr_idx2 ON lcr (from_uri);
 CREATE INDEX lcr_idx3 ON lcr (grp_id);
 
+INSERT INTO version (table_name, table_version) values ('grp','3');
 CREATE TABLE grp (
     uid VARCHAR(64) NOT NULL DEFAULT '',
     grp VARCHAR(64) NOT NULL DEFAULT '',
@@ -243,6 +262,7 @@ CREATE TABLE grp (
 
 CREATE INDEX grp_idx ON grp (uid, grp);
 
+INSERT INTO version (table_name, table_version) values ('silo','4');
 CREATE TABLE silo (
     mid SERIAL NOT NULL,
     from_hdr VARCHAR(255) NOT NULL,
@@ -256,6 +276,7 @@ CREATE TABLE silo (
     CONSTRAINT silo_idx1 UNIQUE (mid)
 );
 
+INSERT INTO version (table_name, table_version) values ('uri','3');
 CREATE TABLE uri (
     uid VARCHAR(64) NOT NULL,
     did VARCHAR(64) NOT NULL,
@@ -267,6 +288,7 @@ CREATE TABLE uri (
 CREATE INDEX uri_idx1 ON uri (username, did, scheme);
 CREATE INDEX uri_uid ON uri (uid);
 
+INSERT INTO version (table_name, table_version) values ('speed_dial','2');
 CREATE TABLE speed_dial (
     id SERIAL NOT NULL,
     uid VARCHAR(64) NOT NULL,
@@ -279,6 +301,7 @@ CREATE TABLE speed_dial (
 
 CREATE INDEX speeddial_uid ON speed_dial (uid);
 
+INSERT INTO version (table_name, table_version) values ('sd_attrs','1');
 CREATE TABLE sd_attrs (
     id VARCHAR(64) NOT NULL,
     name VARCHAR(32) NOT NULL,
@@ -288,6 +311,7 @@ CREATE TABLE sd_attrs (
     CONSTRAINT sd_idx UNIQUE (id, name, value)
 );
 
+INSERT INTO version (table_name, table_version) values ('presentity','5');
 CREATE TABLE presentity (
     pres_id VARCHAR(64) NOT NULL,
     uri VARCHAR(255) NOT NULL,
@@ -297,6 +321,7 @@ CREATE TABLE presentity (
     CONSTRAINT presentity_key UNIQUE (pres_id)
 );
 
+INSERT INTO version (table_name, table_version) values ('presentity_notes','5');
 CREATE TABLE presentity_notes (
     dbid VARCHAR(64) NOT NULL,
     pres_id VARCHAR(64) NOT NULL,
@@ -307,6 +332,7 @@ CREATE TABLE presentity_notes (
     CONSTRAINT pnotes_idx1 UNIQUE (dbid)
 );
 
+INSERT INTO version (table_name, table_version) values ('presentity_extensions','5');
 CREATE TABLE presentity_extensions (
     dbid VARCHAR(64) NOT NULL,
     pres_id VARCHAR(64) NOT NULL,
@@ -316,6 +342,7 @@ CREATE TABLE presentity_extensions (
     CONSTRAINT presextensions_idx1 UNIQUE (dbid)
 );
 
+INSERT INTO version (table_name, table_version) values ('presentity_contact','5');
 CREATE TABLE presentity_contact (
     pres_id VARCHAR(64) NOT NULL,
     basic INTEGER NOT NULL,
@@ -328,6 +355,7 @@ CREATE TABLE presentity_contact (
     CONSTRAINT presid_index UNIQUE (pres_id, tupleid)
 );
 
+INSERT INTO version (table_name, table_version) values ('watcherinfo','5');
 CREATE TABLE watcherinfo (
     w_uri VARCHAR(255) NOT NULL,
     display_name VARCHAR(128) NOT NULL,
@@ -344,6 +372,7 @@ CREATE TABLE watcherinfo (
     CONSTRAINT wi_idx1 UNIQUE (s_id)
 );
 
+INSERT INTO version (table_name, table_version) values ('tuple_notes','5');
 CREATE TABLE tuple_notes (
     pres_id VARCHAR(64) NOT NULL,
     tupleid VARCHAR(64) NOT NULL,
@@ -351,6 +380,7 @@ CREATE TABLE tuple_notes (
     lang VARCHAR(64) NOT NULL
 );
 
+INSERT INTO version (table_name, table_version) values ('tuple_extensions','5');
 CREATE TABLE tuple_extensions (
     pres_id VARCHAR(64) NOT NULL,
     tupleid VARCHAR(64) NOT NULL,
@@ -358,6 +388,7 @@ CREATE TABLE tuple_extensions (
     status_extension INTEGER NOT NULL
 );
 
+INSERT INTO version (table_name, table_version) values ('offline_winfo','5');
 CREATE TABLE offline_winfo (
     uid VARCHAR(64) NOT NULL,
     watcher VARCHAR(255) NOT NULL,
@@ -366,11 +397,11 @@ CREATE TABLE offline_winfo (
     status VARCHAR(32),
     created_on TIMESTAMP NOT NULL DEFAULT '2006-01-31 13:13:13',
     expires_on TIMESTAMP NOT NULL DEFAULT '2006-01-31 13:13:13',
-    dbid SERIAL NOT NULL
+    dbid SERIAL NOT NULL,
+    CONSTRAINT offline_winfo_key UNIQUE (dbid)
 );
 
-CREATE INDEX offline_winfo_key ON offline_winfo (dbid);
-
+INSERT INTO version (table_name, table_version) values ('rls_subscription','1');
 CREATE TABLE rls_subscription (
     id VARCHAR(48) NOT NULL,
     doc_version INTEGER NOT NULL,
@@ -385,6 +416,7 @@ CREATE TABLE rls_subscription (
     CONSTRAINT rls_subscription_key UNIQUE (id)
 );
 
+INSERT INTO version (table_name, table_version) values ('rls_vs','1');
 CREATE TABLE rls_vs (
     id VARCHAR(48) NOT NULL,
     rls_id VARCHAR(48) NOT NULL,
@@ -392,12 +424,14 @@ CREATE TABLE rls_vs (
     CONSTRAINT rls_vs_key UNIQUE (id)
 );
 
+INSERT INTO version (table_name, table_version) values ('rls_vs_names','1');
 CREATE TABLE rls_vs_names (
     id VARCHAR(48) NOT NULL,
     name VARCHAR(64),
     lang VARCHAR(64)
 );
 
+INSERT INTO version (table_name, table_version) values ('i18n','1');
 CREATE TABLE i18n (
     code INTEGER NOT NULL,
     reason_re VARCHAR(255) DEFAULT NULL,
@@ -408,12 +442,14 @@ CREATE TABLE i18n (
 
 CREATE INDEX i18n_idx ON i18n (code);
 
+INSERT INTO version (table_name, table_version) values ('pdt','1');
 CREATE TABLE pdt (
     prefix VARCHAR(32) NOT NULL,
     domain VARCHAR(255) NOT NULL,
     CONSTRAINT pdt_idx UNIQUE (prefix)
 );
 
+INSERT INTO version (table_name, table_version) values ('cpl','2');
 CREATE TABLE cpl (
     uid VARCHAR(64) NOT NULL,
     cpl_xml BYTEA,
@@ -421,6 +457,7 @@ CREATE TABLE cpl (
     CONSTRAINT cpl_key UNIQUE (uid)
 );
 
+INSERT INTO version (table_name, table_version) values ('customers','1');
 CREATE TABLE customers (
     cid SERIAL NOT NULL,
     name VARCHAR(128) NOT NULL,