From 87cdbf82bff7bdb2c0625cb8fdc45e1711c4d52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Fri, 24 Oct 2008 17:20:28 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@778 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../siprp/update/updates/V8_2_To_V8_3.java | 11 --- .../siprp/update/updates/V8_3_To_V8_4.java | 11 --- .../siprp/update/updates/V8_4_To_V8_5.java | 11 --- .../siprp/update/updates/V8_5_To_V8_6.java | 11 --- .../siprp/update/updates/V8_6_To_V8_7.java | 10 --- .../siprp/update/updates/V8_7_To_V8_8.java | 9 --- .../siprp/update/updates/V8_8_To_V8_9.java | 9 --- .../siprp/update/updates/V8_9_To_V9_0.java | 9 --- .../siprp/update/updates/V9_0_To_V9_1.java | 9 --- .../siprp/update/updates/V9_1_To_V9_2.java | 9 --- .../siprp/update/updates/V9_2_To_V9_3.java | 9 --- .../siprp/update/updates/V9_3_To_V9_4.java | 9 --- .../siprp/update/updates/V9_4_To_V9_5.java | 80 +++++++++++++++++++ .../siprp/update/updates/V9_5_To_V9_6.java | 56 +++++++++++++ .../siprp/update/updates/V9_6_To_V9_7.java | 62 ++++++++++++++ .../siprp/update/updates/V9_7_To_V9_8.java | 64 +++++++++++++++ 16 files changed, 262 insertions(+), 117 deletions(-) create mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java create mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java create mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java create mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java index df4b4e0a..86bb1850 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java @@ -1,19 +1,8 @@ -/* - * V8_12_To_V8_3.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java index 9a7dc3d8..e00b0096 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java @@ -1,19 +1,8 @@ -/* - * V8_12_To_V8_3.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java index a647f1bd..1a2463eb 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java @@ -1,19 +1,8 @@ -/* - * V8_12_To_V8_3.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java index f3e5676c..8065d2ef 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java @@ -1,19 +1,8 @@ -/* - * V8_12_To_V8_3.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java index 603d9282..b8fbf9a1 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java @@ -1,18 +1,8 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Delete; /** * diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java index 5d2daab5..6502b7e0 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java index 6cc411dc..bf6d8f3f 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java index 8912c005..3827ec48 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java index 2b43bcdc..56a90b91 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java index 1d80d77e..47fa478e 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java index 54568cf7..dc4dca5f 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java index 502bd432..3bef558f 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java @@ -1,12 +1,3 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.update.updates; import com.evolute.utils.Singleton; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java new file mode 100644 index 00000000..0d21d416 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java @@ -0,0 +1,80 @@ +package siprp.update.updates; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +/** + * + * @author fpalma + */ +public class V9_4_To_V9_5 + implements siprp.update.Update +{ + + public V9_4_To_V9_5() + { + } + + public String []listChanges() + { + return new String[]{ + "Refactorizacao do relatorio" + }; + } + + public double getStartVersion() + { + return 9.4; + } + + public double getEndVersion() + { + return 9.5; + } + + public void doUpdate() + throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + com.evolute.utils.sql.Update update = + new com.evolute.utils.sql.Update( + "drop table hs_relatorio_medida_posto;" + + "drop table hs_relatorio_medida_area;" + + "alter table hs_relatorio_risco drop column probabilidade;" + + "alter table hs_relatorio_risco drop column severidade;" + + "alter table hs_relatorio_risco drop column valor_qualitativo_id;" + + "create table hs_posto_risco(" + + " posto_id int4 REFERENCES hs_posto(id)," + + " risco_id int4 REFERENCES hs_risco(id)," + + " CONSTRAINT hs_posto_risco_pkey PRIMARY KEY (posto_id,risco_id)" + + ");" + + "create table hs_relatorio_area(" + + " id serial PRIMARY KEY," + + " description varchar(256) NOT NULL," + + " deleted_date timestamp" + + ");" + + "create table hs_relatorio_posto(" + + " id serial PRIMARY KEY," + + " description varchar(256) NOT NULL," + + " area_id int4 REFERENCES hs_relatorio_area(id)," + + " deleted_date timestamp" + + ");" + + "create table hs_relatorio_posto_risco(" + + " posto_id int4 REFERENCES hs_relatorio_posto(id)," + + " risco_id int4 REFERENCES hs_relatorio_risco(id)," + + " probabilidade int4," + + " severidade int4," + + " valor_qualitativo_id int4 REFERENCES hs_relatorio_risco_valor_qualitativo(id)," + + " CONSTRAINT hs_relatorio_posto_risco_pkey PRIMARY KEY (posto_id,risco_id)" + + ");" + ); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } +} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java new file mode 100644 index 00000000..4b355636 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java @@ -0,0 +1,56 @@ +package siprp.update.updates; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +/** + * + * @author fpalma + */ +public class V9_5_To_V9_6 + implements siprp.update.Update +{ + + public V9_5_To_V9_6() + { + } + + public String []listChanges() + { + return new String[]{ + "Relacao postoDeTrabalho <-> estabelecimento" + }; + } + + public double getStartVersion() + { + return 9.5; + } + + public double getEndVersion() + { + return 9.6; + } + + public void doUpdate() + throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + com.evolute.utils.sql.Update update = + new com.evolute.utils.sql.Update( + "create table hs_posto_estabelecimento(" + + " posto_id int4 REFERENCES hs_posto(id)," + + " estabelecimento_id int4 REFERENCES estabelecimentos(id)," + + " CONSTRAINT hs_posto_estabelecimento_pkey PRIMARY KEY(posto_id,estabelecimento_id)" + + ");" + ); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } +} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java new file mode 100644 index 00000000..6088724f --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java @@ -0,0 +1,62 @@ +package siprp.update.updates; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +/** + * + * @author fpalma + */ +public class V9_6_To_V9_7 + implements siprp.update.Update +{ + + public V9_6_To_V9_7() + { + } + + public String []listChanges() + { + return new String[]{ + "Relacao postoDeTrabalho <-> medida" + }; + } + + public double getStartVersion() + { + return 9.6; + } + + public double getEndVersion() + { + return 9.7; + } + + public void doUpdate() + throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + com.evolute.utils.sql.Update update = + new com.evolute.utils.sql.Update( + "drop table hs_posto_risco;" + + "create table hs_posto_medida(" + + " posto_id int4 REFERENCES hs_posto(id)," + + " medida_id int4 REFERENCES hs_medida(id)," + + " CONSTRAINT hs_posto_medida_pkey PRIMARY KEY(posto_id,medida_id)" + + ");" + + "create table hs_relatorio_posto_medida(" + + " posto_id int4 REFERENCES hs_relatorio_posto(id)," + + " medida_id int4 REFERENCES hs_relatorio_medida(id)," + + " CONSTRAINT hs_relatorio_posto_medida_pkey PRIMARY KEY(posto_id,medida_id)" + + ");" + ); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } +} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java new file mode 100644 index 00000000..15057f26 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java @@ -0,0 +1,64 @@ +package siprp.update.updates; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +/** + * + * @author fpalma + */ +public class V9_7_To_V9_8 + implements siprp.update.Update +{ + + public V9_7_To_V9_8() + { + } + + public String []listChanges() + { + return new String[]{ + "Relacao postoDeTrabalho <-> risco" + }; + } + + public double getStartVersion() + { + return 9.7; + } + + public double getEndVersion() + { + return 9.8; + } + + public void doUpdate() + throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + com.evolute.utils.sql.Update update = + new com.evolute.utils.sql.Update( + "create table hs_posto_risco(" + + " posto_id int4 REFERENCES hs_posto(id)," + + " risco_id int4 REFERENCES hs_risco(id)," + + " probabilidade int4," + + " severidade int4," + + " valor_qualitativo int4 REFERENCES hs_relatorio_risco_valor_qualitativo," + + " CONSTRAINT hs_posto_risco_pkey PRIMARY KEY(posto_id, risco_id)" + + ");" + + "ALTER TABLE hs_relatorio_risco DROP COLUMN is_plano_actuacao;" + + "ALTER TABLE hs_posto_risco ADD COLUMN is_plano_actuacao char(1);" + + "insert into hs_relatorio_risco_valor_qualitativo (description) values('Controlado');" + + "insert into hs_relatorio_risco_valor_qualitativo (description) values('Incontrolado');" + + "insert into hs_relatorio_risco_valor_qualitativo (description) values('Indeterminado');" + ); + executer.executeQuery( update ); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } +}