diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index e7e7df739b7345e6c946ef3edaab428c8a24f6a4..b5de2d57f80ea116f276c5f009593a2c1c562950 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -46,7 +46,7 @@ class DoliDBPgsql extends DoliDB static $versionmin=array(8,4,0); // Version min database //! Resultset of last query private $_results; - + public $unescapeslashquot; public $standard_conforming_strings; @@ -172,6 +172,8 @@ class DoliDBPgsql extends DoliDB else if (preg_match('/DROP TABLE/i',$line)) $type='dml'; } + $line=preg_replace('/ as signed/i',' as integer',$line); + if ($type == 'dml') { $line=preg_replace('/\s/',' ',$line); // Replace tabulation with space @@ -196,8 +198,7 @@ class DoliDBPgsql extends DoliDB // nuke unsigned $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line); - $line=preg_replace('/as signed/i','as integer',$line); - + // blob -> text $line=preg_replace('/\w*blob/i','text',$line); @@ -463,7 +464,7 @@ class DoliDBPgsql extends DoliDB function query($query,$usesavepoint=0,$type='auto') { global $conf; - + $query = trim($query); // Convert MySQL syntax to PostgresSQL syntax @@ -484,7 +485,7 @@ class DoliDBPgsql extends DoliDB else $loop=false; } } - + if ($usesavepoint && $this->transaction_opened) { @pg_query($this->db, 'SAVEPOINT mysavepoint');