diff --git a/election-candidate.pages.inc b/election-candidate.pages.inc index 4a0aa97187a4a929ace4c0cb71126660c2c425aa..2e9b609b73122f0e2a6fbe4a6d885ca7278e9b5b 100644 --- a/election-candidate.pages.inc +++ b/election-candidate.pages.inc @@ -41,11 +41,10 @@ function election_nomination_form($form, &$form_state, $election, $candidate) { $posts_name = _election_get_posts_name($election->type); - $posts_query = db_select('election_post', 'ep'); - $posts_query->fields('ep', array('post_id')); - $posts_query->condition('election_id', $election->election_id); - $posts_result = $posts_query->execute(); - $post_ids = $posts_result->fetchCol(); + $post_ids = db_query( + 'SELECT post_id FROM {election_post} WHERE election_id = :eid', + array(':eid' => $election->election_id) + )->fetchCol(); $posts = election_post_load_multiple($post_ids); $post_options = array(); foreach ($posts as $post) { diff --git a/election-post.admin.inc b/election-post.admin.inc index d647ae187842f73820a7fe19a546ca9cf6be706e..faa9dac0d0c288efdddccf0b074f3dae6ecc2321 100644 --- a/election-post.admin.inc +++ b/election-post.admin.inc @@ -78,10 +78,7 @@ function election_post_form($form, &$form_state, $election, $post) { $post->electorates = array(); if (!$post->is_new) { - $result = db_select('election_post_electorate', 'epe') - ->fields('epe', array('electorate_id')) - ->condition('post_id', $post->post_id) - ->execute(); + $result = db_query('SELECT electorate_id FROM {election_post_electorate} WHERE post_id = :pid', array(':pid' => $post->post_id)); while ($row = $result->fetchAssoc()) { $post->electorates[$row['electorate_id']] = 1; } diff --git a/election.module b/election.module index 484e6d07c263562c0b03f0056bbe886b67024330..a9360d8ace5ff6359b3f18550e7743c01f4fa8a6 100644 --- a/election.module +++ b/election.module @@ -300,10 +300,7 @@ function election_load($election_id = NULL) { * @return array */ function election_electorates() { - $query = db_select('election_electorate', 'ee'); - $query->fields('ee'); - $query->orderBy('name'); - $result = $query->execute(); + $result = db_query('SELECT * FROM {election_electorate} ORDER BY name'); $electorates = array(); @@ -389,21 +386,13 @@ function _election_uninstall_code_electorates() { $code_electorates = _election_get_code_electorates(); $transaction = db_transaction(); try { - $db_electorates = db_select('election_electorate', 'ee') - ->fields('ee', array('electorate_id', 'machine_name')) - ->condition('locked', '1') - ->execute(); + $db_electorates = db_query('SELECT electorate_id, machine_name FROM {election_electorate} WHERE locked = 1'); while ($db_electorate = $db_electorates->fetchAssoc()) { if (isset($code_electorates[$db_electorate['machine_name']])) { continue; } - $assigned = db_select('election_post_electorate', 'epe') - ->fields('epe') - ->condition('electorate_id', $db_electorate['electorate_id']) - ->range(0, 1) - ->execute() - ->fetchCol(); - if (count($assigned)) { + $assigned = db_query('SELECT 1 FROM {election_post_electorate} WHERE electorate_id = :eid LIMIT 1', array(':eid', $db_electorate['electorate_id'])); + if ($assigned->rowCount()) { continue; } db_delete('election_electorate')