Merge pull request #221 from GPCsolutions/pgsql

Fix first activation of some modules on PgSQL
This commit is contained in:
Regis Houssin 2012-06-11 13:00:37 -07:00
commit fee5a0894c

View File

@ -107,18 +107,22 @@ class Menubase
// an insert with a forced id. // an insert with a forced id.
if (in_array($this->db->type,array('pgsql'))) if (in_array($this->db->type,array('pgsql')))
{ {
$sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu"; $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
$resqlrowid=$this->db->query($sql); $resqlrowid=$this->db->query($sql);
if ($resqlrowid) if ($resqlrowid)
{ {
$obj=$this->db->fetch_object($resqlrowid); $obj=$this->db->fetch_object($resqlrowid);
$maxrowid=$obj->maxrowid; $maxrowid=$obj->maxrowid;
$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")"; // Max rowid can be empty if there is no record yet
$resqlrowidset=$this->db->query($sql); if(empty($maxrowid)) $maxrowid=1;
if (! $resqlrowidset) dol_print_error($this->db);
} $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
else dol_print_error($this->db); //print $sql; exit;
$resqlrowidset=$this->db->query($sql);
if (! $resqlrowidset) dol_print_error($this->db);
}
else dol_print_error($this->db);
} }
// Insert request // Insert request