From fff974544c78b4917778fa5ec2cf9b50ca2ca72c Mon Sep 17 00:00:00 2001 From: Damien Regad Date: Sat, 22 Nov 2025 00:56:29 +0100 Subject: autoExecute: always use DB_AUTOQUERY_* constants --- adodb.inc.php | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/adodb.inc.php b/adodb.inc.php index 6726d042..64138e89 100644 --- a/adodb.inc.php +++ b/adodb.inc.php @@ -2655,11 +2655,26 @@ if (!defined('_ADODB_LAYER')) { * @noinspection PhpUnusedParameterInspection */ function autoExecute($table, $fields_values, $mode = 'INSERT', $where = '', $forceUpdate = true, $magic_quotes = false) { + switch($mode) { + case DB_AUTOQUERY_INSERT: + case DB_AUTOQUERY_UPDATE: + break; + case 'UPDATE': + $mode = DB_AUTOQUERY_UPDATE; + break; + case 'INSERT': + $mode = DB_AUTOQUERY_INSERT; + break; + default: + $this->outp_throw("AutoExecute: Unknown mode=$mode", 'AutoExecute'); + return false; + } + if (empty($fields_values)) { $this->outp_throw('AutoExecute: Empty fields array', 'AutoExecute'); return false; } - if (empty($where) && ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */)) { + if (empty($where) && $mode == DB_AUTOQUERY_UPDATE) { $this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause', 'AutoExecute'); return false; } @@ -2677,18 +2692,10 @@ if (!defined('_ADODB_LAYER')) { $rs->tableName = $table; $rs->sql = $sql; - switch($mode) { - case 'UPDATE': - case DB_AUTOQUERY_UPDATE: - $sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate); - break; - case 'INSERT': - case DB_AUTOQUERY_INSERT: - $sql = $this->GetInsertSQL($rs, $fields_values); - break; - default: - $this->outp_throw("AutoExecute: Unknown mode=$mode", 'AutoExecute'); - return false; + if ($mode == DB_AUTOQUERY_UPDATE) { + $sql = $this->getUpdateSQL($rs, $fields_values, $forceUpdate); + } else { + $sql = $this->getInsertSQL($rs, $fields_values); } return $sql && $this->Execute($sql); } -- cgit v1.3