diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-19 11:24:33 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-19 11:24:33 -0700 |
| commit | b635c75639f5119d89a7f228155466a80d7ba185 (patch) | |
| tree | 1f20dd96d23acba233b75c8c91b6163beed8b3ce | |
| parent | 53cf39c97a712c9b0a890d60e3291f1e98f17b92 (diff) | |
Fix unique & foreign constraints on foreign_* tables. Reference info copied from old schema wasn't correctly taking into account that (id, service) must be treated together as a unit to identify a foreign_user uniquely.
| -rw-r--r-- | db/core.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/db/core.php b/db/core.php index 3fcc9b8fa..9be793ffb 100644 --- a/db/core.php +++ b/db/core.php @@ -479,7 +479,6 @@ $schema['foreign_user'] = array( 'foreign_user_service_fkey' => array('foreign_service', array('service' => 'id')), ), 'unique keys' => array( - 'foreign_user_id_key' => array('id'), 'foreign_user_uri_key' => array('uri'), ), ); @@ -501,7 +500,7 @@ $schema['foreign_link'] = array( 'primary key' => array('user_id', 'foreign_id', 'service'), 'foreign keys' => array( 'foreign_link_user_id_fkey' => array('user', array('user_id' => 'id')), - 'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id')), + 'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id', 'service' => 'service')), 'foreign_link_service_fkey' => array('foreign_service', array('service' => 'id')), ), 'indexes' => array( @@ -519,12 +518,12 @@ $schema['foreign_subscription'] = array( 'primary key' => array('service', 'subscriber', 'subscribed'), 'foreign keys' => array( 'foreign_subscription_service_fkey' => array('foreign_service', array('service' => 'id')), - 'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id')), - 'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id')), + 'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id', 'service' => 'service')), + 'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id', 'service' => 'service')), ), 'indexes' => array( - 'foreign_subscription_subscriber_idx' => array('subscriber'), - 'foreign_subscription_subscribed_idx' => array('subscribed'), + 'foreign_subscription_subscriber_idx' => array('service', 'subscriber'), + 'foreign_subscription_subscribed_idx' => array('service', 'subscribed'), ), ); |