Skip to content

Only unset defaults before running command. #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TerrenceSullivanSC wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Only unset defaults before running command. #279

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
efcf072
Only unset defaults before running command. Allow defaults to be used…
tps2-mailbox-sc-edu Mar 1, 2025
384a701
Get rid of blank line.
tps2-mailbox-sc-edu Mar 1, 2025
32208f5
Merge branch 'main' into defaults-problems
swissspidy Dec 2, 2025
324ed3f
Merge branch 'main' into defaults-problems
swissspidy Jan 20, 2026
0e0ac15
Merge branch 'main' into defaults-problems
swissspidy Feb 7, 2026
c9ff631
Merge branch 'main' into defaults-problems
swissspidy Mar 23, 2026
c4b3665
Apply feedback from code review
swissspidy Mar 23, 2026
d107f47
Merge branch 'main' into defaults-problems
swissspidy Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/DB_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1811,6 +1811,10 @@ private static function run( $cmd, $assoc_args = [], $send_to_shell = true, $int
'pass' => DB_PASSWORD,
];

if ( array_key_exists( 'defaults', $assoc_args ) ) {
unset( $assoc_args['defaults'] );
}

if ( ! isset( $assoc_args['default-character-set'] )
&& defined( 'DB_CHARSET' ) && constant( 'DB_CHARSET' ) ) {
$required['default-character-set'] = constant( 'DB_CHARSET' );
Expand Down Expand Up @@ -2095,9 +2099,6 @@ protected function get_defaults_flag_string( &$assoc_args ) {
if ( true === Utils\get_flag_value( $assoc_args, 'defaults' ) ) {
$flag_string = '';
}

unset( $assoc_args['defaults'] );

}
Comment on lines 2261 to 2264
Copy link

Copilot AI Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since get_defaults_flag_string() no longer removes the 'defaults' key from the array, consider updating the method signature from protected function get_defaults_flag_string( &$assoc_args ) to protected function get_defaults_flag_string( $assoc_args ) to remove the unnecessary by-reference parameter.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member

@swissspidy swissspidy Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot open a new pull request to apply changes based on this feedback


return $flag_string;
Expand Down
Loading