From efcf0725839543768e8cedc673c09f093aca50bf Mon Sep 17 00:00:00 2001 From: Terrence Sullivan Date: Sat, 1 Mar 2025 12:09:40 -0500 Subject: [PATCH 1/2] Only unset defaults before running command. Allow defaults to be used in querying the SQL mode --- src/DB_Command.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/DB_Command.php b/src/DB_Command.php index e7b9032d..a1157664 100644 --- a/src/DB_Command.php +++ b/src/DB_Command.php @@ -1768,6 +1768,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' ); @@ -2051,8 +2055,6 @@ protected function get_defaults_flag_string( &$assoc_args ) { $flag_string = ''; } - unset( $assoc_args['defaults'] ); - } return $flag_string; From 384a701e8a0755c65a6b010503ef94bad881c4dd Mon Sep 17 00:00:00 2001 From: Terrence Sullivan Date: Sat, 1 Mar 2025 14:13:01 -0500 Subject: [PATCH 2/2] Get rid of blank line. --- src/DB_Command.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DB_Command.php b/src/DB_Command.php index a1157664..2c85997b 100644 --- a/src/DB_Command.php +++ b/src/DB_Command.php @@ -2054,7 +2054,6 @@ protected function get_defaults_flag_string( &$assoc_args ) { if ( true === Utils\get_flag_value( $assoc_args, 'defaults' ) ) { $flag_string = ''; } - } return $flag_string;