Commit abcebbfe authored by webchick's avatar webchick

#333095 by chx and Damien Tournoud: Lay groundwork for SQLite patch.

parent 05566892
......@@ -271,7 +271,6 @@ function install_settings_form(&$form_state, $profile, $install_locale, $setting
'#default_value' => empty($database['username']) ? '' : $database['username'],
'#size' => 45,
'#maxlength' => 45,
'#required' => TRUE,
);
// Database username
......
......@@ -477,8 +477,8 @@ function aggregator_save_feed($edit) {
foreach ($edit['category'] as $cid => $value) {
if ($value) {
db_merge('aggregator_category_feed')
->key(array('fid' => $edit['fid']))
->fields(array(
'fid' => $edit['fid'],
'cid' => $cid,
))
->execute();
......
......@@ -475,7 +475,8 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
$this->assertErrorMessage('Exception', 'system_test.module', 'system_test_trigger_exception()', 'Drupal is awesome');
$this->drupalGet('system-test/trigger-pdo-exception');
$this->assertErrorMessage('PDOException', 'system_test.module', 'system_test_trigger_pdo_exception()', 'Base table or view not found');
// We only check for SQLSTATE because the exact error reported varies from database to database.
$this->assertErrorMessage('PDOException', 'system_test.module', 'system_test_trigger_pdo_exception()', 'SQLSTATE');
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment