From 1df2b1ca571eb9e43c17b8246583a30296288f44 Mon Sep 17 00:00:00 2001 From: Dan Chadwick Date: Fri, 3 Apr 2015 23:22:54 -0400 Subject: [PATCH] Issue #1815996 by DanChadwick: Set default empty argument for webform_conditional_actions table. --- webform.install | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webform.install b/webform.install index 77d7e88..1906c55 100644 --- a/webform.install +++ b/webform.install @@ -2071,10 +2071,12 @@ function webform_update_7423() { // In a site with many, many conditionals, the db_insert may timeout. Start a transaction to ensure atomic action. $tx = db_transaction(); // Copy target information from existing webform_conditional table to new webfrom_condtional_actions table. + $select = db_select('webform_conditional', 'c') + ->fields('c', array('nid', 'rgid', 'action', 'target_type', 'target')) + ->orderBy('nid')->orderBy('rgid'); + $select->addExpression("''", 'argument'); db_insert('webform_conditional_actions') - ->from(db_select('webform_conditional', 'c') - ->fields('c', array('nid', 'rgid', 'action', 'target_type', 'target')) - ->orderBy('nid')->orderBy('rgid')) + ->from($select) ->execute(); // Commit the insert -- 1.7.8.msysgit.0