diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java index 3a7f33925..695b8926b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java @@ -8,7 +8,6 @@ import javax.servlet.ServletContext; import javax.sql.DataSource; import org.apache.log4j.Logger; -import org.flywaydb.core.Flyway; import org.quartz.JobDetail; import org.quartz.Scheduler; import org.quartz.SchedulerException; @@ -21,6 +20,7 @@ import org.springframework.context.ApplicationContext; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.WebApp; +import com.rjconsultores.ventaboletos.FlyWay; import com.rjconsultores.ventaboletos.entidad.Constante; import com.rjconsultores.ventaboletos.service.ConstanteService; import com.rjconsultores.ventaboletos.web.gui.controladores.job.GeneracionCorridaJob; @@ -76,23 +76,26 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit { * Executa os sqls novos na base de dados */ private void executeFlyway() { - log.info("Executando Flyway..."); + FlyWay.getInstance().defineDataSource(getDataSoure()); + FlyWay.getInstance().start(); - try{ - final Flyway flyway = new Flyway(); - - flyway.setDataSource(getDataSoure()); - flyway.setValidateOnMigrate(false); - flyway.setIgnoreFutureMigrations(true); - flyway.setOutOfOrder(true); - flyway.setBaselineOnMigrate(true); - - flyway.migrate(); - }catch(Throwable t){ - log.error("Erro ao executar o flyway",t); - } - - log.info("Flyway executado."); +// log.info("Executando Flyway..."); +// +// try{ +// final Flyway flyway = new Flyway(); +// +// flyway.setDataSource(getDataSoure()); +// flyway.setValidateOnMigrate(false); +// flyway.setIgnoreFutureMigrations(true); +// flyway.setOutOfOrder(true); +// flyway.setBaselineOnMigrate(true); +// +// flyway.migrate(); +// }catch(Throwable t){ +// log.error("Erro ao executar o flyway",t); +// } +// +// log.info("Flyway executado."); } private boolean ipBloqueadoGeracaoServico() { diff --git a/src/java/db/migration/V20160726_1445__casetapeajeexcepcion.sql b/src/java/db/migration/V20160726_1445__casetapeajeexcepcion.sql deleted file mode 100644 index 89eb7a32e..000000000 --- a/src/java/db/migration/V20160726_1445__casetapeajeexcepcion.sql +++ /dev/null @@ -1,29 +0,0 @@ - -CREATE TABLE - CASETA_PEAJE_EXCEPCION - ( - CASETAPEAJEEXCEPCION_ID NUMBER(7) NOT NULL, - CASETAPEAJE_ID NUMBER(7) NOT NULL, - FECHAVENTAINI DATE, - FECHAVENTAFIN DATE, - FECHORINICIO DATE, - FECHORFINAL DATE, - INDLUNES NUMBER(1), - INDMARTES NUMBER(1), - INDMIERCOLES NUMBER(1), - INDJUEVES NUMBER(1), - INDVIERNES NUMBER(1), - INDSABADO NUMBER(1), - INDDOMINGO NUMBER(1), - ACTIVO NUMBER(1), - FECMODIF DATE, - USUARIO_ID NUMBER(7), - PRECIO NUMBER(7,2), - CONSTRAINT CASETA_PEAJE_EXCEPCION_PK PRIMARY KEY (CASETAPEAJEEXCEPCION_ID), - CONSTRAINT CASETAPEXCEPCION_CASETA_FK FOREIGN KEY (CASETAPEAJE_ID) REFERENCES - CASETA_PEAJE (CASETAPEAJE_ID), - CONSTRAINT NNC_CASETAPEAJEEXCEPCION_ID CHECK ("CASETAPEAJEEXCEPCION_ID" IS NOT NULL), - CONSTRAINT NNC_CASETAPEAJE_ID CHECK ("CASETAPEAJE_ID" IS NOT NULL) - ); - -CREATE SEQUENCE "CASETA_PEAJE_EXCEPCION_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE ; \ No newline at end of file diff --git a/src/java/db/migration/V20160727_1529__exibecorridabloqueada.sql b/src/java/db/migration/V20160727_1529__exibecorridabloqueada.sql deleted file mode 100644 index fe80a6ea5..000000000 --- a/src/java/db/migration/V20160727_1529__exibecorridabloqueada.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE CONF_RESTRICAO_CANALVENTA ADD (INDEXIBECORRIDABLOQ NUMBER(1,0) DEFAULT 0 NOT NULL ENABLE); \ No newline at end of file diff --git a/src/java/db/migration/V20160727_1536__mantis7411.sql b/src/java/db/migration/V20160727_1536__mantis7411.sql deleted file mode 100644 index 6c2bdd96a..000000000 --- a/src/java/db/migration/V20160727_1536__mantis7411.sql +++ /dev/null @@ -1,4 +0,0 @@ -insert into FUNCION_SISTEMA (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) -values -(FUNCION_SISTEMA_SEQ.NEXTVAL,'2','VDA > MANUTENÇÃO DE SERVIÇOS >> MODIFICAÇÕES DE SERVIÇO >>> INICIADO/FECHADO', -'COM.RJCONSULTORES.VENTABOLETOS.GUI.VENTA.MENU.ITENS.MODIFICASERVICOINICIADOFECHADO','1',SYSDATE,'1'); \ No newline at end of file diff --git a/src/java/db/migration/V20160728_1738__inativarruta.sql b/src/java/db/migration/V20160728_1738__inativarruta.sql deleted file mode 100644 index bcfd41c28..000000000 --- a/src/java/db/migration/V20160728_1738__inativarruta.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE RUTA ADD INDRUTACENLADA NUMERIC(1) default 0; \ No newline at end of file diff --git a/src/java/db/migration/V20160729_1502__excepcionpeajevigencia.sql b/src/java/db/migration/V20160729_1502__excepcionpeajevigencia.sql deleted file mode 100644 index 290516755..000000000 --- a/src/java/db/migration/V20160729_1502__excepcionpeajevigencia.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE - EXCEPCION_PEAJE_VIGENCIA ADD (CASETAPEAJE_ID NUMBER(7)); -ALTER TABLE - EXCEPCION_PEAJE_VIGENCIA ADD CONSTRAINT EXCPEAJEVIGENCIA_CASETA_FK FOREIGN KEY - (CASETAPEAJE_ID) REFERENCES CASETA_PEAJE (CASETAPEAJE_ID) \ No newline at end of file diff --git a/src/java/db/migration/V20160801_1033__mantis7781.sql b/src/java/db/migration/V20160801_1033__mantis7781.sql deleted file mode 100644 index 545752ea9..000000000 --- a/src/java/db/migration/V20160801_1033__mantis7781.sql +++ /dev/null @@ -1,21 +0,0 @@ -declare - column_exists exception; - ja_existe exception; - pragma exception_init (column_exists , -01430); - pragma exception_init (ja_existe , -00001); -begin - execute immediate 'ALTER TABLE EMPRESA ADD INDGENNUMFOLIOVTAINTIMPOST NUMBER(1,0) DEFAULT 0 NOT NULL'; - INSERT INTO FUNCION_SISTEMA VALUES - ( - FUNCION_SISTEMA_SEQ.NEXTVAL, - 1, - 'ADM > CATALOGOS >> EMPRESA >> GERA NUMERO BILHETE VENDA INTERNET E IMP. POSTERIOR', - 'COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGO.MENU.EMPRESA.GENERAFOLIOSISTEMAVTAINTIMPPOSTERIOR', - 1 , - sysdate, - 1 - ); - exception - when column_exists then null; - when ja_existe then null; -end; \ No newline at end of file diff --git a/src/java/db/migration/V20160801_1449__txemarque.sql b/src/java/db/migration/V20160801_1449__txemarque.sql deleted file mode 100644 index f11e90705..000000000 --- a/src/java/db/migration/V20160801_1449__txemarque.sql +++ /dev/null @@ -1,7 +0,0 @@ -declare - column_exists exception; - pragma exception_init (column_exists , -01430); -begin - execute immediate 'ALTER TABLE TAXA_EMBARQUE_PARADA ADD (EMPRESA_ID NUMBER(7) DEFAULT -1 NOT NULL)'; - exception when column_exists then null; -end; \ No newline at end of file diff --git a/src/java/db/migration/V20160801_1732__dropTarifaConstraint.sql b/src/java/db/migration/V20160801_1732__dropTarifaConstraint.sql deleted file mode 100644 index a6350b011..000000000 --- a/src/java/db/migration/V20160801_1732__dropTarifaConstraint.sql +++ /dev/null @@ -1,15 +0,0 @@ ---drop constraint se existe -DECLARE -itemExists NUMBER; -BEGIN - itemExists := 0; - -SELECT COUNT(CONSTRAINT_NAME) INTO itemExists -FROM ALL_CONSTRAINTS -WHERE UPPER(CONSTRAINT_NAME) = UPPER('TARIFA_UNICA'); - -IF itemExists > 0 THEN -EXECUTE IMMEDIATE 'ALTER TABLE TARIFA DROP CONSTRAINT TARIFA_UNICA'; -END IF; - -END; \ No newline at end of file diff --git a/src/java/db/migration/V20160802_1636__dropTarifaOficialConstraint.sql b/src/java/db/migration/V20160802_1636__dropTarifaOficialConstraint.sql deleted file mode 100644 index 6657085e0..000000000 --- a/src/java/db/migration/V20160802_1636__dropTarifaOficialConstraint.sql +++ /dev/null @@ -1,14 +0,0 @@ ---drop constraint se existe -DECLARE -itemExists NUMBER; -BEGIN - itemExists := 0; - -SELECT COUNT(CONSTRAINT_NAME) INTO itemExists -FROM ALL_CONSTRAINTS -WHERE UPPER(CONSTRAINT_NAME) = UPPER('UNIQUE_TARIFA_OFICIAL'); - -IF itemExists > 0 THEN -EXECUTE IMMEDIATE 'ALTER TABLE TARIFA_OFICIAL DROP CONSTRAINT UNIQUE_TARIFA_OFICIAL'; -END IF; -END; \ No newline at end of file diff --git a/src/java/db/migration/V20160804_1559__nullvalesruta.sql b/src/java/db/migration/V20160804_1559__nullvalesruta.sql deleted file mode 100644 index 2287cab4d..000000000 --- a/src/java/db/migration/V20160804_1559__nullvalesruta.sql +++ /dev/null @@ -1,2 +0,0 @@ -update ruta set INDRUTACENLADA=0 where INDRUTACENLADA is null; -alter table ruta modify (INDRUTACENLADA not null); \ No newline at end of file diff --git a/src/java/db/migration/V20160818_1000__increase_importe_peaje_scale.sql b/src/java/db/migration/V20160818_1000__increase_importe_peaje_scale.sql deleted file mode 100644 index d83b8c5e7..000000000 --- a/src/java/db/migration/V20160818_1000__increase_importe_peaje_scale.sql +++ /dev/null @@ -1 +0,0 @@ -alter table peaje modify (importepeaje number(15, 10)); \ No newline at end of file diff --git a/src/java/db/migration/V20160822_2033__reunpaulista.sql b/src/java/db/migration/V20160822_2033__reunpaulista.sql deleted file mode 100644 index 0ae82b1b1..000000000 --- a/src/java/db/migration/V20160822_2033__reunpaulista.sql +++ /dev/null @@ -1,7 +0,0 @@ -declare - column_exists exception; - pragma exception_init (column_exists , -01430); -begin - execute immediate 'ALTER TABLE TARIFA_KM MODIFY (KMATE NUMBER(7, 2))'; - exception when column_exists then null; -end; \ No newline at end of file diff --git a/src/java/db/migration/V20160825_1712__mantis7849.sql b/src/java/db/migration/V20160825_1712__mantis7849.sql deleted file mode 100644 index 9b77d1f2e..000000000 --- a/src/java/db/migration/V20160825_1712__mantis7849.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE DIAGRAMA_AUTOBUS ADD (INDTIPO NUMBER(1)); -UPDATE DIAGRAMA_AUTOBUS SET INDTIPO = INDBARCO + 1; \ No newline at end of file diff --git a/src/java/db/migration/V20160830_1614__mantis7879.sql b/src/java/db/migration/V20160830_1614__mantis7879.sql deleted file mode 100644 index 37c767e7a..000000000 --- a/src/java/db/migration/V20160830_1614__mantis7879.sql +++ /dev/null @@ -1,13 +0,0 @@ -declare - dup_val_on_index exception; - pragma exception_init (dup_val_on_index , -00001); -begin - execute immediate 'insert into FUNCION_SISTEMA (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) - values (FUNCION_SISTEMA_SEQ.NEXTVAL,1,''ADM > INTEGRACION'',''COM.RJCONSULTORES.ADMINISTRACION.GUI.INTEGRACION'',1,SYSDATE, -1)'; - execute immediate 'insert into FUNCION_SISTEMA (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) - values (FUNCION_SISTEMA_SEQ.NEXTVAL,1,''ADM > ANALITICO'',''COM.RJCONSULTORES.ADMINISTRACION.GUI.ANALITICO'',1,SYSDATE, -1)'; - execute immediate 'insert into FUNCION_SISTEMA (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) - values (FUNCION_SISTEMA_SEQ.NEXTVAL,1,''ADM > ANALITICO > BGM'',''COM.RJCONSULTORES.ADMINISTRACION.GUI.ANALITICO.BGM'',1,SYSDATE,-1)'; - - exception when dup_val_on_index then null; -end; \ No newline at end of file diff --git a/src/java/db/migration/V20160901_1030__classeindicepeaj.sql b/src/java/db/migration/V20160901_1030__classeindicepeaj.sql deleted file mode 100644 index 270a4880a..000000000 --- a/src/java/db/migration/V20160901_1030__classeindicepeaj.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE TABLE CLASSE_INDICE_PEAJE ( - CLASSE_INDICE_PEAJE_ID INTEGER PRIMARY KEY, - ACTIVO NUMERIC(1), - CLASSE_SERVICIO_ID INTEGER, - ORGAOCONCEDENTE_ID INTEGER, - INDICE_PEAJE INTEGER, - FOREIGN KEY (CLASSE_SERVICIO_ID) REFERENCES CLASE_SERVICIO (CLASESERVICIO_ID), - FOREIGN KEY (ORGAOCONCEDENTE_ID) REFERENCES ORGAO_CONCEDENTE (ORGAOCONCEDENTE_ID) -); - -CREATE SEQUENCE "CLASSE_INDICE_PEAJE_SEQ" MINVALUE 1 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE ; \ No newline at end of file diff --git a/src/java/db/migration/V20160913_1649__classeindicepeaje.sql b/src/java/db/migration/V20160913_1649__classeindicepeaje.sql deleted file mode 100644 index 1a269bb55..000000000 --- a/src/java/db/migration/V20160913_1649__classeindicepeaje.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM CLASSE_INDICE_PEAJE; - -ALTER TABLE CLASSE_INDICE_PEAJE -MODIFY (INDICE_PEAJE NUMERIC(7,2)); diff --git a/src/java/db/migration/V20160921_0945__mantis7982.sql b/src/java/db/migration/V20160921_0945__mantis7982.sql deleted file mode 100644 index e332b4ef6..000000000 --- a/src/java/db/migration/V20160921_0945__mantis7982.sql +++ /dev/null @@ -1 +0,0 @@ -alter table PUNTO_VENTA ADD (FECFECHAMENTO DATE, FECABERTURA DATE); \ No newline at end of file