lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Import INSERT foreign key

Browse Source 
Check the row referencing this foreign key exists first
instead of always trying to perform an UPDATE.
This commit is contained in:
François J 2018-03-26 17:52:43 +02:00
parent 1c581c6fff
commit e892089afd
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/modules/import/import_csv.modules.php
View File

@ -590,6 +590,7 @@ class ImportCsv extends ModeleImports
$insertdone = false; $insertdone = false;
if (!empty($updatekeys)) { if (!empty($updatekeys)) {
// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields) // We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
if (empty($lastinsertid)) { if (empty($lastinsertid)) {
$sqlSelect = 'SELECT rowid FROM '.$tablename; $sqlSelect = 'SELECT rowid FROM '.$tablename;
@ -603,7 +604,7 @@ class ImportCsv extends ModeleImports
$filters[] = $col.' = '.$data[$key]; $filters[] = $col.' = '.$data[$key];
} }
$sqlSelect.= ' WHERE '.implode(' AND ', $where); $sqlSelect.= ' WHERE '.implode(' AND ', $where);
$resql=$this->db->query($sqlSelect); $resql=$this->db->query($sqlSelect);
if($resql) { if($resql) {
$res = $this->db->fetch_object($resql); $res = $this->db->fetch_object($resql);
@ -625,8 +626,33 @@ class ImportCsv extends ModeleImports
$this->errors[$error]['type']='SQL'; $this->errors[$error]['type']='SQL';
$error++; $error++;
} }
} else {
// We have a last INSERT ID. Check if we have a row referencing this foreign key.
$sqlSelect = 'SELECT rowid FROM '.$tablename;
if(empty($keyfield)) $keyfield = 'rowid';
$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
$resql=$this->db->query($sqlSelect);
if($resql) {
$res = $this->db->fetch_object($resql);
if($resql->num_rows == 1) {
// We have a row referencing this last foreign key, continue with UPDATE.
} else {
// No record found referencing this last foreign key,
// force $lastinsertid to 0 so we INSERT below.
$lastinsertid = 0;
}
}
else
{
//print 'E';
$this->errors[$error]['lib']=$this->db->lasterror();
$this->errors[$error]['type']='SQL';
$error++;
}
} }
if (!empty($lastinsertid)) { if (!empty($lastinsertid)) {
// Build SQL UPDATE request // Build SQL UPDATE request
$sqlstart = 'UPDATE '.$tablename; $sqlstart = 'UPDATE '.$tablename;
@ -640,7 +666,7 @@ class ImportCsv extends ModeleImports
if(empty($keyfield)) $keyfield = 'rowid'; if(empty($keyfield)) $keyfield = 'rowid';
$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid; $sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
$sql = $sqlstart.$sqlend; $sql = $sqlstart.$sqlend;
// Run update request // Run update request

25
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -649,6 +649,31 @@ class ImportXlsx extends ModeleImports
$this->errors[$error]['type']='SQL'; $this->errors[$error]['type']='SQL';
$error++; $error++;
} }
} else {
// We have a last INSERT ID. Check if we have a row referencing this foreign key.
$sqlSelect = 'SELECT rowid FROM '.$tablename;
if(empty($keyfield)) $keyfield = 'rowid';
$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
$resql=$this->db->query($sqlSelect);
if($resql) {
$res = $this->db->fetch_object($resql);
if($resql->num_rows == 1) {
// We have a row referencing this last foreign key, continue with UPDATE.
} else {
// No record found referencing this last foreign key,
// force $lastinsertid to 0 so we INSERT below.
$lastinsertid = 0;
}
}
else
{
//print 'E';
$this->errors[$error]['lib']=$this->db->lasterror();
$this->errors[$error]['type']='SQL';
$error++;
}
} }
if (!empty($lastinsertid)) { if (!empty($lastinsertid)) {