diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 00:00:38 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 00:00:38 +0000 |
commit | 3cca50da4495b15f7454f55fefc19d917759d038 (patch) | |
tree | 4b972f085559be8bd600f73f8517ae7eeb52a1d5 /modules/poll | |
parent | 2cca6c575488f25d37bdcdd984cc4e960776d45a (diff) | |
download | brdo-3cca50da4495b15f7454f55fefc19d917759d038.tar.gz brdo-3cca50da4495b15f7454f55fefc19d917759d038.tar.bz2 |
#817216 by ctmattice1, chx, Stevel, Damien Tournoud: Fixed system_update_7008 does not work, deal with invalid poll choices, and move poll-related upgrade logic to Poll module.
Diffstat (limited to 'modules/poll')
-rw-r--r-- | modules/poll/poll.install | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/modules/poll/poll.install b/modules/poll/poll.install index 542937d97..153aae78a 100644 --- a/modules/poll/poll.install +++ b/modules/poll/poll.install @@ -138,11 +138,28 @@ function poll_schema() { } /** + * Use the poll_choice primary key to record votes in poll_votes rather than + * the choice order. Rename chorder to weight. + * * Rename {poll_choices} table to {poll_choice} and {poll_votes} to {poll_vote}. */ function poll_update_7001() { - db_rename_table('poll_choices', 'poll_choice'); + // Add chid column and convert existing votes. + db_add_field('poll_votes', 'chid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)); + db_add_index('poll_votes', 'chid', array('chid')); + db_update('poll_votes') + ->expression('chid', DatabaseConnection::prefixTables('COALESCE((SELECT chid FROM {poll_choices} c WHERE {poll_votes}.chorder = c.chorder AND {poll_votes}.nid = c.nid), 0)')) + ->execute(); + // Delete invalid votes. + db_delete('poll_votes')->condition('chid', 0)->execute(); + // Remove old chorder column. + db_drop_field('poll_votes', 'chorder'); + + // Change the chorder column to weight in poll_choices. + db_change_field('poll_choices', 'chorder', 'weight', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')); + db_rename_table('poll_votes', 'poll_vote'); + db_rename_table('poll_choices', 'poll_choice'); } /** |