Skip to content

Commit 55f7264

Browse files
committed
Don't spew to stdout when in verbose mode during early bootstrap queries.
1 parent 3c6ae41 commit 55f7264

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

includes/exec.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function drush_shell_exec($cmd) {
8484
}
8585

8686
/**
87-
* A versopm pf drush_shell_exec that ignores simulate mode
87+
* A version of drush_shell_exec() that ignores simulate mode
8888
*/
8989
function drush_always_exec($cmd) {
9090
return _drush_shell_exec(func_get_args(), FALSE, FALSE);

src/Boot/DrupalBoot.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function bootstrapDrupalDatabaseValidate()
228228
$this->logger->warning(dt('The command \'!command\' is required for preflight but cannot be found. Please install it and retry.', ['!command' => $command]));
229229
return false;
230230
}
231-
if (!$sql->query('SELECT 1;')) {
231+
if (!$sql->query('SELECT 1;', null, drush_bit_bucket())) {
232232
$message = dt("Drush was not able to start (bootstrap) the Drupal database.\n");
233233
$message .= dt("Hint: This may occur when Drush is trying to:\n");
234234
$message .= dt(" * bootstrap a site that has not been installed or does not have a configured database. In this case you can select another site with a working database setup by specifying the URI to use with the --uri parameter on the command line. See `drush topic docs-aliases` for details.\n");
@@ -279,7 +279,7 @@ public function bootstrapDrupalDatabaseHasTable($required_tables)
279279
foreach ((array)$required_tables as $required_table) {
280280
$prefix_key = array_key_exists($required_table, $prefix) ? $required_table : 'default';
281281
$table_name = $prefix[$prefix_key] . $required_table;
282-
if (!$sql->alwaysQuery("SELECT 1 FROM $table_name LIMIT 1;")) {
282+
if (!$sql->alwaysQuery("SELECT 1 FROM $table_name LIMIT 1;", null, drush_bit_bucket())) {
283283
$this->logger->notice('Missing database table: '. $table_name);
284284
return false;
285285
}

0 commit comments

Comments
 (0)