Skip to content

Commit

Permalink
Fix pgsql
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jun 19, 2017
1 parent 22ef855 commit 099ef58
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 5 deletions.
11 changes: 7 additions & 4 deletions htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Expand Up @@ -98,11 +98,14 @@ ALTER TABLE llx_actioncomm ADD COLUMN extraparams varchar(255);


ALTER TABLE llx_bank_account ADD COLUMN extraparams varchar(255);
ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer DEFAULT NULL;

ALTER TABLE llx_adherent MODIFY COLUMN state_id integer DEFAULT NULL;
ALTER TABLE llx_adherent MODIFY COLUMN country integer DEFAULT NULL;
-- VMYSQL4.1 ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer DEFAULT NULL;
-- VPGSQL8.2 ALTER TABLE llx_bank_account MODIFY COLUMN state_id integer USING state_id::integer;

-- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN state_id integer DEFAULT NULL;
-- VPGSQL8.2 ALTER TABLE llx_adherent MODIFY COLUMN state_id integer USING state_id::integer;
-- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN country integer DEFAULT NULL;
-- VPGSQL8.2 ALTER TABLE llx_adherent MODIFY COLUMN country integer USING country::integer;

insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);
insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30);
Expand Down Expand Up @@ -463,7 +466,7 @@ ALTER TABLE llx_usergroup_rights ADD CONSTRAINT fk_usergroup_rights_fk_usergroup
CREATE TABLE llx_blockedlog
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
tms timestamp,
action varchar(50),
amounts real NOT NULL,
signature varchar(100) NOT NULL,
Expand Down
19 changes: 18 additions & 1 deletion htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -1,8 +1,25 @@
-- ===================================================================
-- Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
--
-- ===================================================================

CREATE TABLE llx_blockedlog
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
tms timestamp,
action varchar(50),
amounts real NOT NULL,
signature varchar(100) NOT NULL,
Expand Down

0 comments on commit 099ef58

Please sign in to comment.