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

Correction de la gestion d'erreur.

Browse Source
This commit is contained in:
guillaume 2015-02-27 14:06:53 +01:00
parent 9fdb4a0ee3
commit 4ede9295a6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/db/sqlite.class.php
View File

@ -452,7 +452,7 @@ class DoliDBSqlite extends DoliDB
} }
catch(Exception $e) catch(Exception $e)
{ {
$this->error=$e->getMessage(); $this->error=$this->db->lastErrorMsg();
} }
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
@ -645,7 +645,7 @@ class DoliDBSqlite extends DoliDB
return $errorcode_map[$this->db->errorCode()]; return $errorcode_map[$this->db->errorCode()];
}*/ }*/
$errno=$this->db->lastErrorCode(); $errno=$this->db->lastErrorCode();
if ($errno=='HY000') if ($errno=='HY000' || $errno == 0)
{ {
if (preg_match('/table.*already exists/i',$this->error)) return 'DB_ERROR_TABLE_ALREADY_EXISTS'; if (preg_match('/table.*already exists/i',$this->error)) return 'DB_ERROR_TABLE_ALREADY_EXISTS';
elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'; elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
@ -656,6 +656,9 @@ class DoliDBSqlite extends DoliDB
if (preg_match('/column.* not unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS'; if (preg_match('/column.* not unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS'; elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
} }
if ($errno > 1) {
// TODO Voir la liste des messages d'erreur
}
return ($errno?'DB_ERROR_'.$errno:'0'); return ($errno?'DB_ERROR_'.$errno:'0');
} }