diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/poll/poll.module | 3 | ||||
| -rw-r--r-- | modules/simpletest/tests/database_test.test | 24 |
2 files changed, 11 insertions, 16 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 72cd86e66..9e314f11d 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -568,12 +568,11 @@ function poll_update($node) { db_merge('poll_choice') ->key(array('chid' => $choice['chid'])) ->fields(array( - 'nid' => $node->nid, 'chtext' => $choice['chtext'], 'chvotes' => (int) $choice['chvotes'], 'weight' => $choice['weight'], )) - ->updateExcept('nid') + ->insertFields(array('nid' => $node->nid)) ->execute(); } else { diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index e3de06a57..62ae06a40 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -1093,18 +1093,15 @@ class DatabaseMergeTestCase extends DatabaseTestCase { } /** - * Confirm that we can merge-update a record successfully, with exclusion. + * Confirm that we can merge-update a record successfully, with different insert and update. */ function testMergeUpdateExcept() { $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); db_merge('test_people') ->key(array('job' => 'Speaker')) - ->fields(array( - 'age' => 31, - 'name' => 'Tiffany', - )) - ->updateExcept('age') + ->insertFields(array('age' => 31)) + ->updateFields(array('name' => 'Tiffany')) ->execute(); $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); @@ -1124,11 +1121,13 @@ class DatabaseMergeTestCase extends DatabaseTestCase { db_merge('test_people') ->key(array('job' => 'Speaker')) - ->fields(array( + ->insertFields(array( 'age' => 31, 'name' => 'Tiffany', )) - ->update(array('name' => 'Joe')) + ->updateFields(array( + 'name' => 'Joe', + )) ->execute(); $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); @@ -1155,10 +1154,8 @@ class DatabaseMergeTestCase extends DatabaseTestCase { // which is what is supposed to happen. db_merge('test_people') ->key(array('job' => 'Speaker')) - ->fields(array( - 'age' => 31, - 'name' => 'Tiffany', - )) + ->fields(array('name' => 'Tiffany')) + ->insertFields(array('age' => 31)) ->expression('age', 'age + :age', array(':age' => 4)) ->execute(); @@ -1210,8 +1207,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase { db_merge('test_people') ->key(array('job' => 'Speaker')) - ->fields(array('age' => 31)) - ->updateExcept(array('age')) + ->insertFields(array('age' => 31)) ->execute(); $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField(); |