From b4c161e04ae85b23cb78ad36e429ec545f67777f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Sautret?= Date: Thu, 10 Sep 2009 16:59:58 +0000 Subject: [PATCH] Merge r2592 and r2593 from trunk: Fix pubsub tables constraints in MySQL schema creation script. Add a "created_at" column to some tables in the MySQL schema to store a timestamp (thanks to Pedro Melo, EJAB-376). SVN Revision: 2594 --- src/odbc/mysql.sql | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/odbc/mysql.sql b/src/odbc/mysql.sql index 8e1d242c4..a7732ba45 100644 --- a/src/odbc/mysql.sql +++ b/src/odbc/mysql.sql @@ -10,7 +10,7 @@ -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. --- +-- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -22,7 +22,8 @@ SET table_type=InnoDB; CREATE TABLE users ( username varchar(250) PRIMARY KEY, - password text NOT NULL + password text NOT NULL, + created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) CHARACTER SET utf8; @@ -42,7 +43,8 @@ CREATE TABLE rosterusers ( askmessage text NOT NULL, server character(1) NOT NULL, subscribe text NOT NULL, - type text + type text, + created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) CHARACTER SET utf8; CREATE UNIQUE INDEX i_rosteru_user_jid ON rosterusers(username(75), jid(75)); @@ -61,7 +63,8 @@ CREATE INDEX pk_rosterg_user_jid ON rostergroups(username(75), jid(75)); CREATE TABLE spool ( username varchar(250) NOT NULL, xml text NOT NULL, - seq BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE + seq BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE, + created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) CHARACTER SET utf8; CREATE INDEX i_despool USING BTREE ON spool(username); @@ -69,7 +72,8 @@ CREATE INDEX i_despool USING BTREE ON spool(username); CREATE TABLE vcard ( username varchar(250) PRIMARY KEY, - vcard text NOT NULL + vcard text NOT NULL, + created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) CHARACTER SET utf8; @@ -120,7 +124,8 @@ CREATE TABLE privacy_default_list ( CREATE TABLE privacy_list ( username varchar(250) NOT NULL, name varchar(250) NOT NULL, - id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE, + created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) CHARACTER SET utf8; CREATE INDEX i_privacy_list_username USING BTREE ON privacy_list(username); @@ -142,7 +147,8 @@ CREATE TABLE privacy_list_data ( CREATE TABLE private_storage ( username varchar(250) NOT NULL, namespace varchar(250) NOT NULL, - data text NOT NULL + data text NOT NULL, + created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) CHARACTER SET utf8; CREATE INDEX i_private_storage_username USING BTREE ON private_storage(username); @@ -175,14 +181,14 @@ CREATE TABLE pubsub_node_option ( val text ) CHARACTER SET utf8; CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option(nodeid); -ALTER TABLE `pubsub_node_option` ADD FOREIGN KEY (`nodeid`) REFERENCES `ejabberd`.`pubsub_node` (`nodeid`) ON DELETE CASCADE; +ALTER TABLE `pubsub_node_option` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; CREATE TABLE pubsub_node_owner ( nodeid bigint, owner text ) CHARACTER SET utf8; CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner(nodeid); -ALTER TABLE `pubsub_node_owner` ADD FOREIGN KEY (`nodeid`) REFERENCES `ejabberd`.`pubsub_node` (`nodeid`) ON DELETE CASCADE; +ALTER TABLE `pubsub_node_owner` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; CREATE TABLE pubsub_state ( nodeid bigint, @@ -193,11 +199,11 @@ CREATE TABLE pubsub_state ( ) CHARACTER SET utf8; CREATE INDEX i_pubsub_state_jid ON pubsub_state(jid(60)); CREATE UNIQUE INDEX i_pubsub_state_tuple ON pubsub_state(nodeid, jid(60)); -ALTER TABLE `pubsub_state` ADD FOREIGN KEY (`nodeid`) REFERENCES `ejabberd`.`pubsub_node` (`nodeid`) ON DELETE CASCADE; +ALTER TABLE `pubsub_state` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; CREATE TABLE pubsub_item ( nodeid bigint, - itemid text, + itemid text, publisher text, creation text, modification text, @@ -205,7 +211,7 @@ CREATE TABLE pubsub_item ( ) CHARACTER SET utf8; CREATE INDEX i_pubsub_item_itemid ON pubsub_item(itemid(36)); CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item(nodeid, itemid(36)); -ALTER TABLE `pubsub_item` ADD FOREIGN KEY (`nodeid`) REFERENCES `ejabberd`.`pubsub_node` (`nodeid`) ON DELETE CASCADE; +ALTER TABLE `pubsub_item` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE; CREATE TABLE pubsub_subscription_opt ( subid text,