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

Merge pull request #5630 from atm-florian/3.9

Browse Source 
FIX : #5629 PgSQL Interger string stylish error
This commit is contained in:
Laurent Destailleur 2016-08-17 16:24:40 +02:00 committed by GitHub
commit f9d707ff48
2 changed files with 80 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/commonobject.class.php
View File

@ -595,6 +595,10 @@ abstract class CommonObject
} }
} }
if(! empty($id_type_contact)) {
$datecreate = dol_now(); $datecreate = dol_now();
$this->db->begin(); $this->db->begin();
@ -604,7 +608,7 @@ abstract class CommonObject
$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) "; $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ; $sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
$sql.= "'".$this->db->idate($datecreate)."'"; $sql.= "'".$this->db->idate($datecreate)."'";
$sql.= ", 4, '". $id_type_contact . "' "; $sql.= ", 4, ". $id_type_contact . " ";
$sql.= ")"; $sql.= ")";
dol_syslog(get_class($this)."::add_contact", LOG_DEBUG); dol_syslog(get_class($this)."::add_contact", LOG_DEBUG);
@ -640,6 +644,8 @@ abstract class CommonObject
} }
} }
} }
return 1;
}
/** /**
* Copy contact from one element to current * Copy contact from one element to current

2
htdocs/core/db/pgsql.class.php
View File

@ -1093,7 +1093,7 @@ class DoliDBPgsql extends DoliDB
*/ */
function DDLDropField($table,$field_name) function DDLDropField($table,$field_name)
{ {
$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`"; $sql= "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
dol_syslog($sql,LOG_DEBUG); dol_syslog($sql,LOG_DEBUG);
if (! $this->query($sql)) if (! $this->query($sql))
{ {