Regenerated scripts for database creation - I have forgotten after last change

scripts/dbtext/ser_db/presentity

@@ -1 +1 @@
-presid(int,auto) uri(str) uid(str) pdomain(str) 
+pres_id(str) uri(str) uid(str) pdomain(str) xcap_params(str) 

scripts/dbtext/ser_db/presentity_contact

@@ -1 +1 @@
-contactid(int,auto) presid(int) basic(str) status(str) location(str) expires(int) placeid(int,null) priority(double) contact(str,null) tupleid(str) prescaps(int) etag(str) published_id(str) 
+pres_id(str) basic(int) expires(int) priority(double) contact(str,null) tupleid(str) etag(str) published_id(str) 

scripts/dbtext/ser_db/presentity_notes

@@ -1 +1 @@
-dbid(str) presid(int) etag(str) note(str) lang(str) expires(int) 
+dbid(str) pres_id(str) etag(str) note(str) lang(str) expires(int) 

scripts/dbtext/ser_db/tuple_notes

@@ -1 +1 @@
-presid(int) tupleid(str) note(str) lang(str) 
+pres_id(str) tupleid(str) note(str) lang(str) 

scripts/dbtext/ser_db/watcherinfo

@@ -1 +1 @@
-r_uri(str) w_uri(str) display_name(str) s_id(str) package(str) status(str) event(str) expires(int) accepts(int) presid(int) server_contact(str) dialog(str) doc_index(int) 
+w_uri(str) display_name(str) s_id(str) package(str) status(str) event(str) expires(int) accepts(int) pres_id(str) server_contact(str) dialog(str) doc_index(int) 

scripts/mysql/my_create.sql

@@ -173,6 +173,17 @@ CREATE TABLE location (
     KEY location_contact (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,
+    name VARCHAR(32) NOT NULL,
+    value VARCHAR(255),
+    type INT NOT NULL DEFAULT '0',
+    flags INT UNSIGNED NOT NULL DEFAULT '0',
+    UNIQUE KEY contactattrs_idx (uid, contact, name)
+);
+
 INSERT INTO version (table_name, table_version) values ('trusted','1');
 CREATE TABLE trusted (
     src_ip VARCHAR(39) NOT NULL,
@@ -286,20 +297,20 @@ CREATE TABLE sd_attrs (
     UNIQUE KEY sd_idx (id, name, value)
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity','1');
+INSERT INTO version (table_name, table_version) values ('presentity','5');
 CREATE TABLE presentity (
-    presid INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     uri VARCHAR(255) NOT NULL,
     uid VARCHAR(64) NOT NULL,
     pdomain VARCHAR(128) NOT NULL,
-    UNIQUE KEY presentity_key (presid),
-    KEY presentity_key2 (uri)
+    xcap_params BLOB NOT NULL,
+    UNIQUE KEY presentity_key (pres_id)
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity_notes','1');
+INSERT INTO version (table_name, table_version) values ('presentity_notes','5');
 CREATE TABLE presentity_notes (
     dbid VARCHAR(64) NOT NULL,
-    presid INT(10) UNSIGNED NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     etag VARCHAR(64) NOT NULL,
     note VARCHAR(128) NOT NULL,
     lang VARCHAR(64) NOT NULL,
@@ -307,67 +318,63 @@ CREATE TABLE presentity_notes (
     UNIQUE KEY pnotes_idx1 (dbid)
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity_persons','1');
-CREATE TABLE presentity_persons (
+INSERT INTO version (table_name, table_version) values ('presentity_extensions','5');
+CREATE TABLE presentity_extensions (
     dbid VARCHAR(64) NOT NULL,
-    presid INT(10) UNSIGNED NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     etag VARCHAR(64) NOT NULL,
-    person_element BLOB NOT NULL,
-    id VARCHAR(128) NOT NULL,
+    element BLOB NOT NULL,
     expires DATETIME NOT NULL DEFAULT '2005-12-07 08:13:15',
-    UNIQUE KEY prespersons_idx1 (dbid)
+    UNIQUE KEY presextensions_idx1 (dbid)
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity_contact','1');
+INSERT INTO version (table_name, table_version) values ('presentity_contact','5');
 CREATE TABLE presentity_contact (
-    contactid INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
-    presid INT(10) UNSIGNED NOT NULL,
-    basic VARCHAR(32) NOT NULL DEFAULT 'offline',
-    status VARCHAR(32) NOT NULL,
-    location VARCHAR(128) NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
+    basic INT(3) NOT NULL,
     expires DATETIME NOT NULL DEFAULT '2004-05-28 21:32:15',
-    placeid INT(10),
     priority FLOAT NOT NULL DEFAULT '0.5',
     contact VARCHAR(255),
     tupleid VARCHAR(64) NOT NULL,
-    prescaps INT(10) NOT NULL,
     etag VARCHAR(64) NOT NULL,
     published_id VARCHAR(64) NOT NULL,
-    UNIQUE KEY pc_idx1 (contactid),
-    KEY presid_index (presid),
-    KEY location_index (location),
-    KEY placeid_index (placeid)
+    UNIQUE KEY presid_index (pres_id, tupleid)
 );
 
-INSERT INTO version (table_name, table_version) values ('watcherinfo','1');
+INSERT INTO version (table_name, table_version) values ('watcherinfo','5');
 CREATE TABLE watcherinfo (
-    r_uri VARCHAR(255) NOT NULL,
     w_uri VARCHAR(255) NOT NULL,
     display_name VARCHAR(128) NOT NULL,
     s_id VARCHAR(64) NOT NULL,
     package VARCHAR(32) NOT NULL DEFAULT 'presence',
     status VARCHAR(32) NOT NULL DEFAULT 'pending',
     event VARCHAR(32) NOT NULL,
-    expires INT NOT NULL,
+    expires DATETIME NOT NULL DEFAULT '2005-12-07 08:13:15',
     accepts INT NOT NULL,
-    presid INT(10) UNSIGNED NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     server_contact VARCHAR(255) NOT NULL,
     dialog BLOB NOT NULL,
     doc_index INT NOT NULL,
-    UNIQUE KEY wi_idx1 (s_id),
-    KEY wi_ruri_idx (r_uri),
-    KEY wi_wuri_idx (w_uri)
+    UNIQUE KEY wi_idx1 (s_id)
 );
 
-INSERT INTO version (table_name, table_version) values ('tuple_notes','1');
+INSERT INTO version (table_name, table_version) values ('tuple_notes','5');
 CREATE TABLE tuple_notes (
-    presid INT(10) UNSIGNED NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     tupleid VARCHAR(64) NOT NULL,
     note VARCHAR(128) NOT NULL,
     lang VARCHAR(64) NOT NULL
 );
 
-INSERT INTO version (table_name, table_version) values ('offline_winfo','1');
+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,
+    element BLOB NOT NULL,
+    status_extension INT(1) 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,

scripts/oracle/or_create.sql

@@ -171,6 +171,17 @@ CREATE TABLE location (
 
 );
 
+INSERT INTO version (table_name, table_version) values ('contact_attrs','1');
+CREATE TABLE contact_attrs (
+    uid string(64) NOT NULL,
+    contact string(255) NOT NULL,
+    name string(32) NOT NULL,
+    value string(255),
+    type int NOT NULL DEFAULT '0',
+    flags int NOT NULL DEFAULT '0',
+    contactattrs_idx UNIQUE (uid, contact, name, )
+);
+
 INSERT INTO version (table_name, table_version) values ('trusted','1');
 CREATE TABLE trusted (
     src_ip string(39) NOT NULL,
@@ -278,20 +289,20 @@ CREATE TABLE sd_attrs (
     sd_idx UNIQUE (id, name, value, )
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity','1');
+INSERT INTO version (table_name, table_version) values ('presentity','5');
 CREATE TABLE presentity (
-    presid int(10) NOT NULL,
+    pres_id string(64) NOT NULL,
     uri string(255) NOT NULL,
     uid string(64) NOT NULL,
     pdomain string(128) NOT NULL,
-    presentity_key UNIQUE (presid, ),
-
+    xcap_params binary NOT NULL,
+    presentity_key UNIQUE (pres_id, )
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity_notes','1');
+INSERT INTO version (table_name, table_version) values ('presentity_notes','5');
 CREATE TABLE presentity_notes (
     dbid string(64) NOT NULL,
-    presid int(10) NOT NULL,
+    pres_id string(64) NOT NULL,
     etag string(64) NOT NULL,
     note string(128) NOT NULL,
     lang string(64) NOT NULL,
@@ -299,64 +310,63 @@ CREATE TABLE presentity_notes (
     pnotes_idx1 UNIQUE (dbid, )
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity_persons','1');
-CREATE TABLE presentity_persons (
+INSERT INTO version (table_name, table_version) values ('presentity_extensions','5');
+CREATE TABLE presentity_extensions (
     dbid string(64) NOT NULL,
-    presid int(10) NOT NULL,
+    pres_id string(64) NOT NULL,
     etag string(64) NOT NULL,
-    person_element binary NOT NULL,
-    id string(128) NOT NULL,
+    element binary NOT NULL,
     expires datetime NOT NULL DEFAULT '2005-12-07 08:13:15',
-    prespersons_idx1 UNIQUE (dbid, )
+    presextensions_idx1 UNIQUE (dbid, )
 );
 
-INSERT INTO version (table_name, table_version) values ('presentity_contact','1');
+INSERT INTO version (table_name, table_version) values ('presentity_contact','5');
 CREATE TABLE presentity_contact (
-    contactid int(10) NOT NULL,
-    presid int(10) NOT NULL,
-    basic string(32) NOT NULL DEFAULT 'offline',
-    status string(32) NOT NULL,
-    location string(128) NOT NULL,
+    pres_id string(64) NOT NULL,
+    basic int(3) NOT NULL,
     expires datetime NOT NULL DEFAULT '2004-05-28 21:32:15',
-    placeid int(10),
     priority float NOT NULL DEFAULT '0.5',
     contact string(255),
     tupleid string(64) NOT NULL,
-    prescaps int(10) NOT NULL,
     etag string(64) NOT NULL,
     published_id string(64) NOT NULL,
-    pc_idx1 UNIQUE (contactid, ),
-
+    presid_index UNIQUE (pres_id, tupleid, )
 );
 
-INSERT INTO version (table_name, table_version) values ('watcherinfo','1');
+INSERT INTO version (table_name, table_version) values ('watcherinfo','5');
 CREATE TABLE watcherinfo (
-    r_uri string(255) NOT NULL,
     w_uri string(255) NOT NULL,
     display_name string(128) NOT NULL,
     s_id string(64) NOT NULL,
     package string(32) NOT NULL DEFAULT 'presence',
     status string(32) NOT NULL DEFAULT 'pending',
     event string(32) NOT NULL,
-    expires int NOT NULL,
+    expires datetime NOT NULL DEFAULT '2005-12-07 08:13:15',
     accepts int NOT NULL,
-    presid int(10) NOT NULL,
+    pres_id string(64) NOT NULL,
     server_contact string(255) NOT NULL,
     dialog binary NOT NULL,
     doc_index int NOT NULL,
-    wi_idx1 UNIQUE (s_id, ),
-
+    wi_idx1 UNIQUE (s_id, )
 );
 
-INSERT INTO version (table_name, table_version) values ('tuple_notes','1');
+INSERT INTO version (table_name, table_version) values ('tuple_notes','5');
 CREATE TABLE tuple_notes (
-    presid int(10) NOT NULL,
+    pres_id string(64) NOT NULL,
     tupleid string(64) NOT NULL,
     note string(128) NOT NULL,
     lang string(64) NOT NULL
 );
 
-INSERT INTO version (table_name, table_version) values ('offline_winfo','1');
+INSERT INTO version (table_name, table_version) values ('tuple_extensions','5');
+CREATE TABLE tuple_extensions (
+    pres_id string(64) NOT NULL,
+    tupleid string(64) NOT NULL,
+    element binary NOT NULL,
+    status_extension int(1) NOT NULL
+);
+
+INSERT INTO version (table_name, table_version) values ('offline_winfo','5');
 CREATE TABLE offline_winfo (
     uid string(64) NOT NULL,
     watcher string(255) NOT NULL,

scripts/postgres/pg_create.sql

@@ -169,6 +169,16 @@ CREATE TABLE location (
 
 CREATE INDEX location_contact ON location (contact);
 
+CREATE TABLE contact_attrs (
+    uid VARCHAR(64) NOT NULL,
+    contact VARCHAR(255) NOT NULL,
+    name VARCHAR(32) NOT NULL,
+    value VARCHAR(255),
+    type INTEGER NOT NULL DEFAULT '0',
+    flags INTEGER NOT NULL DEFAULT '0',
+    CONSTRAINT contactattrs_idx UNIQUE (uid, contact, name)
+);
+
 CREATE TABLE trusted (
     src_ip VARCHAR(39) NOT NULL,
     proto VARCHAR(4) NOT NULL,
@@ -278,18 +288,17 @@ CREATE TABLE sd_attrs (
 );
 
 CREATE TABLE presentity (
-    presid SERIAL NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     uri VARCHAR(255) NOT NULL,
     uid VARCHAR(64) NOT NULL,
     pdomain VARCHAR(128) NOT NULL,
-    CONSTRAINT presentity_key UNIQUE (presid)
+    xcap_params BYTEA NOT NULL,
+    CONSTRAINT presentity_key UNIQUE (pres_id)
 );
 
-CREATE INDEX presentity_key2 ON presentity (uri);
-
 CREATE TABLE presentity_notes (
     dbid VARCHAR(64) NOT NULL,
-    presid INTEGER NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     etag VARCHAR(64) NOT NULL,
     note VARCHAR(128) NOT NULL,
     lang VARCHAR(64) NOT NULL,
@@ -297,64 +306,57 @@ CREATE TABLE presentity_notes (
     CONSTRAINT pnotes_idx1 UNIQUE (dbid)
 );
 
-CREATE TABLE presentity_persons (
+CREATE TABLE presentity_extensions (
     dbid VARCHAR(64) NOT NULL,
-    presid INTEGER NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     etag VARCHAR(64) NOT NULL,
-    person_element BYTEA NOT NULL,
-    id VARCHAR(128) NOT NULL,
+    element BYTEA NOT NULL,
     expires TIMESTAMP NOT NULL DEFAULT '2005-12-07 08:13:15',
-    CONSTRAINT prespersons_idx1 UNIQUE (dbid)
+    CONSTRAINT presextensions_idx1 UNIQUE (dbid)
 );
 
 CREATE TABLE presentity_contact (
-    contactid SERIAL NOT NULL,
-    presid INTEGER NOT NULL,
-    basic VARCHAR(32) NOT NULL DEFAULT 'offline',
-    status VARCHAR(32) NOT NULL,
-    location VARCHAR(128) NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
+    basic INTEGER NOT NULL,
     expires TIMESTAMP NOT NULL DEFAULT '2004-05-28 21:32:15',
-    placeid INTEGER,
     priority REAL NOT NULL DEFAULT '0.5',
     contact VARCHAR(255),
     tupleid VARCHAR(64) NOT NULL,
-    prescaps INTEGER NOT NULL,
     etag VARCHAR(64) NOT NULL,
     published_id VARCHAR(64) NOT NULL,
-    CONSTRAINT pc_idx1 UNIQUE (contactid)
+    CONSTRAINT presid_index UNIQUE (pres_id, tupleid)
 );
 
-CREATE INDEX presid_index ON presentity_contact (presid);
-CREATE INDEX location_index ON presentity_contact (location);
-CREATE INDEX placeid_index ON presentity_contact (placeid);
-
 CREATE TABLE watcherinfo (
-    r_uri VARCHAR(255) NOT NULL,
     w_uri VARCHAR(255) NOT NULL,
     display_name VARCHAR(128) NOT NULL,
     s_id VARCHAR(64) NOT NULL,
     package VARCHAR(32) NOT NULL DEFAULT 'presence',
     status VARCHAR(32) NOT NULL DEFAULT 'pending',
     event VARCHAR(32) NOT NULL,
-    expires INTEGER NOT NULL,
+    expires TIMESTAMP NOT NULL DEFAULT '2005-12-07 08:13:15',
     accepts INTEGER NOT NULL,
-    presid INTEGER NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     server_contact VARCHAR(255) NOT NULL,
     dialog BYTEA NOT NULL,
     doc_index INTEGER NOT NULL,
     CONSTRAINT wi_idx1 UNIQUE (s_id)
 );
 
-CREATE INDEX wi_ruri_idx ON watcherinfo (r_uri);
-CREATE INDEX wi_wuri_idx ON watcherinfo (w_uri);
-
 CREATE TABLE tuple_notes (
-    presid INTEGER NOT NULL,
+    pres_id VARCHAR(64) NOT NULL,
     tupleid VARCHAR(64) NOT NULL,
     note VARCHAR(128) NOT NULL,
     lang VARCHAR(64) NOT NULL
 );
 
+CREATE TABLE tuple_extensions (
+    pres_id VARCHAR(64) NOT NULL,
+    tupleid VARCHAR(64) NOT NULL,
+    element BYTEA NOT NULL,
+    status_extension INTEGER NOT NULL
+);
+
 CREATE TABLE offline_winfo (
     uid VARCHAR(64) NOT NULL,
     watcher VARCHAR(255) NOT NULL,