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

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 2ae78d9f64e8284187adc666b71467115c28fc5d..862511883b4bfe28e648839de9f273efd3e7302b 100644 (file)
--- 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 4dead961001856f69c6774ead0253e50eb6df503..4e78dd325ea8dafe801b083ea90e5b8836ec2336 100644 (file)
--- 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 da2a1c89dfff14245a7c066843c5197480ef5ea8..f8e5fce87265e813632a3b0ac24a0243add7a750 100644 (file)
--- 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;