From 35ed6f473c842d1530645d9d6779fc5917cecd03 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Aug 2008 17:12:39 -0400 Subject: [PATCH] change queue_item to use a compound primary key Breaking up to use multiple queue handlers means we need multiple queue items for the same notice. So, change the queue_item table to have a compound pkey, (notice_id,transport). darcs-hash:20080827211239-84dde-db118799bfd43be62fb02380829c64813c9334f8.gz --- classes/Queue_item.php | 2 +- classes/stoica.ini | 1 + db/laconica.sql | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Queue_item.php b/classes/Queue_item.php index 2ae78d9f64..862511883b 100644 --- a/classes/Queue_item.php +++ b/classes/Queue_item.php @@ -11,7 +11,7 @@ class Queue_item extends DB_DataObject public $__table = 'queue_item'; // table name public $notice_id; // int(4) primary_key not_null - public $transport; // varchar(8) not_null + public $transport; // varchar(8) primary_key not_null public $created; // datetime() not_null public $claimed; // datetime() diff --git a/classes/stoica.ini b/classes/stoica.ini index 4dead96100..4e78dd325e 100644 --- a/classes/stoica.ini +++ b/classes/stoica.ini @@ -154,6 +154,7 @@ claimed = 14 [queue_item__keys] notice_id = K +transport = K [remember_me] code = 130 diff --git a/db/laconica.sql b/db/laconica.sql index da2a1c89df..f8e5fce872 100644 --- a/db/laconica.sql +++ b/db/laconica.sql @@ -233,11 +233,12 @@ create table remember_me ( create table queue_item ( - notice_id integer not null primary key comment 'notice queued' references notice (id), + notice_id integer not null comment 'notice queued' references notice (id), transport varchar(8) not null comment 'queue for what? "email", "jabber", "sms", "irc", ...', created datetime not null comment 'date this record was created', claimed datetime comment 'date this item was claimed', + constraint primary key (notice_id, transport), index queue_item_created_idx (created) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_bin;