mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Refactored e_db_pdo::copyRow() for Codeception

Browse Source 
Fixes: "The method copyRow() has an NPath complexity of 252. The configured NPath complexity threshold is 200."
This commit is contained in:
Nick Liu
2019-12-28 10:48:16 +01:00
parent c31b645013
commit 60aa3f34d4
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
e107_handlers/e_db_pdo_class.php
View File

@@ -2296,28 +2296,7 @@ class e_db_pdo implements e_db
} }
for ($retries = 0; $retries < 3; $retries ++) { for ($retries = 0; $retries < 3; $retries ++) {
if ($fields === '*') { list($fieldList, $fieldList2) = $this->generateCopyRowFieldLists($table, $fields);
$fieldList = $this->db_FieldList($table);
$unique = $this->_getUnique($table);
$flds = array();
// randomize fields that must be unique.
foreach ($fieldList as $fld) {
if (isset($unique[$fld])) {
$flds[] = $unique[$fld] === 'PRIMARY' ? 0 :
"'rand-" . e107::getUserSession()->generateRandomString('***********') . "'";
continue;
}
$flds[] = $fld;
}
$fieldList = implode(",", $fieldList);
$fieldList2 = implode(",", $flds);
} else {
$fieldList = $fields;
$fieldList2 = $fieldList;
}
if (empty($fieldList)) { if (empty($fieldList)) {
$this->mysqlLastErrText = "copyRow \$fields list was empty"; $this->mysqlLastErrText = "copyRow \$fields list was empty";
@@ -2325,19 +2304,47 @@ class e_db_pdo implements e_db
} }
$beforeLastInsertId = $this->lastInsertId(); $beforeLastInsertId = $this->lastInsertId();
$id = $this->gen( $query = "INSERT INTO " . $this->mySQLPrefix . $table .
"INSERT INTO " . $this->mySQLPrefix . $table .
"(" . $fieldList . ") SELECT " . "(" . $fieldList . ") SELECT " .
$fieldList2 . $fieldList2 .
" FROM " . $this->mySQLPrefix . $table . " FROM " . $this->mySQLPrefix . $table .
" WHERE " . $args " WHERE " . $args;
); $id = $this->gen($query);
$lastInsertId = $this->lastInsertId(); $lastInsertId = $this->lastInsertId();
if ($beforeLastInsertId !== $lastInsertId) break; if ($beforeLastInsertId !== $lastInsertId) break;
} }
return ($id && $lastInsertId) ? $lastInsertId : false; return ($id && $lastInsertId) ? $lastInsertId : false;
}
/**
* Determine before and after fields for a table
* @param $table string Table name, without the prefix
* @param $fields string Field list in query format (i.e. separated by commas) or all of them ("*")
* @return array Index 0 is before and index 1 is after
*/
private function generateCopyRowFieldLists($table, $fields)
{
if ($fields !== '*') return array($fields, $fields);
$fieldList = $this->db_FieldList($table);
$unique = $this->_getUnique($table);
$flds = array();
// randomize fields that must be unique.
foreach ($fieldList as $fld) {
if (isset($unique[$fld])) {
$flds[] = $unique[$fld] === 'PRIMARY' ? 0 :
"'rand-" . e107::getUserSession()->generateRandomString('***********') . "'";
continue;
}
$flds[] = $fld;
}
$fieldList = implode(",", $fieldList);
$fieldList2 = implode(",", $flds);
return array($fieldList, $fieldList2);
} }