diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index 177bd6f9..6fd5d376 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -91,19 +91,19 @@ public class SIPRPDataLoader implements CompanyDataLoader Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "siprp" ); Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "org.postgresql.Driver" ); -// Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" ); -// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); + Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" ); Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); + +// Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); +// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index 0af87abc..0c8c7fcf 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -24,16 +24,17 @@ import com.evolute.utils.sql.*; public class UpdateList { protected static final Update UPDATE_LIST[] = - new Update[]{ new siprp.update.updates.V6_1_To_V7_0(), new siprp.update.updates.V7_0_To_V7_2(), - new siprp.update.updates.V7_2_To_V7_4(), new siprp.update.updates.V7_4_To_V7_5(), - new siprp.update.updates.V7_5_To_V7_6(), new siprp.update.updates.V7_6_To_V7_7(), - new siprp.update.updates.V7_7_To_V7_8(), new siprp.update.updates.V7_8_To_V7_9(), - new siprp.update.updates.V7_9_To_V8_0(), new siprp.update.updates.V8_0_To_V8_1(), - new siprp.update.updates.V8_1_To_V8_2(), new siprp.update.updates.V8_2_To_V8_3(), - new siprp.update.updates.V8_3_To_V8_4(), new siprp.update.updates.V8_4_To_V8_5(), - new siprp.update.updates.V8_5_To_V8_6(), new siprp.update.updates.V8_6_To_V8_7(), - new siprp.update.updates.V8_7_To_V8_8(), new siprp.update.updates.V8_8_To_V8_9(), - new siprp.update.updates.V8_9_To_V9_0(), new siprp.update.updates.V9_0_To_V9_1(), + new Update[]{ +// new siprp.update.updates.V6_1_To_V7_0(), new siprp.update.updates.V7_0_To_V7_2(), +// new siprp.update.updates.V7_2_To_V7_4(), new siprp.update.updates.V7_4_To_V7_5(), +// new siprp.update.updates.V7_5_To_V7_6(), new siprp.update.updates.V7_6_To_V7_7(), +// new siprp.update.updates.V7_7_To_V7_8(), new siprp.update.updates.V7_8_To_V7_9(), +// new siprp.update.updates.V7_9_To_V8_0(), new siprp.update.updates.V8_0_To_V8_1(), +// new siprp.update.updates.V8_1_To_V8_2(), new siprp.update.updates.V8_2_To_V8_3(), +// new siprp.update.updates.V8_3_To_V8_4(), new siprp.update.updates.V8_4_To_V8_5(), +// new siprp.update.updates.V8_5_To_V8_6(), new siprp.update.updates.V8_6_To_V8_7(), +// new siprp.update.updates.V8_7_To_V8_8(), new siprp.update.updates.V8_8_To_V8_9(), +// new siprp.update.updates.V8_9_To_V9_0(), new siprp.update.updates.V9_0_To_V9_1(), new siprp.update.updates.V9_1_To_V9_2(), new siprp.update.updates.V9_2_To_V9_3(), new siprp.update.updates.V9_3_To_V9_4(), new siprp.update.updates.V9_4_To_V9_5(), new siprp.update.updates.V9_5_To_V9_6(), new siprp.update.updates.V9_6_To_V9_7(), 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 37fc9c85..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 @@ -49,11 +49,11 @@ public class V8_9_To_V9_0 Executer executer = dbm.getSharedExecuter(); com.evolute.utils.sql.Update update = new com.evolute.utils.sql.Update( - /*"create table email_plano_de_actuacao(" + + "create table email_plano_de_actuacao(" + "id serial PRIMARY KEY," + "description varchar(255) NOT NULL," + "estabelecimento_id int4 REFERENCES estabelecimentos(id)" + - ");" +*/ + ");" + "create table posto_de_trabalho(" + "id serial PRIMARY KEY," + "description varchar(1024) NOT NULL" + 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 47fa478e..29436924 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 @@ -41,7 +41,7 @@ public class V9_1_To_V9_2 com.evolute.utils.sql.Update update = new com.evolute.utils.sql.Update( "alter table hs_area add column deleted_date timestamp;" + - "alter table hs_equipamento_medicao add column deleted_date timestamp;" + + "alter table hs_equipamento_medico add column deleted_date timestamp;" + "alter table hs_legislacao add column deleted_date timestamp;" + "alter table hs_legislacao_categoria add column deleted_date timestamp;" + "alter table hs_medida add column deleted_date timestamp;" +