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

Issue #3678 PDO fix for copyRow() with unique field keys.

Browse Source
This commit is contained in:
Cameron
2019-02-16 12:40:25 -08:00
parent bf0d60a15c
commit b2fffa7838
1 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
e107_handlers/e_db_pdo_class.php
View File

@@ -2021,6 +2021,33 @@ class e_db_pdo implements e_db
} }
/**
* @param $table
* @return array field name => key name
*/
private function _getUnique($table)
{
$unique = array();
$result = $this->retrieve("SHOW INDEXES FROM #".$table, true);
foreach($result as $row)
{
$notUnique = (int) $row['Non_unique'];
if(!$notUnique)
{
$field = $row['Column_name'];
$unique[$field] = $row['Key_name'];
}
}
return $unique;
}
/** /**
* A pointer to mysql_real_escape_string() - see http://www.php.net/mysql_real_escape_string * A pointer to mysql_real_escape_string() - see http://www.php.net/mysql_real_escape_string
* *
@@ -2256,12 +2283,28 @@ class e_db_pdo implements e_db
if($fields === '*') if($fields === '*')
{ {
$fields = $this->db_FieldList($table); $fields = $this->db_FieldList($table);
unset($fields[0]); // Remove primary_id. $unique = $this->_getUnique($table);
$fieldList = implode(",",$fields);
$flds = array();
// randomize fields that must be unique.
foreach($fields as $fld)
{
if(isset($unique[$fld]))
{
$flds[] = $unique[$fld] === 'PRIMARY' ? 0 : "'rand-".rand(0,999)."'"; // keep it short.
continue;
}
$flds[] = $fld;
}
$fieldList = implode(",", $fields);
$fieldList2 = implode(",", $flds);
} }
else else
{ {
$fieldList = $fields; $fieldList = $fields;
$fieldList2 = $fieldList;
} }
if(empty($fieldList)) if(empty($fieldList))
@@ -2270,8 +2313,9 @@ class e_db_pdo implements e_db
return false; return false;
} }
$id = $this->gen("INSERT INTO ".$this->mySQLPrefix.$table."(".$fieldList.") SELECT ".$fieldList." FROM ".$this->mySQLPrefix.$table." WHERE ".$args); $id = $this->gen("INSERT INTO ".$this->mySQLPrefix.$table."(".$fieldList.") SELECT ".$fieldList2." FROM ".$this->mySQLPrefix.$table." WHERE ".$args);
$lastInsertId = $this->lastInsertId(); $lastInsertId = $this->lastInsertId();
return ($id && $lastInsertId) ? $lastInsertId : false; return ($id && $lastInsertId) ? $lastInsertId : false;
} }