From a27b3a211914c5cd159cd6635233232450bca339 Mon Sep 17 00:00:00 2001 From: fhenry Date: Mon, 8 Apr 2013 09:45:11 +0200 Subject: [PATCH] Fix PostGreSQL blocking install : wrong SQL syntax --- .../mysql/tables/llx_facture_fourn.key.sql | 2 +- .../install/mysql/tables/llx_printer_ipp.sql | 18 +++++++++--------- htdocs/install/pgsql/functions/functions.sql | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 8bb0db5a552..481974a6c4d 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -18,7 +18,7 @@ -- ============================================================================ -ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc, entity); +ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (ref, fk_soc, entity); ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_date_lim_reglement (date_lim_reglement); diff --git a/htdocs/install/mysql/tables/llx_printer_ipp.sql b/htdocs/install/mysql/tables/llx_printer_ipp.sql index ba76af5a90e..cb898432fe5 100644 --- a/htdocs/install/mysql/tables/llx_printer_ipp.sql +++ b/htdocs/install/mysql/tables/llx_printer_ipp.sql @@ -18,13 +18,13 @@ CREATE TABLE llx_printer_ipp ( - rowid int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - datec datetime, - printer_name text NOT NULL, - printer_location text NOT NULL, - printer_uri varchar(256) NOT NULL, - copy int(11) NOT NULL DEFAULT '1', - module varchar(16) NOT NULL, - login varchar(32) NOT NULL + rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + datec datetime, + printer_name text NOT NULL, + printer_location text NOT NULL, + printer_uri varchar(256) NOT NULL, + copy integer NOT NULL DEFAULT '1', + module varchar(16) NOT NULL, + login varchar(32) NOT NULL )ENGINE=innodb; diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index b1f9282b6bf..697fef486e2 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -117,3 +117,4 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EX CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_cronjob FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); +CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_printer_ipp FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();