From 811fb69e99d3a1507c2805c29d2f685ff0e44873 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 10 Jan 2011 00:44:02 +0000 Subject: [PATCH] Fix: Error with postgresql --- htdocs/install/fileconf.php | 2 +- htdocs/install/mysql/migration/2.9.0-3.0.0.sql | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index db71e3792c5..135eaf359c7 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -267,7 +267,7 @@ if (1 == 2) { // Disabled during install process because HTTPS may not be yet $versionbasemin=array(); if ($type=='mysql') { $versionbasemin=array(3,1,0); $testfunction='mysql_connect'; } if ($type=='mysqli') { $versionbasemin=array(4,1,0); $testfunction='mysqli_connect'; } - if ($type=='pgsql') { $versionbasemin=array(8,1,0); $testfunction='pg_connect'; } + if ($type=='pgsql') { $versionbasemin=array(8,4,0); $testfunction='pg_connect'; } if ($type=='mssql') { $versionbasemin=array(2000); $testfunction='mssql_connect'; } // Remarques diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index 03a0be7c9a3..893a9e129ce 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -132,7 +132,7 @@ ALTER TABLE llx_mailing_cibles MODIFY source_url varchar(160); ALTER TABLE llx_mailing_cibles ADD COLUMN source_id integer after source_url; ALTER TABLE llx_mailing_cibles ADD COLUMN source_type varchar(16) after source_id; -ALTER TABLE llx_facture_rec MODIFY frequency integer; +ALTER TABLE llx_facture_rec MODIFY frequency integer; ALTER TABLE llx_facture_rec ADD COLUMN unit_frequency varchar(2) DEFAULT 'd'; ALTER TABLE llx_facture_rec ADD COLUMN date_when datetime DEFAULT NULL; ALTER TABLE llx_facture_rec ADD COLUMN date_last_gen datetime DEFAULT NULL; @@ -143,9 +143,9 @@ ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_max integer DEFAULT NULL; ALTER TABLE llx_user ADD COLUMN openid varchar(255); -- Enhance Withdrawal module -INSERT INTO llx_action_def (code,titre,description,objet_type) values ('NOTIFY_TRN_WITHDRAW','Transmit withdraw','Executed when a withdrawal is transmited','withdraw'); -INSERT INTO llx_action_def (code,titre,description,objet_type) values ('NOTIFY_CRD_WITHDRAW','Credite withdraw','Executed when a withdrawal is credited','withdraw'); -INSERT INTO llx_action_def (code,titre,description,objet_type) values ('NOTIFY_EMT_WITHDRAW','Emit withdraw','Executed when a withdrawal is emited','withdraw'); +INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (7,'NOTIFY_TRN_WITHDRAW','Transmit withdraw','Executed when a withdrawal is transmited','withdraw'); +INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (8,'NOTIFY_CRD_WITHDRAW','Credite withdraw','Executed when a withdrawal is credited','withdraw'); +INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (9,'NOTIFY_EMT_WITHDRAW','Emit withdraw','Executed when a withdrawal is emited','withdraw'); ALTER TABLE llx_prelevement_notifications MODIFY action varchar(32);