From 59c387192e752694bb89a5715f8a6640343b5521 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Nov 2010 20:14:29 +0000 Subject: [PATCH] Fix: Postgresql compatibility --- htdocs/install/etape1.php | 17 +- htdocs/install/etape2.php | 10 +- .../install/mysql/data/llx_10_c_regions.sql | 40 ++-- .../mysql/data/llx_20_c_departements.sql | 220 +++++++++--------- htdocs/lib/databases/mysql.lib.php | 2 +- htdocs/lib/databases/mysqli.lib.php | 2 +- htdocs/lib/databases/pgsql.lib.php | 6 +- 7 files changed, 144 insertions(+), 153 deletions(-) diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 63ad2ed2d5d..5fb53fffdf9 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -282,7 +282,8 @@ if ($_POST["action"] == "set") } else { - if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') + if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' + || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS') { dolibarr_install_syslog("etape1: User already exists"); print ''; @@ -337,7 +338,9 @@ if ($_POST["action"] == "set") if ($db->connected) { - if ($db->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user)) + $result=$db->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user); + + if ($result) { print ''; print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : "; @@ -355,12 +358,6 @@ if ($_POST["action"] == "set") } else { - print ''; - print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : "; - print $dolibarr_main_db_name; - print ''; - print ''.$langs->trans("Error").' '.$db->lasterrno().'
'.$db->lasterror().''; - // Affiche aide diagnostique print '
'; print $langs->trans("ErrorFailedToCreateDatabase",$dolibarr_main_db_name).'
'; @@ -514,7 +511,7 @@ function write_conf_file($conffile) global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication; $error=0; - + $key = md5(uniqid(mt_rand(),TRUE)); // Genere un hash d'un nombre aleatoire $fp = fopen("$conffile", "w"); @@ -577,7 +574,7 @@ function write_conf_file($conffile) fputs($fp, '$dolibarr_main_force_https=\''.$_POST["main_force_https"].'\';'); fputs($fp,"\n"); - + fputs($fp, '$dolibarr_main_cookie_cryptkey=\''.$key.'\';'); fputs($fp,"\n"); diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index 031937481c3..d32460cae42 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -173,12 +173,6 @@ if ($_POST["action"] == "set") $buf = fgets($fp, 4096); if (substr($buf, 0, 2) <> '--') { - /* I disable this as it is already done into the query function - if ($choix != 1) // All databases except Mysql - { - $buf=$db->convertSQLFromMysql($buf,'dml'); - } - */ $buffer .= $buf; } } @@ -332,7 +326,7 @@ if ($_POST["action"] == "set") } dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); - $resql=$db->query($buffer); + $resql=$db->query($buffer,0,'dml'); if ($resql) { //print "OK requete ==== $buffer"; @@ -422,7 +416,7 @@ if ($_POST["action"] == "set") { dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); print "\n"; - $resql=$db->query($buffer); + $resql=$db->query($buffer,0,'dml'); if ($resql) { $ok = 1; diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 817bd0a9391..1728a9e001d 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -69,26 +69,26 @@ insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 203, 2, 203, '',3,'Bruxelles-Capitale'); -- Regions Italy (id pays=3) -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (301,3,301,"NULL",1,"Abruzzo"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (302,3,302,"NULL",1,"Basilicata"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (303,3,303,"NULL",1,"Calabria"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (304,3,304,"NULL",1,"Campania"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (305,3,305,"NULL",1,"Emilia-Romagna"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (306,3,306,"NULL",1,"Friuli-Venezia Giulia"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (307,3,307,"NULL",1,"Lazio"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (308,3,308,"NULL",1,"Liguria"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (309,3,309,"NULL",1,"Lombardia"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (310,3,310,"NULL",1,"Marche"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (311,3,311,"NULL",1,"Molise"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (312,3,312,"NULL",1,"Piemonte"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (313,3,313,"NULL",1,"Puglia"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (314,3,314,"NULL",1,"Sardegna"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (315,3,315,"NULL",1,"Sicilia"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (316,3,316,"NULL",1,"Toscana"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (317,3,317,"NULL",1,"Trentino-Alto Adige"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (318,3,318,"NULL",1,"Umbria"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (319,3,319,"NULL",1,"Valle d Aosta"); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (320,3,320,"NULL",1,"Veneto"); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (301, 3, 301, NULL, 1, 'Abruzzo'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (302, 3, 302, NULL, 1, 'Basilicata'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (303, 3, 303, NULL, 1, 'Calabria'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (304, 3, 304, NULL, 1, 'Campania'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (305, 3, 305, NULL, 1, 'Emilia-Romagna'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (306, 3, 306, NULL, 1, 'Friuli-Venezia Giulia'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (307, 3, 307, NULL, 1, 'Lazio'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (308, 3, 308, NULL, 1, 'Liguria'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (309, 3, 309, NULL, 1, 'Lombardia'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (310, 3, 310, NULL, 1, 'Marche'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (311, 3, 311, NULL, 1, 'Molise'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (312, 3, 312, NULL, 1, 'Piemonte'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (313, 3, 313, NULL, 1, 'Puglia'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (314, 3, 314, NULL, 1, 'Sardegna'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (315, 3, 315, NULL, 1, 'Sicilia'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (316, 3, 316, NULL, 1, 'Toscana'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (317, 3, 317, NULL, 1, 'Trentino-Alto Adige'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (318, 3, 318, NULL, 1, 'Umbria'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (319, 3, 319, NULL, 1, 'Valle d Aosta'); +insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (320, 3, 320, NULL, 1, 'Veneto'); -- Regions Spain (id pays=4) INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401, 4, 401, '', 0, 'Andalucia', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index eac77eca49c..f6e54cbe97a 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -151,116 +151,116 @@ insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,no insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (201,'11','',2,'NAMUR','Namur'); -- Provinces Italy (id=3) -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AG",315,NULL,NULL,NULL,"AGRIGENTO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AL",312,NULL,NULL,NULL,"ALESSANDRIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AN",310,NULL,NULL,NULL,"ANCONA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AO",319,NULL,NULL,NULL,"AOSTA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AR",316,NULL,NULL,NULL,"AREZZO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AP",310,NULL,NULL,NULL,"ASCOLI PICENO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AT",312,NULL,NULL,NULL,"ASTI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AV",304,NULL,NULL,NULL,"AVELLINO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BA",313,NULL,NULL,NULL,"BARI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BT",313,NULL,NULL,NULL,"BARLETTA-ANDRIA-TRANI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BL",320,NULL,NULL,NULL,"BELLUNO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BN",304,NULL,NULL,NULL,"BENEVENTO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BG",309,NULL,NULL,NULL,"BERGAMO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BI",312,NULL,NULL,NULL,"BIELLA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BO",305,NULL,NULL,NULL,"BOLOGNA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BZ",317,NULL,NULL,NULL,"BOLZANO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BS",309,NULL,NULL,NULL,"BRESCIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("BR",313,NULL,NULL,NULL,"BRINDISI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CA",314,NULL,NULL,NULL,"CAGLIARI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CL",315,NULL,NULL,NULL,"CALTANISSETTA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CB",311,NULL,NULL,NULL,"CAMPOBASSO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CI",314,NULL,NULL,NULL,"CARBONIA-IGLESIAS"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CE",304,NULL,NULL,NULL,"CASERTA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CT",315,NULL,NULL,NULL,"CATANIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CZ",303,NULL,NULL,NULL,"CATANZARO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CH",301,NULL,NULL,NULL,"CHIETI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CO",309,NULL,NULL,NULL,"COMO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CS",303,NULL,NULL,NULL,"COSENZA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CR",309,NULL,NULL,NULL,"CREMONA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("KR",303,NULL,NULL,NULL,"CROTONE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("CN",312,NULL,NULL,NULL,"CUNEO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("EN",315,NULL,NULL,NULL,"ENNA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("FM",310,NULL,NULL,NULL,"FERMO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("FE",305,NULL,NULL,NULL,"FERRARA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("FI",316,NULL,NULL,NULL,"FIRENZE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("FG",313,NULL,NULL,NULL,"FOGGIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("FC",305,NULL,NULL,NULL,"FORLI-CESENA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("FR",307,NULL,NULL,NULL,"FROSINONE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("GE",308,NULL,NULL,NULL,"GENOVA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("GO",306,NULL,NULL,NULL,"GORIZIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("GR",316,NULL,NULL,NULL,"GROSSETO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("IM",308,NULL,NULL,NULL,"IMPERIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("IS",311,NULL,NULL,NULL,"ISERNIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SP",308,NULL,NULL,NULL,"LA SPEZIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("AQ",301,NULL,NULL,NULL,"L AQUILA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("LT",307,NULL,NULL,NULL,"LATINA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("LE",313,NULL,NULL,NULL,"LECCE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("LC",309,NULL,NULL,NULL,"LECCO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("LI",314,NULL,NULL,NULL,"LIVORNO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("LO",309,NULL,NULL,NULL,"LODI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("LU",316,NULL,NULL,NULL,"LUCCA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MC",310,NULL,NULL,NULL,"MACERATA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MN",309,NULL,NULL,NULL,"MANTOVA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MS",316,NULL,NULL,NULL,"MASSA-CARRARA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MT",302,NULL,NULL,NULL,"MATERA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VS",314,NULL,NULL,NULL,"MEDIO CAMPIDANO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("ME",315,NULL,NULL,NULL,"MESSINA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MI",309,NULL,NULL,NULL,"MILANO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MB",309,NULL,NULL,NULL,"MONZA e BRIANZA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("MO",305,NULL,NULL,NULL,"MODENA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("NA",304,NULL,NULL,NULL,"NAPOLI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("NO",312,NULL,NULL,NULL,"NOVARA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("NU",314,NULL,NULL,NULL,"NUORO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("OG",314,NULL,NULL,NULL,"OGLIASTRA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("OT",314,NULL,NULL,NULL,"OLBIA-TEMPIO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("OR",314,NULL,NULL,NULL,"ORISTANO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PD",320,NULL,NULL,NULL,"PADOVA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PA",315,NULL,NULL,NULL,"PALERMO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PR",305,NULL,NULL,NULL,"PARMA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PV",309,NULL,NULL,NULL,"PAVIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PG",318,NULL,NULL,NULL,"PERUGIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PU",310,NULL,NULL,NULL,"PESARO e URBINO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PE",301,NULL,NULL,NULL,"PESCARA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PC",305,NULL,NULL,NULL,"PIACENZA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PI",316,NULL,NULL,NULL,"PISA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PT",316,NULL,NULL,NULL,"PISTOIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PN",306,NULL,NULL,NULL,"PORDENONE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PZ",302,NULL,NULL,NULL,"POTENZA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("PO",316,NULL,NULL,NULL,"PRATO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RG",315,NULL,NULL,NULL,"RAGUSA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RA",305,NULL,NULL,NULL,"RAVENNA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RC",303,NULL,NULL,NULL,"REGGIO CALABRIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RE",305,NULL,NULL,NULL,"REGGIO NELL EMILIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RI",307,NULL,NULL,NULL,"RIETI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RN",305,NULL,NULL,NULL,"RIMINI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RM",307,NULL,NULL,NULL,"ROMA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("RO",320,NULL,NULL,NULL,"ROVIGO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SA",304,NULL,NULL,NULL,"SALERNO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SS",314,NULL,NULL,NULL,"SASSARI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SV",308,NULL,NULL,NULL,"SAVONA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SI",316,NULL,NULL,NULL,"SIENA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SR",315,NULL,NULL,NULL,"SIRACUSA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("SO",309,NULL,NULL,NULL,"SONDRIO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TA",313,NULL,NULL,NULL,"TARANTO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TE",301,NULL,NULL,NULL,"TERAMO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TR",318,NULL,NULL,NULL,"TERNI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TO",312,NULL,NULL,NULL,"TORINO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TP",315,NULL,NULL,NULL,"TRAPANI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TN",317,NULL,NULL,NULL,"TRENTO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TV",320,NULL,NULL,NULL,"TREVISO"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("TS",306,NULL,NULL,NULL,"TRIESTE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("UD",306,NULL,NULL,NULL,"UDINE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VA",309,NULL,NULL,NULL,"VARESE"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VE",320,NULL,NULL,NULL,"VENEZIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VB",312,NULL,NULL,NULL,"VERBANO-CUSIO-OSSOLA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VC",312,NULL,NULL,NULL,"VERCELLI"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VR",320,NULL,NULL,NULL,"VERONA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VV",303,NULL,NULL,NULL,"VIBO VALENTIA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VI",320,NULL,NULL,NULL,"VICENZA"); -insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ("VT",307,NULL,NULL,NULL,"VITERBO"); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AG',315,NULL,NULL,NULL,'AGRIGENTO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AL',312,NULL,NULL,NULL,'ALESSANDRIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AN',310,NULL,NULL,NULL,'ANCONA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AO',319,NULL,NULL,NULL,'AOSTA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AR',316,NULL,NULL,NULL,'AREZZO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AP',310,NULL,NULL,NULL,'ASCOLI PICENO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AT',312,NULL,NULL,NULL,'ASTI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AV',304,NULL,NULL,NULL,'AVELLINO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BA',313,NULL,NULL,NULL,'BARI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BT',313,NULL,NULL,NULL,'BARLETTA-ANDRIA-TRANI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BL',320,NULL,NULL,NULL,'BELLUNO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BN',304,NULL,NULL,NULL,'BENEVENTO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BG',309,NULL,NULL,NULL,'BERGAMO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BI',312,NULL,NULL,NULL,'BIELLA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BO',305,NULL,NULL,NULL,'BOLOGNA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BZ',317,NULL,NULL,NULL,'BOLZANO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BS',309,NULL,NULL,NULL,'BRESCIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('BR',313,NULL,NULL,NULL,'BRINDISI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CA',314,NULL,NULL,NULL,'CAGLIARI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CL',315,NULL,NULL,NULL,'CALTANISSETTA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CB',311,NULL,NULL,NULL,'CAMPOBASSO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CI',314,NULL,NULL,NULL,'CARBONIA-IGLESIAS'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CE',304,NULL,NULL,NULL,'CASERTA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CT',315,NULL,NULL,NULL,'CATANIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CZ',303,NULL,NULL,NULL,'CATANZARO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CH',301,NULL,NULL,NULL,'CHIETI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CO',309,NULL,NULL,NULL,'COMO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CS',303,NULL,NULL,NULL,'COSENZA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CR',309,NULL,NULL,NULL,'CREMONA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('KR',303,NULL,NULL,NULL,'CROTONE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('CN',312,NULL,NULL,NULL,'CUNEO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('EN',315,NULL,NULL,NULL,'ENNA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FM',310,NULL,NULL,NULL,'FERMO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FE',305,NULL,NULL,NULL,'FERRARA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FI',316,NULL,NULL,NULL,'FIRENZE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FG',313,NULL,NULL,NULL,'FOGGIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FC',305,NULL,NULL,NULL,'FORLI-CESENA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('FR',307,NULL,NULL,NULL,'FROSINONE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('GE',308,NULL,NULL,NULL,'GENOVA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('GO',306,NULL,NULL,NULL,'GORIZIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('GR',316,NULL,NULL,NULL,'GROSSETO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('IM',308,NULL,NULL,NULL,'IMPERIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('IS',311,NULL,NULL,NULL,'ISERNIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SP',308,NULL,NULL,NULL,'LA SPEZIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('AQ',301,NULL,NULL,NULL,'L AQUILA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LT',307,NULL,NULL,NULL,'LATINA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LE',313,NULL,NULL,NULL,'LECCE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LC',309,NULL,NULL,NULL,'LECCO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LI',314,NULL,NULL,NULL,'LIVORNO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LO',309,NULL,NULL,NULL,'LODI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('LU',316,NULL,NULL,NULL,'LUCCA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MC',310,NULL,NULL,NULL,'MACERATA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MN',309,NULL,NULL,NULL,'MANTOVA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MS',316,NULL,NULL,NULL,'MASSA-CARRARA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MT',302,NULL,NULL,NULL,'MATERA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VS',314,NULL,NULL,NULL,'MEDIO CAMPIDANO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('ME',315,NULL,NULL,NULL,'MESSINA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MI',309,NULL,NULL,NULL,'MILANO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MB',309,NULL,NULL,NULL,'MONZA e BRIANZA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('MO',305,NULL,NULL,NULL,'MODENA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('NA',304,NULL,NULL,NULL,'NAPOLI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('NO',312,NULL,NULL,NULL,'NOVARA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('NU',314,NULL,NULL,NULL,'NUORO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('OG',314,NULL,NULL,NULL,'OGLIASTRA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('OT',314,NULL,NULL,NULL,'OLBIA-TEMPIO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('OR',314,NULL,NULL,NULL,'ORISTANO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PD',320,NULL,NULL,NULL,'PADOVA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PA',315,NULL,NULL,NULL,'PALERMO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PR',305,NULL,NULL,NULL,'PARMA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PV',309,NULL,NULL,NULL,'PAVIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PG',318,NULL,NULL,NULL,'PERUGIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PU',310,NULL,NULL,NULL,'PESARO e URBINO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PE',301,NULL,NULL,NULL,'PESCARA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PC',305,NULL,NULL,NULL,'PIACENZA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PI',316,NULL,NULL,NULL,'PISA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PT',316,NULL,NULL,NULL,'PISTOIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PN',306,NULL,NULL,NULL,'PORDENONE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PZ',302,NULL,NULL,NULL,'POTENZA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('PO',316,NULL,NULL,NULL,'PRATO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RG',315,NULL,NULL,NULL,'RAGUSA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RA',305,NULL,NULL,NULL,'RAVENNA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RC',303,NULL,NULL,NULL,'REGGIO CALABRIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RE',305,NULL,NULL,NULL,'REGGIO NELL EMILIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RI',307,NULL,NULL,NULL,'RIETI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RN',305,NULL,NULL,NULL,'RIMINI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RM',307,NULL,NULL,NULL,'ROMA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('RO',320,NULL,NULL,NULL,'ROVIGO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SA',304,NULL,NULL,NULL,'SALERNO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SS',314,NULL,NULL,NULL,'SASSARI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SV',308,NULL,NULL,NULL,'SAVONA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SI',316,NULL,NULL,NULL,'SIENA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SR',315,NULL,NULL,NULL,'SIRACUSA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('SO',309,NULL,NULL,NULL,'SONDRIO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TA',313,NULL,NULL,NULL,'TARANTO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TE',301,NULL,NULL,NULL,'TERAMO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TR',318,NULL,NULL,NULL,'TERNI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TO',312,NULL,NULL,NULL,'TORINO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TP',315,NULL,NULL,NULL,'TRAPANI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TN',317,NULL,NULL,NULL,'TRENTO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TV',320,NULL,NULL,NULL,'TREVISO'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('TS',306,NULL,NULL,NULL,'TRIESTE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('UD',306,NULL,NULL,NULL,'UDINE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VA',309,NULL,NULL,NULL,'VARESE'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VE',320,NULL,NULL,NULL,'VENEZIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VB',312,NULL,NULL,NULL,'VERBANO-CUSIO-OSSOLA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VC',312,NULL,NULL,NULL,'VERCELLI'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VR',320,NULL,NULL,NULL,'VERONA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VV',303,NULL,NULL,NULL,'VIBO VALENTIA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VI',320,NULL,NULL,NULL,'VICENZA'); +insert into llx_c_departements (code_departement,fk_region,cheflieu,tncc,ncc,nom) values ('VT',307,NULL,NULL,NULL,'VITERBO'); -- Provinces Australia (id=28) insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales'); diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index bf274106992..04664a29f81 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -385,7 +385,7 @@ class DoliDb $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); - dol_syslog("Mysql.lib::query SQL error: ".$query, LOG_WARNING); + dol_syslog("Mysql.lib::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING); } $this->lastquery=$query; $this->results = $ret; diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 525ae643e89..699caa63dc8 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -390,7 +390,7 @@ class DoliDb $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); - dol_syslog("Mysqli.lib::query SQL error: ".$query, LOG_WARNING); + dol_syslog("Mysqli.lib::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING); } $this->lastquery=$query; $this->results = $ret; diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index fe81f9ddc31..c48a77197bf 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -302,7 +302,7 @@ class DoliDb } } - //print $line."\n"; + //print "type=".$type." newline=".$line."
\n"; } return $line; @@ -518,7 +518,7 @@ class DoliDb $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); - dol_syslog("Pgsql.lib::query SQL error: ".$query, LOG_WARNING); + dol_syslog("Pgsql.lib::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING); //print "\n>> ".$query."
\n"; //print '>> '.$this->lasterrno.' - '.$this->lasterror.' - '.$this->lastqueryerror."
\n"; @@ -920,7 +920,7 @@ class DoliDb $like = ''; if ($table) $like = " AND table_name LIKE '".$table."'"; - $result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like); + $result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name"); while($row = $this->fetch_row($result)) { $listtables[] = $row[0];