From 378986b38580f62b9a53eec9909c73cb5736c224 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 25 Jun 2024 16:18:32 -0300 Subject: [PATCH 01/37] cadastro de grupo de contrato feat bug#AL-4276 --- pom.xml | 2 +- src/db/migration/V20240618_1450__AL-4276.sql | 17 +++++++++++ src/db/migration/V20240618_1511__AL-4276.sql | 21 +++++++++++++ src/db/migration/V20240619_1711__AL-4276.sql | 29 ++++++++++++++++++ src/db/migration/V20240624_1137__AL-4276.sql | 31 ++++++++++++++++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240618_1450__AL-4276.sql create mode 100644 src/db/migration/V20240618_1511__AL-4276.sql create mode 100644 src/db/migration/V20240619_1711__AL-4276.sql create mode 100644 src/db/migration/V20240624_1137__AL-4276.sql diff --git a/pom.xml b/pom.xml index 768a882e5..643d2dc97 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.48.0 + 1.49.0 diff --git a/src/db/migration/V20240618_1450__AL-4276.sql b/src/db/migration/V20240618_1450__AL-4276.sql new file mode 100644 index 000000000..dcd83d7a6 --- /dev/null +++ b/src/db/migration/V20240618_1450__AL-4276.sql @@ -0,0 +1,17 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'INSERT INTO funcion_sistema (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + VALUES + (funcion_sistema_seq.NEXTVAL, 1, ''ADM > CONFIGURAÇÃO COMERCIAL >> NEGOCIOS CORPORATIVOS >> GRUPO DE CONTRATO'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MENU.GRUPOCONTRATO'', 1, SYSDATE, 1)'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; diff --git a/src/db/migration/V20240618_1511__AL-4276.sql b/src/db/migration/V20240618_1511__AL-4276.sql new file mode 100644 index 000000000..38c5a0d8a --- /dev/null +++ b/src/db/migration/V20240618_1511__AL-4276.sql @@ -0,0 +1,21 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE GRUPO_CONTRATO ( + "GRUPOCONTRATO_ID" NUMBER(7,0) PRIMARY KEY, + "NOMEGRUPOCONTRATO" VARCHAR2(255) NULL, + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "GRUPO_CONTRATO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; \ No newline at end of file diff --git a/src/db/migration/V20240619_1711__AL-4276.sql b/src/db/migration/V20240619_1711__AL-4276.sql new file mode 100644 index 000000000..a4808ad51 --- /dev/null +++ b/src/db/migration/V20240619_1711__AL-4276.sql @@ -0,0 +1,29 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE TARIFA_GRUPO_CONTRATO ( + "TARIFAGRUPOCONTRATO_ID" NUMBER(7,0) PRIMARY KEY, + "GRUPOCONTRATO_ID" NUMBER(7,0), + "ORIGEN_ID" NUMBER(7,0), + "DESTINO_ID" NUMBER(7,0), + "CLASESERVICIO_ID" NUMBER(7,0), + "TARIFA" NUMBER(10, 2), + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE, + CONSTRAINT "fk_grupo_contrato" FOREIGN KEY ("GRUPOCONTRATO_ID") REFERENCES "GRUPO_CONTRATO"("GRUPOCONTRATO_ID"), + CONSTRAINT "fk_parada_origen" FOREIGN KEY ("ORIGEN_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_parada_destino" FOREIGN KEY ("DESTINO_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_clase_servicio" FOREIGN KEY ("CLASESERVICIO_ID") REFERENCES "CLASE_SERVICIO"("CLASESERVICIO_ID") + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "TARIFA_GRUPO_CONTRATO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; \ No newline at end of file diff --git a/src/db/migration/V20240624_1137__AL-4276.sql b/src/db/migration/V20240624_1137__AL-4276.sql new file mode 100644 index 000000000..ab097405e --- /dev/null +++ b/src/db/migration/V20240624_1137__AL-4276.sql @@ -0,0 +1,31 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE EXCECAO_GRUPO_CONTRATO ( + "EXCECAOGRUPOCONTRATO_ID" NUMBER(7,0) PRIMARY KEY, + "GRUPOCONTRATO_ID" NUMBER(7,0), + "DATA_INICIAL" DATE, + "DATA_FINAL" DATE, + "ORIGEN_ID" NUMBER(7,0), + "DESTINO_ID" NUMBER(7,0), + "CLASESERVICIO_ID" NUMBER(7,0), + "TARIFA" NUMBER(10, 2), + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE, + CONSTRAINT "fk_grupo_contrato_excecao" FOREIGN KEY ("GRUPOCONTRATO_ID") REFERENCES "GRUPO_CONTRATO"("GRUPOCONTRATO_ID"), + CONSTRAINT "fk_parada_origen_excecao" FOREIGN KEY ("ORIGEN_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_parada_destino_excecao" FOREIGN KEY ("DESTINO_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_clase_servicio_excecao" FOREIGN KEY ("CLASESERVICIO_ID") REFERENCES "CLASE_SERVICIO"("CLASESERVICIO_ID") + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "EXCECAO_GRUPO_CONTRATO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; \ No newline at end of file From 7f0d302a93cb85383386f71bcfcc8d9c0f7527e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Wed, 26 Jun 2024 10:53:27 -0300 Subject: [PATCH 02/37] bug#AL-4133 --- pom.xml | 2 +- src/db/migration/V20240626_0944__AL-4133.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240626_0944__AL-4133.sql diff --git a/pom.xml b/pom.xml index 643d2dc97..a4e2038ed 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.49.0 + 1.50.0 diff --git a/src/db/migration/V20240626_0944__AL-4133.sql b/src/db/migration/V20240626_0944__AL-4133.sql new file mode 100644 index 000000000..76a778afd --- /dev/null +++ b/src/db/migration/V20240626_0944__AL-4133.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE empresa ADD INDBILHETEDEVPIXDINHEIRO NUMBER(1,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file From a9fb69dd837dce7b16a96903748121b9f9bc52bd Mon Sep 17 00:00:00 2001 From: Wilian Domingues Date: Wed, 26 Jun 2024 18:19:07 -0300 Subject: [PATCH 03/37] =?UTF-8?q?AL-4468=20-=20Inclus=C3=A3o=20de=20consta?= =?UTF-8?q?nte=20para=20desativar=20obrigatoriedade=20dos=20campos=20de=20?= =?UTF-8?q?imposto=20no=20cadastro=20empresa/imposto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/db/migration/V20240626_1647__AL-4468.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240626_1647__AL-4468.sql diff --git a/pom.xml b/pom.xml index a4e2038ed..9f68af1f5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.50.0 + 1.51.0 diff --git a/src/db/migration/V20240626_1647__AL-4468.sql b/src/db/migration/V20240626_1647__AL-4468.sql new file mode 100644 index 000000000..0f69f4a76 --- /dev/null +++ b/src/db/migration/V20240626_1647__AL-4468.sql @@ -0,0 +1,15 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'Insert into CONSTANTE (CONSTANTE_ID,NOMBCONSTANTE,DESCCONSTANTE,INDTIPOCONSTANTE, + VALORCONSTANTE,INDMANTENIMIENTOUSUARIO,ACTIVO,FECMODIF,USUARIO_ID) + values (CONSTANTE_SEQ.NEXTVAL,''DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO'',''DESATIVAR_OBR_CAM_EMPRESA_IMPOSTO'', + null,''false'',null,''1'',sysdate,''1'')'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; \ No newline at end of file From 23b75b0a227e850c52ffdced3b7fe94e9ae95fe3 Mon Sep 17 00:00:00 2001 From: Leonardo Oliveira Date: Thu, 27 Jun 2024 12:11:51 -0300 Subject: [PATCH 04/37] Adicionada constante no banco --- src/db/migration/V20240614_1757__AL-4281.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/db/migration/V20240614_1757__AL-4281.sql diff --git a/src/db/migration/V20240614_1757__AL-4281.sql b/src/db/migration/V20240614_1757__AL-4281.sql new file mode 100644 index 000000000..8a5ef9888 --- /dev/null +++ b/src/db/migration/V20240614_1757__AL-4281.sql @@ -0,0 +1,15 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'Insert into CONSTANTE (CONSTANTE_ID,NOMBCONSTANTE,DESCCONSTANTE,INDTIPOCONSTANTE, + VALORCONSTANTE,INDMANTENIMIENTOUSUARIO,ACTIVO,FECMODIF,USUARIO_ID) + values (CONSTANTE_SEQ.NEXTVAL,''NUM_ASIENTO_CON_LETRA'',''NUM_ASIENTO_CON_LETRA'', + null,0,null,''1'',sysdate,''1'')'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; \ No newline at end of file From ee696c8a6e2d2e932fee64ab7a9f8df4359873c9 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 27 Jun 2024 19:25:41 -0300 Subject: [PATCH 05/37] AL-4280 --- src/db/migration/V20240627_1922__AL-4280.sql | 117 +++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 src/db/migration/V20240627_1922__AL-4280.sql diff --git a/src/db/migration/V20240627_1922__AL-4280.sql b/src/db/migration/V20240627_1922__AL-4280.sql new file mode 100644 index 000000000..9120c7601 --- /dev/null +++ b/src/db/migration/V20240627_1922__AL-4280.sql @@ -0,0 +1,117 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate + 'CREATE SEQUENCE ASISTVIAJE_EMPRESA_SEQ MINVALUE 1 MAXVALUE 9999999 INCREMENT BY 1 START WITH 1 NOCACHE ORDER CYCLE'; + exception when object_exists then null; +end; +/ +declare + table_exists exception; + pragma exception_init (table_exists , -00955); +begin + execute immediate + 'CREATE TABLE ASISTVIAJE_EMPRESA ( + ASISTVIAJEEMPRESA_ID NUMBER(7,0) NOT NULL ENABLE, + EMPRESA_ID NUMBER(7,0), + TARIFA NUMBER(10,2), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + USUARIO_ID NUMBER(7,0), + PRIMARY KEY (ASISTVIAJEEMPRESA_ID), + FOREIGN KEY (EMPRESA_ID) + REFERENCES EMPRESA (EMPRESA_ID) ENABLE + ) '; + + exception when table_exists then null; +end; +/ +declare + column_exists exception; + pragma exception_init (column_exists , -01430); +begin + execute immediate 'ALTER TABLE PTOVTA_SEGURO ADD INDVENDASISTVIAJE NUMBER (1,0)'; + exception when column_exists then null; +end; +/ +declare + column_exists exception; + pragma exception_init (column_exists , -01430); +begin + execute immediate 'ALTER TABLE PTOVTA_SEGURO ADD INDESTANASISTVIAJE NUMBER (1,0)'; + exception when column_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate + 'CREATE TABLE IMPRESION_LAYOUT_CONFIG ( + IMPRESIONLAYOUTCONFIG_ID NUMBER(7, 0) NOT NULL , + DESCRICAO VARCHAR2(100 BYTE), + TEXTO CLOB , + LINGUAGEM NUMBER(5,0), + ACTIVO NUMBER(1,0) , + FECMODIF DATE, + USUARIO_ID NUMBER(7,0) + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate + 'CREATE SEQUENCE IMPRESION_LAYOUT_CONFIG_SEQ MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ + + +declare + column_exists exception; + pragma exception_init (column_exists , -01430); +begin + execute immediate 'ALTER TABLE TIPO_EVENTO_EXTRA ADD (IMPRESIONLAYOUTCONFIG_ID NUMBER(7) )'; + exception when column_exists then null; +end; +/ + + + +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'insert into FUNCION_SISTEMA (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + values + (FUNCION_SISTEMA_SEQ.NEXTVAL,''1'',''ADM > CATALOGOS > LAYOUT COMPROVANTE'',''COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGOS.IMPRESIONLAYOUTCONFIG'',''1'',SYSDATE,''1'')'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; +/ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'insert into FUNCION_SISTEMA (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + values + (FUNCION_SISTEMA_SEQ.NEXTVAL,''1'',''ADM > ADM DE PRECO > ASSISTENTE VIAJE'',''COM.RJCONSULTORES.ADMINISTRACION.GUI.TARIFAS.MENU.ASISTENCIADEVIAGEMEMPRESA'',''1'',SYSDATE,''1'')'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; From 6d13c478d5098cd0d6acadc2fbca9c1386059328 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 27 Jun 2024 19:28:24 -0300 Subject: [PATCH 06/37] AL-4280 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f68af1f5..aa8e76b14 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.51.0 + 1.52.0 From 7bbbec0120192e0c3f2d682ac9e5a97029c0c4ca Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 27 Jun 2024 19:49:40 -0300 Subject: [PATCH 07/37] =?UTF-8?q?Aba=20de=20tarifas=20n=C3=A3o=20cobertas?= =?UTF-8?q?=20no=20grupo=20de=20contrato=20feat=20bug#AL-4543?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- ..._AL-4275.sql => V20240626_0912__AL-4276.sql} | 12 +++++++----- src/db/migration/V20240626_1002__AL-4276.sql | 17 +++++++++++++++++ ..._AL-4276.sql => V20240627_1007__AL-4543.sql} | 1 + 4 files changed, 26 insertions(+), 6 deletions(-) rename src/db/migration/{V20240611_0912__AL-4275.sql => V20240626_0912__AL-4276.sql} (67%) create mode 100644 src/db/migration/V20240626_1002__AL-4276.sql rename src/db/migration/{V20240619_1711__AL-4276.sql => V20240627_1007__AL-4543.sql} (97%) diff --git a/pom.xml b/pom.xml index aa8e76b14..3e6f43413 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.52.0 + 1.53.0 diff --git a/src/db/migration/V20240611_0912__AL-4275.sql b/src/db/migration/V20240626_0912__AL-4276.sql similarity index 67% rename from src/db/migration/V20240611_0912__AL-4275.sql rename to src/db/migration/V20240626_0912__AL-4276.sql index d559c409a..b43a25dcc 100644 --- a/src/db/migration/V20240611_0912__AL-4275.sql +++ b/src/db/migration/V20240626_0912__AL-4276.sql @@ -5,6 +5,7 @@ begin execute immediate 'CREATE TABLE CONTRATO_CORPORATIVO ( "CONTRATO_ID" NUMBER(7) PRIMARY KEY, "CLIENTECORPORATIVO_ID" NUMBER(7), + "GRUPOCONTRATO_ID" NUMBER(7), "NUMCONTRATO" VARCHAR2(15), "DATA_INICIO" DATE, "DATA_FIM" DATE, @@ -34,11 +35,12 @@ begin "USUARIO_ID" NUMBER(7,0), "ACTIVO" NUMBER(1,0), "FECMODIF" DATE , - FOREIGN KEY ("PUNTOVENTA_ID") REFERENCES PUNTO_VENTA("PUNTOVENTA_ID"), - FOREIGN KEY ("CIUDAD_ID") REFERENCES CIUDAD("CIUDAD_ID"), - FOREIGN KEY ("CLIENTECORPORATIVO_ID") REFERENCES CLIENTE_CORPORATIVO("CLIENTECORPORATIVO_ID"), - FOREIGN KEY ("USUARIO_ID") REFERENCES USUARIO("USUARIO_ID"), - FOREIGN KEY ("USUARIOREP_ID") REFERENCES USUARIO("USUARIO_ID") + CONSTRAINT "fk_contrato_punto_venta" FOREIGN KEY ("PUNTOVENTA_ID") REFERENCES PUNTO_VENTA("PUNTOVENTA_ID"), + CONSTRAINT "fk_contrato_ciudad" FOREIGN KEY ("CIUDAD_ID") REFERENCES CIUDAD("CIUDAD_ID"), + CONSTRAINT "fk_contrato_cliente_corporativo" FOREIGN KEY ("CLIENTECORPORATIVO_ID") REFERENCES CLIENTE_CORPORATIVO("CLIENTECORPORATIVO_ID"), + CONSTRAINT "fk_contrato_grupo_contrato" FOREIGN KEY ("GRUPOCONTRATO_ID") REFERENCES GRUPO_CONTRATO("GRUPOCONTRATO_ID"), + CONSTRAINT "fk_contrato_usuario" FOREIGN KEY ("USUARIO_ID") REFERENCES USUARIO("USUARIO_ID"), + CONSTRAINT "fk_contrato_representante" FOREIGN KEY ("USUARIOREP_ID") REFERENCES USUARIO("USUARIO_ID") )'; exception when object_exists then null; end; diff --git a/src/db/migration/V20240626_1002__AL-4276.sql b/src/db/migration/V20240626_1002__AL-4276.sql new file mode 100644 index 000000000..41e8a52ef --- /dev/null +++ b/src/db/migration/V20240626_1002__AL-4276.sql @@ -0,0 +1,17 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'INSERT INTO funcion_sistema (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + VALUES + (funcion_sistema_seq.NEXTVAL, 1, ''ADM > CONFIGURAÇÃO COMERCIAL >> NEGOCIOS CORPORATIVOS >> CONTRATO'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MENU.CONTRATO'', 1, SYSDATE, 1)'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; diff --git a/src/db/migration/V20240619_1711__AL-4276.sql b/src/db/migration/V20240627_1007__AL-4543.sql similarity index 97% rename from src/db/migration/V20240619_1711__AL-4276.sql rename to src/db/migration/V20240627_1007__AL-4543.sql index a4808ad51..318e239b0 100644 --- a/src/db/migration/V20240619_1711__AL-4276.sql +++ b/src/db/migration/V20240627_1007__AL-4543.sql @@ -10,6 +10,7 @@ begin "CLASESERVICIO_ID" NUMBER(7,0), "TARIFA" NUMBER(10, 2), "USUARIO_ID" NUMBER(7,0), + "INDCOBERTURA" NUMBER(1,0), "ACTIVO" NUMBER(1,0), "FECMODIF" DATE, CONSTRAINT "fk_grupo_contrato" FOREIGN KEY ("GRUPOCONTRATO_ID") REFERENCES "GRUPO_CONTRATO"("GRUPOCONTRATO_ID"), From ebe507628fef16f8023147cd9b8aa1dac26cdd27 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Fri, 28 Jun 2024 15:34:19 -0300 Subject: [PATCH 08/37] fixes bug#AL-4204 --- pom.xml | 2 +- src/db/migration/V20240627_0810__AL-4204.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240627_0810__AL-4204.sql diff --git a/pom.xml b/pom.xml index 3e6f43413..e0205feb2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.53.0 + 1.54.0 diff --git a/src/db/migration/V20240627_0810__AL-4204.sql b/src/db/migration/V20240627_0810__AL-4204.sql new file mode 100644 index 000000000..72ffeb9e0 --- /dev/null +++ b/src/db/migration/V20240627_0810__AL-4204.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CATEGORIA_DESCUENTO ADD TIPOIDENTIFICACIONDOC1 NUMBER(5,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file From c6e60b41a5d73a232ec8375b6f118489db90a88e Mon Sep 17 00:00:00 2001 From: valdevir Date: Sat, 29 Jun 2024 15:36:10 -0300 Subject: [PATCH 09/37] fixes bug #AL-4348 --- pom.xml | 164 +++++++++---------- src/db/migration/V20240515_1031__AL-4355.sql | 15 ++ src/db/migration/V20240629_0944__AL-4348.sql | 15 ++ 3 files changed, 112 insertions(+), 82 deletions(-) create mode 100644 src/db/migration/V20240515_1031__AL-4355.sql create mode 100644 src/db/migration/V20240629_0944__AL-4348.sql diff --git a/pom.xml b/pom.xml index e0205feb2..03b9e74b3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,83 +1,83 @@ - - 4.0.0 - br.com.rjconsultores - Flyway - 1.54.0 - - - - rj-releases - http://52.5.53.15:8081/nexus/content/repositories/releases/ - - - - - UTF-8 - UTF-8 - - - - src - - - - ${basedir}/src - - *.* - db/** - - - - - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.flywaydb - flyway-maven-plugin - 3.2.1 - - true - - - - ${project.artifactId} - - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.flywaydb - flyway-core - 4.2.0 - - - - javax.servlet - javax.servlet-api - 4.0.0 - provided - - - - com.oracle.database.jdbc - ojdbc8 - 21.7.0.0 - - - - + + 4.0.0 + br.com.rjconsultores + Flyway + 1.55.0 + + + + rj-releases + http://52.5.53.15:8081/nexus/content/repositories/releases/ + + + + + UTF-8 + UTF-8 + + + + src + + + + ${basedir}/src + + *.* + db/** + + + + + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + org.flywaydb + flyway-maven-plugin + 3.2.1 + + true + + + + ${project.artifactId} + + + + + org.apache.logging.log4j + log4j-core + 2.17.1 + + + + org.flywaydb + flyway-core + 4.2.0 + + + + javax.servlet + javax.servlet-api + 4.0.0 + provided + + + + com.oracle.database.jdbc + ojdbc8 + 21.7.0.0 + + + + \ No newline at end of file diff --git a/src/db/migration/V20240515_1031__AL-4355.sql b/src/db/migration/V20240515_1031__AL-4355.sql new file mode 100644 index 000000000..2ea499b6d --- /dev/null +++ b/src/db/migration/V20240515_1031__AL-4355.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CAJA_TARJETA MODIFY (TX_ID VARCHAR2(60))'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file diff --git a/src/db/migration/V20240629_0944__AL-4348.sql b/src/db/migration/V20240629_0944__AL-4348.sql new file mode 100644 index 000000000..3efd4c04e --- /dev/null +++ b/src/db/migration/V20240629_0944__AL-4348.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE empresa ADD INDCALCGRATUISOBREDESCTOTAIS NUMBER(1,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file From 3aedfea395b29794ae72552547b5ed28682f96e0 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 2 Jul 2024 13:57:24 -0300 Subject: [PATCH 10/37] Cadastro de contratos corporativos feat bug#AL-4276 --- pom.xml | 2 +- ...L-4276.sql => V20240628_1722__AL-4276.sql} | 20 ++++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) rename src/db/migration/{V20240626_0912__AL-4276.sql => V20240628_1722__AL-4276.sql} (77%) diff --git a/pom.xml b/pom.xml index 03b9e74b3..6b81dfe4c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.55.0 + 1.56.0 diff --git a/src/db/migration/V20240626_0912__AL-4276.sql b/src/db/migration/V20240628_1722__AL-4276.sql similarity index 77% rename from src/db/migration/V20240626_0912__AL-4276.sql rename to src/db/migration/V20240628_1722__AL-4276.sql index b43a25dcc..e80a471b6 100644 --- a/src/db/migration/V20240626_0912__AL-4276.sql +++ b/src/db/migration/V20240628_1722__AL-4276.sql @@ -7,27 +7,20 @@ begin "CLIENTECORPORATIVO_ID" NUMBER(7), "GRUPOCONTRATO_ID" NUMBER(7), "NUMCONTRATO" VARCHAR2(15), - "DATA_INICIO" DATE, - "DATA_FIM" DATE, - "VALOR_CONTRATO" NUMBER(10, 2), + "DATA_INICIAL" DATE, + "DATA_FINAL" DATE, + "VALOR_CONTRATO" NUMBER(15, 2), "PERCENTUAL_BONUS" NUMBER(5, 2), "USUARIOREP_ID" NUMBER(7), "TIPO_CALCULO" NUMBER(7), "TIPO_TARIFA" NUMBER(7), "TIPO_CONTRATO" NUMBER(7), - "PUNTOVENTA_ID" NUMBER(7), - "CIUDAD_ID" NUMBER(7), - "LOGRADOURO" VARCHAR2(100), - "NUMERO" VARCHAR2(20), - "COMPLEMENTO" VARCHAR2(100), - "BAIRRO" VARCHAR2(50), - "CEP" VARCHAR2(20), - "TELEFONE" VARCHAR2(20), - "EMAIL" VARCHAR2(150), + "PUNTOVENTA_ID" NUMBER(7), "OBSERVACAO" VARCHAR2(255), "DIVISAO" VARCHAR2(255), "STATUS_CONTRATO" NUMBER(7), "DESCONTO_FATURA" NUMBER(10, 2), + "IND_BILHETES_ABERTOS" NUMBER(1), "IND_BILHETES_CONFIRMADOS" NUMBER(1), "IND_RESERVA_BILHETE" NUMBER(1), "IND_MANIPULA_BONUS" NUMBER(1), @@ -35,8 +28,7 @@ begin "USUARIO_ID" NUMBER(7,0), "ACTIVO" NUMBER(1,0), "FECMODIF" DATE , - CONSTRAINT "fk_contrato_punto_venta" FOREIGN KEY ("PUNTOVENTA_ID") REFERENCES PUNTO_VENTA("PUNTOVENTA_ID"), - CONSTRAINT "fk_contrato_ciudad" FOREIGN KEY ("CIUDAD_ID") REFERENCES CIUDAD("CIUDAD_ID"), + CONSTRAINT "fk_contrato_punto_venta" FOREIGN KEY ("PUNTOVENTA_ID") REFERENCES PUNTO_VENTA("PUNTOVENTA_ID"), CONSTRAINT "fk_contrato_cliente_corporativo" FOREIGN KEY ("CLIENTECORPORATIVO_ID") REFERENCES CLIENTE_CORPORATIVO("CLIENTECORPORATIVO_ID"), CONSTRAINT "fk_contrato_grupo_contrato" FOREIGN KEY ("GRUPOCONTRATO_ID") REFERENCES GRUPO_CONTRATO("GRUPOCONTRATO_ID"), CONSTRAINT "fk_contrato_usuario" FOREIGN KEY ("USUARIO_ID") REFERENCES USUARIO("USUARIO_ID"), From 8e10a3ff25cd06bf09a11f4fc10e1edee940b94c Mon Sep 17 00:00:00 2001 From: pinheiro Date: Wed, 3 Jul 2024 19:19:24 +0000 Subject: [PATCH 11/37] Atualizar pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60ebdf1d2..aedfe23f1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.47.1 + 1.57.0 From 17d8e1b5a5682ad0e65c75ada475c11157805cae Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 3 Jul 2024 18:27:44 -0300 Subject: [PATCH 12/37] Usuario representante do contrato feat bug#AL-4278 --- pom.xml | 2 +- src/db/migration/V20240702_1820__AL-4278.sql | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240702_1820__AL-4278.sql diff --git a/pom.xml b/pom.xml index aedfe23f1..fc3ee69c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.57.0 + 1.58.0 diff --git a/src/db/migration/V20240702_1820__AL-4278.sql b/src/db/migration/V20240702_1820__AL-4278.sql new file mode 100644 index 000000000..914634bb5 --- /dev/null +++ b/src/db/migration/V20240702_1820__AL-4278.sql @@ -0,0 +1,13 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'Insert into PERFIL (PERFIL_ID,DESCPERFIL,ACTIVO,FECMODIF,USUARIO_ID,INDJERARQUIA) + values (''32'',''ADM CONTRATO'',''1'',sysdate,''1'',''0'')'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; \ No newline at end of file From ca93c9576fb676650d173eaec030578664bf2157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Thu, 4 Jul 2024 12:49:44 -0300 Subject: [PATCH 13/37] fixes bug#AL-4091 --- pom.xml | 2 +- src/db/migration/V20240704_1016__AL-4091.sql | 161 +++++++++++++++++++ 2 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240704_1016__AL-4091.sql diff --git a/pom.xml b/pom.xml index fc3ee69c7..882cd7048 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.58.0 + 1.59.0 diff --git a/src/db/migration/V20240704_1016__AL-4091.sql b/src/db/migration/V20240704_1016__AL-4091.sql new file mode 100644 index 000000000..eca446522 --- /dev/null +++ b/src/db/migration/V20240704_1016__AL-4091.sql @@ -0,0 +1,161 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONVENIO ADD TERMOECONDICAO VARCHAR2(100 BYTE)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONVENIO ADD MENSAGEMGANHADOR VARCHAR2(100 BYTE)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONVENIO ADD VLREMITIRCUPOM NUMBER(7, 0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ + +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONVENIO ADD ISCUPOMALEATORIO NUMBER(1, 0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ + +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONVENIO ADD QTDDIGITOSCUPOM NUMBER(3, 0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ + +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONVENIO ADD CODIGOCUPOM VARCHAR2(40 BYTE)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CONVENIOCAMPANHA_PTOVTA ( + CONVENIOCAMPANHAPTOVTA_ID NUMBER(7,0) NOT NULL ENABLE, + CONVENIO_ID NUMBER(7,0), + PUNTOVENTA_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + USUARIO_ID NUMBER(7,0), + PRIMARY KEY (CONVENIOCAMPANHAPTOVTA_ID), + FOREIGN KEY (PUNTOVENTA_ID) + REFERENCES PUNTO_VENTA (PUNTOVENTA_ID) ENABLE, + FOREIGN KEY (CONVENIO_ID) + REFERENCES CONVENIO (CONVENIO_ID) ENABLE )'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE CONVENIOCAMPANHA_PTOVTA_SEQ INCREMENT BY 1 START WITH 1 NOCACHE ORDER NOCYCLE'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CONVENIOCAMPANHA_EMPRESA ( + CONVENIOCAMPANHAEMPRESA_ID NUMBER(7,0) NOT NULL ENABLE, + CONVENIO_ID NUMBER(7,0), + EMPRESA_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + USUARIO_ID NUMBER(7,0), + PRIMARY KEY (CONVENIOCAMPANHAEMPRESA_ID), + FOREIGN KEY (EMPRESA_ID) + REFERENCES EMPRESA (EMPRESA_ID) ENABLE, + FOREIGN KEY (CONVENIO_ID) + REFERENCES CONVENIO (CONVENIO_ID) ENABLE)'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE CONVENIOCAMPANHA_EMPRESA_SEQ INCREMENT BY 1 START WITH 1 NOCACHE ORDER NOCYCLE'; + exception when object_exists then null; +end; + + + + + + From 76d6bd94e4dc0440e89b527f7959e8d66955c73f Mon Sep 17 00:00:00 2001 From: Fabio Date: Fri, 5 Jul 2024 17:59:19 -0300 Subject: [PATCH 14/37] cadastro de transportadora feat bug#AL-4277 --- pom.xml | 2 +- src/db/migration/V20240704_0837__AL-4277.sql | 27 ++++++++++++++++++++ src/db/migration/V20240704_0842__AL-4277.sql | 17 ++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240704_0837__AL-4277.sql create mode 100644 src/db/migration/V20240704_0842__AL-4277.sql diff --git a/pom.xml b/pom.xml index 882cd7048..d390c88af 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.59.0 + 1.60.0 diff --git a/src/db/migration/V20240704_0837__AL-4277.sql b/src/db/migration/V20240704_0837__AL-4277.sql new file mode 100644 index 000000000..ab50cd935 --- /dev/null +++ b/src/db/migration/V20240704_0837__AL-4277.sql @@ -0,0 +1,27 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE TRANSPORTADORA ( + "TRANSPORTADORA_ID" NUMBER(7,0) PRIMARY KEY, + "NIT" VARCHAR2(20), + "NOME_TRANSPORTADORA" VARCHAR2(150), + "CLASSE_PAGAMENTO" NUMBER(7,0), + "FORMA_PAGAMENTO" NUMBER(7,0), + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE, + CONSTRAINT "fk_usuario_transportadora" FOREIGN KEY ("USUARIO_ID") REFERENCES "USUARIO"("USUARIO_ID") + )'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "TRANSPORTADORA_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240704_0842__AL-4277.sql b/src/db/migration/V20240704_0842__AL-4277.sql new file mode 100644 index 000000000..0b2fc0e03 --- /dev/null +++ b/src/db/migration/V20240704_0842__AL-4277.sql @@ -0,0 +1,17 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'INSERT INTO funcion_sistema (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + VALUES + (funcion_sistema_seq.NEXTVAL, 1, ''ADM > CONFIGURAÇÃO COMERCIAL >> NEGOCIOS CORPORATIVOS >> EMPRESA TRANSPORTADORA'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MENU.TRANSPORTADORA'', 1, SYSDATE, 1)'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; From ceebe82501637122d9c73b38d67553e3a73228f2 Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 8 Jul 2024 22:25:27 -0300 Subject: [PATCH 15/37] AL-4273 nova tela comprovante de passagem --- pom.xml | 2 +- src/db/migration/V20240708_1937__AL-4273.sql | 27 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240708_1937__AL-4273.sql diff --git a/pom.xml b/pom.xml index d390c88af..c74166c41 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.60.0 + 1.61.0 diff --git a/src/db/migration/V20240708_1937__AL-4273.sql b/src/db/migration/V20240708_1937__AL-4273.sql new file mode 100644 index 000000000..5338f67c7 --- /dev/null +++ b/src/db/migration/V20240708_1937__AL-4273.sql @@ -0,0 +1,27 @@ +declare + table_exists exception; + pragma exception_init (table_exists , -00955); +begin + execute immediate + 'CREATE TABLE EMPRESA_COMPPASSAGEM_CONFIG ( + EMPRESACOMPPASSAGEMCONFIG_ID NUMBER(7) NOT NULL, + EMPRESA_ID NUMBER(7,0), + CHAVE VARCHAR2(100) NULL, + VALOR VARCHAR2(150) NULL, + ACTIVO NUMBER(1), + FECMODIF DATE, + USUARIO_ID NUMBER(7), + PRIMARY KEY ( EMPRESACOMPPASSAGEMCONFIG_ID ) + )'; + + exception when table_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "EMPRESA_COMPPASSAG_CONFIG_SEQ" INCREMENT BY 1 START WITH 1 NOCACHE ORDER NOCYCLE'; + exception when object_exists then null; +end; +/ \ No newline at end of file From 237f601e5c4671e99cc3f27db6aa3037fe71e341 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 11 Jul 2024 14:37:23 -0300 Subject: [PATCH 16/37] =?UTF-8?q?Atualiza=C3=A7ao=20da=20lista=20de=20igno?= =?UTF-8?q?rados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 8eb2db3a4..d052193ef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,9 @@ /.project /.settings /target +/settings.xml +/dist /.factorypath +/*.BASE.xml +/*.LOCAL.xml +/*.REMOTE.xml From 1e24bf145809d784b9f4b40ae07798dee98c76f5 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 11 Jul 2024 14:50:15 -0300 Subject: [PATCH 17/37] Cadastro de convenio transportadora bug#AL-4246 --- pom.xml | 2 +- src/db/migration/V20240704_0837__AL-4277.sql | 2 +- src/db/migration/V20240708_1537__AL-4346.sql | 31 +++++++++++++++++++ src/db/migration/V20240710_1052__AL-4343.sql | 24 +++++++++++++++ src/db/migration/V20240710_1053__AL-4343.sql | 32 ++++++++++++++++++++ src/db/migration/V20240710_1907__AL-4346.sql | 27 +++++++++++++++++ 6 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 src/db/migration/V20240708_1537__AL-4346.sql create mode 100644 src/db/migration/V20240710_1052__AL-4343.sql create mode 100644 src/db/migration/V20240710_1053__AL-4343.sql create mode 100644 src/db/migration/V20240710_1907__AL-4346.sql diff --git a/pom.xml b/pom.xml index c74166c41..b564832ac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.61.0 + 1.62.0 diff --git a/src/db/migration/V20240704_0837__AL-4277.sql b/src/db/migration/V20240704_0837__AL-4277.sql index ab50cd935..1812fa8cb 100644 --- a/src/db/migration/V20240704_0837__AL-4277.sql +++ b/src/db/migration/V20240704_0837__AL-4277.sql @@ -7,7 +7,7 @@ begin "NIT" VARCHAR2(20), "NOME_TRANSPORTADORA" VARCHAR2(150), "CLASSE_PAGAMENTO" NUMBER(7,0), - "FORMA_PAGAMENTO" NUMBER(7,0), + "EMAIL" VARCHAR2(150) NULL, "USUARIO_ID" NUMBER(7,0), "ACTIVO" NUMBER(1,0), "FECMODIF" DATE, diff --git a/src/db/migration/V20240708_1537__AL-4346.sql b/src/db/migration/V20240708_1537__AL-4346.sql new file mode 100644 index 000000000..a7c52af92 --- /dev/null +++ b/src/db/migration/V20240708_1537__AL-4346.sql @@ -0,0 +1,31 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CONVENIO_TRANSPORT ( + CONVENIOTRANSPORTADORA_ID NUMBER(7,0) PRIMARY KEY, + TRANSPORTADORA_ID NUMBER(7,0), + NOME_CONVENIO VARCHAR2(150), + NUMCONVENIO VARCHAR2(50), + VALOR NUMBER(15,2), + TIPO_CONVENIO NUMBER(7,0), + DATA_INICIAL DATE, + DATA_FINAL DATE, + USUARIO_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + CONSTRAINT fk_transportadora_convenio FOREIGN KEY (TRANSPORTADORA_ID) REFERENCES TRANSPORTADORA(TRANSPORTADORA_ID), + CONSTRAINT fk_usuario_convenio_transportadora FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) + )'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "CONVENIO_TRANSPORTADORA_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240710_1052__AL-4343.sql b/src/db/migration/V20240710_1052__AL-4343.sql new file mode 100644 index 000000000..30c1c8f91 --- /dev/null +++ b/src/db/migration/V20240710_1052__AL-4343.sql @@ -0,0 +1,24 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE TIPO_LANCAMENTO_CAIXA ( + TIPO_LANCAMENTO_ID NUMBER(7,0) PRIMARY KEY, + NOME_LANCAMENTO VARCHAR2(255), + INDACRESCIMO NUMBER(1,0), + ACTIVO NUMBER(1,0), + USUARIO_ID NUMBER(7,0), + FECMODIF DATE, + CONSTRAINT fk_usuario_tipo_lancamento FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "TIPO_LANCAMENTO_CAIXA_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240710_1053__AL-4343.sql b/src/db/migration/V20240710_1053__AL-4343.sql new file mode 100644 index 000000000..3356d57b1 --- /dev/null +++ b/src/db/migration/V20240710_1053__AL-4343.sql @@ -0,0 +1,32 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CAIXA_CONTRATO ( + CAIXACONTRATO_ID NUMBER(7,0) PRIMARY KEY, + CONTRATO_ID NUMBER(7,0), + DATA_LANCAMENTO DATE, + VALOR NUMBER(15,2), + CAJA_ID NUMBER(7,0), + EVENTOEXTRA_ID NUMBER(7,0), + USUARIO_ID NUMBER(7,0), + TIPO_LANCAMENTO_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + CONSTRAINT fk_contrato_caixa_contrato FOREIGN KEY (CONTRATO_ID) REFERENCES CONTRATO_CORPORATIVO(CONTRATO_ID), + CONSTRAINT fk_caja_caixa_contrato FOREIGN KEY (CAJA_ID) REFERENCES CAJA(CAJA_ID), + CONSTRAINT fk_eventoextra_caixa_contrato FOREIGN KEY (EVENTOEXTRA_ID) REFERENCES EVENTO_EXTRA(EVENTOEXTRA_ID), + CONSTRAINT fk_usuario_caixa_contrato FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID), + CONSTRAINT fk_tipo_lancamento_caixa_contrato FOREIGN KEY (TIPO_LANCAMENTO_ID) REFERENCES TIPO_LANCAMENTO_CAIXA(TIPO_LANCAMENTO_ID) + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "CAIXA_CONTRATO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240710_1907__AL-4346.sql b/src/db/migration/V20240710_1907__AL-4346.sql new file mode 100644 index 000000000..04e554507 --- /dev/null +++ b/src/db/migration/V20240710_1907__AL-4346.sql @@ -0,0 +1,27 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE TARIFA_CONVENIO_TRANSP ( + "TARIFACONVENIO_ID" NUMBER(7,0) PRIMARY KEY, + "CONVENIOTRANSPORTADORA_ID" NUMBER(7,0), + "ORIGEN_ID" NUMBER(7,0), + "DESTINO_ID" NUMBER(7,0), + "TARIFA" NUMBER(10, 2), + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE, + CONSTRAINT "fk_grupo_contrato" FOREIGN KEY ("CONVENIOTRANSPORTADORA_ID") REFERENCES "CONVENIO_TRANSPORTADORA"("CONVENIOTRANSPORTADORA_ID"), + CONSTRAINT "fk_parada_origen" FOREIGN KEY ("ORIGEN_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_parada_destino" FOREIGN KEY ("DESTINO_ID") REFERENCES "PARADA"("PARADA_ID") + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "TARIFA_CONVENIO_TRANSP_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; \ No newline at end of file From 6b55279af66dd7e83057b7295260e113a27600b2 Mon Sep 17 00:00:00 2001 From: Leonardo Oliveira Date: Thu, 11 Jul 2024 17:08:30 -0300 Subject: [PATCH 18/37] Aumentar tamanho do campo corrida_id para 9 fixes bug#AL-4264 --- pom.xml | 2 +- src/db/migration/V20240709_1913__AL-4264.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240709_1913__AL-4264.sql diff --git a/pom.xml b/pom.xml index b564832ac..bd171c161 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.62.0 + 1.63.0 diff --git a/src/db/migration/V20240709_1913__AL-4264.sql b/src/db/migration/V20240709_1913__AL-4264.sql new file mode 100644 index 000000000..51dca388a --- /dev/null +++ b/src/db/migration/V20240709_1913__AL-4264.sql @@ -0,0 +1,15 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'Insert into CONSTANTE (CONSTANTE_ID,NOMBCONSTANTE,DESCCONSTANTE,INDTIPOCONSTANTE, + VALORCONSTANTE,INDMANTENIMIENTOUSUARIO,ACTIVO,FECMODIF,USUARIO_ID) + values (CONSTANTE_SEQ.NEXTVAL,''NUM_VIAJE_9_DIGITOS'',''NUM_VIAJE_9_DIGITOS'', + null,''false'',null,''1'',sysdate,''1'')'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; \ No newline at end of file From b534335594496a6414f742e0651f65e0bad2c0e7 Mon Sep 17 00:00:00 2001 From: Fabio Date: Fri, 12 Jul 2024 18:10:26 -0300 Subject: [PATCH 19/37] Cadastro de convenio transportadora feat bug#AL-4346 --- pom.xml | 2 +- src/db/migration/V20240710_1907__AL-4346.sql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index bd171c161..0772696b5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.63.0 + 1.64.0 diff --git a/src/db/migration/V20240710_1907__AL-4346.sql b/src/db/migration/V20240710_1907__AL-4346.sql index 04e554507..14ca502f1 100644 --- a/src/db/migration/V20240710_1907__AL-4346.sql +++ b/src/db/migration/V20240710_1907__AL-4346.sql @@ -11,9 +11,9 @@ begin "USUARIO_ID" NUMBER(7,0), "ACTIVO" NUMBER(1,0), "FECMODIF" DATE, - CONSTRAINT "fk_grupo_contrato" FOREIGN KEY ("CONVENIOTRANSPORTADORA_ID") REFERENCES "CONVENIO_TRANSPORTADORA"("CONVENIOTRANSPORTADORA_ID"), - CONSTRAINT "fk_parada_origen" FOREIGN KEY ("ORIGEN_ID") REFERENCES "PARADA"("PARADA_ID"), - CONSTRAINT "fk_parada_destino" FOREIGN KEY ("DESTINO_ID") REFERENCES "PARADA"("PARADA_ID") + CONSTRAINT "fk_convenio_tarifas" FOREIGN KEY ("CONVENIOTRANSPORTADORA_ID") REFERENCES "CONVENIO_TRANSPORTADORA"("CONVENIOTRANSPORTADORA_ID"), + CONSTRAINT "fk_parada_origen_convenio" FOREIGN KEY ("ORIGEN_ID") REFERENCES "PARADA"("PARADA_ID"), + CONSTRAINT "fk_parada_destino_convenio" FOREIGN KEY ("DESTINO_ID") REFERENCES "PARADA"("PARADA_ID") )'; exception when object_exists then null; end; From 0220f4af4bd6c2fe0416e75fcac6dd13c39018dd Mon Sep 17 00:00:00 2001 From: valdevir Date: Tue, 16 Jul 2024 11:23:03 -0300 Subject: [PATCH 20/37] fixes bug #AL-4634 --- pom.xml | 164 +++++++++--------- .../backup/oracle/V20240716_0958__AL-4634.sql | 7 + 2 files changed, 89 insertions(+), 82 deletions(-) create mode 100644 src/db/backup/oracle/V20240716_0958__AL-4634.sql diff --git a/pom.xml b/pom.xml index 0772696b5..128ff088e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,83 +1,83 @@ - - 4.0.0 - br.com.rjconsultores - Flyway - 1.64.0 - - - - rj-releases - http://52.5.53.15:8081/nexus/content/repositories/releases/ - - - - - UTF-8 - UTF-8 - - - - src - - - - ${basedir}/src - - *.* - db/** - - - - - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.flywaydb - flyway-maven-plugin - 3.2.1 - - true - - - - ${project.artifactId} - - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.flywaydb - flyway-core - 4.2.0 - - - - javax.servlet - javax.servlet-api - 4.0.0 - provided - - - - com.oracle.database.jdbc - ojdbc8 - 21.7.0.0 - - - - + + 4.0.0 + br.com.rjconsultores + Flyway + 1.65.0 + + + + rj-releases + http://52.5.53.15:8081/nexus/content/repositories/releases/ + + + + + UTF-8 + UTF-8 + + + + src + + + + ${basedir}/src + + *.* + db/** + + + + + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + org.flywaydb + flyway-maven-plugin + 3.2.1 + + true + + + + ${project.artifactId} + + + + + org.apache.logging.log4j + log4j-core + 2.17.1 + + + + org.flywaydb + flyway-core + 4.2.0 + + + + javax.servlet + javax.servlet-api + 4.0.0 + provided + + + + com.oracle.database.jdbc + ojdbc8 + 21.7.0.0 + + + + \ No newline at end of file diff --git a/src/db/backup/oracle/V20240716_0958__AL-4634.sql b/src/db/backup/oracle/V20240716_0958__AL-4634.sql new file mode 100644 index 000000000..a9f691b33 --- /dev/null +++ b/src/db/backup/oracle/V20240716_0958__AL-4634.sql @@ -0,0 +1,7 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -01430); +begin + execute immediate 'ALTER TABLE PARADA ADD (CODSIGMA VARCHAR2(7))'; + exception when object_exists then null; +end; \ No newline at end of file From 32fbfb2fba0472dee9710591d76b2db4dd96514d Mon Sep 17 00:00:00 2001 From: valdevir Date: Tue, 16 Jul 2024 15:54:45 -0300 Subject: [PATCH 21/37] fixes bug #AL-4635 --- pom.xml | 2 +- src/db/migration/V20240716_1154__AL-4635.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240716_1154__AL-4635.sql diff --git a/pom.xml b/pom.xml index 128ff088e..b00b75cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.65.0 + 1.66.0 diff --git a/src/db/migration/V20240716_1154__AL-4635.sql b/src/db/migration/V20240716_1154__AL-4635.sql new file mode 100644 index 000000000..ac8782b72 --- /dev/null +++ b/src/db/migration/V20240716_1154__AL-4635.sql @@ -0,0 +1,15 @@ +declare + column_exists exception; + pragma exception_init (column_exists , -01430); +begin + execute immediate 'ALTER TABLE RUTA ADD (INDFREQMINIMA NUMBER(1,0))'; + exception when column_exists then null; +end; +/ +declare + column_exists exception; + pragma exception_init (column_exists , -01430); +begin + execute immediate 'ALTER TABLE BOLETO ADD (INDFREQMINIMA NUMBER(1,0))'; + exception when column_exists then null; +end; \ No newline at end of file From 4240e2f8823b78440ac42f1b7c40df9430d90e17 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 16 Jul 2024 19:59:16 -0300 Subject: [PATCH 22/37] Cadastro de desconto por contrato feat bug#AL-4342 --- pom.xml | 2 +- src/db/migration/V20240716_1038__AL-4342.sql | 29 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240716_1038__AL-4342.sql diff --git a/pom.xml b/pom.xml index b00b75cd5..b6a76d13b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.66.0 + 1.67.0 diff --git a/src/db/migration/V20240716_1038__AL-4342.sql b/src/db/migration/V20240716_1038__AL-4342.sql new file mode 100644 index 000000000..0c4ce36d5 --- /dev/null +++ b/src/db/migration/V20240716_1038__AL-4342.sql @@ -0,0 +1,29 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE DESCONTO_CONTRATO ( + DESCONTOCONTRATO_ID NUMBER(7,0) PRIMARY KEY, + CONTRATO_ID NUMBER(7,0), + DATA_INICIAL DATE, + DATA_FINAL DATE, + PORCENTAGEM NUMBER(5,2), + INDDESCONTO NUMBER(1,0), + USUARIO_ID NUMBER(7,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + CONSTRAINT fk_contrato_desconto FOREIGN KEY (CONTRATO_ID) REFERENCES CONTRATO_CORPORATIVO(CONTRATO_ID), + CONSTRAINT fk_usuario_contrato_desconto FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) + )'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "DESCONTO_CONTRATO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ From 3712245d12da504b772566d810ba2bc8ffd5dee7 Mon Sep 17 00:00:00 2001 From: "valdir.cordeiro" Date: Wed, 17 Jul 2024 10:54:56 -0300 Subject: [PATCH 23/37] =?UTF-8?q?Espec=20Bolivariano=20-=20Integra=C3=A7?= =?UTF-8?q?=C3=A3o=20Infobit.=20fixes=20bug#AL-4273?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/db/migration/V20240715_1507__AL-4273.sql | 16 ++++++++++ src/db/migration/V20240715_1953__AL-4273.sql | 31 ++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240715_1507__AL-4273.sql create mode 100644 src/db/migration/V20240715_1953__AL-4273.sql diff --git a/pom.xml b/pom.xml index b6a76d13b..fa481a981 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.67.0 + 1.68.0 diff --git a/src/db/migration/V20240715_1507__AL-4273.sql b/src/db/migration/V20240715_1507__AL-4273.sql new file mode 100644 index 000000000..b3bee5d98 --- /dev/null +++ b/src/db/migration/V20240715_1507__AL-4273.sql @@ -0,0 +1,16 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'INSERT INTO funcion_sistema (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + VALUES + (funcion_sistema_seq.NEXTVAL, 1, ''ADM > ESQUEMA OPERACIONAL >> INTEGRAÇÃO >> COMPROVANTE DE PASSAGEM'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.ESQUEMAOPERACIONAL.MENU.INTEGRACAOCOMPROVANTEPASSAGEM'', 1, SYSDATE, 1)'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; diff --git a/src/db/migration/V20240715_1953__AL-4273.sql b/src/db/migration/V20240715_1953__AL-4273.sql new file mode 100644 index 000000000..e82d3aa72 --- /dev/null +++ b/src/db/migration/V20240715_1953__AL-4273.sql @@ -0,0 +1,31 @@ +declare + table_exists exception; + pragma exception_init (table_exists , -00955); +begin + execute immediate + 'CREATE TABLE CONF_COMPROVANTE_PASSAGEM ( + CONFCOMPROVANTEPASSAGEM_ID NUMBER(7) NOT NULL, + EMPRESA_ID NUMBER(7,0), + VIA_COMPROVANTE VARCHAR2(100), + TIPO_INTEGRACAO VARCHAR2(100), + URL VARCHAR2(300), + API_KEY VARCHAR2(300), + REMETENTE VARCHAR2(300), + NOME_TEMPLATE VARCHAR2(100), + ACTIVO NUMBER(1), + FECMODIF DATE, + USUARIO_ID NUMBER(7), + PRIMARY KEY ( CONFCOMPROVANTEPASSAGEM_ID ) + )'; + + exception when table_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "CONF_COMPROVANTE_PASSAGEM_SEQ" INCREMENT BY 1 START WITH 1 NOCACHE ORDER NOCYCLE'; + exception when object_exists then null; +end; +/ \ No newline at end of file From 96355383da14cc42842a4dac9416e528b6fa3988 Mon Sep 17 00:00:00 2001 From: valdevir Date: Wed, 17 Jul 2024 17:53:39 -0300 Subject: [PATCH 24/37] fixes bug#AL-4634 --- pom.xml | 2 +- .../oracle => migration}/V20240716_0958__AL-4634.sql | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename src/db/{backup/oracle => migration}/V20240716_0958__AL-4634.sql (95%) diff --git a/pom.xml b/pom.xml index fa481a981..5a92d7be0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.68.0 + 1.69.0 diff --git a/src/db/backup/oracle/V20240716_0958__AL-4634.sql b/src/db/migration/V20240716_0958__AL-4634.sql similarity index 95% rename from src/db/backup/oracle/V20240716_0958__AL-4634.sql rename to src/db/migration/V20240716_0958__AL-4634.sql index a9f691b33..e2f8705c1 100644 --- a/src/db/backup/oracle/V20240716_0958__AL-4634.sql +++ b/src/db/migration/V20240716_0958__AL-4634.sql @@ -1,7 +1,7 @@ -declare - object_exists exception; - pragma exception_init (object_exists , -01430); -begin - execute immediate 'ALTER TABLE PARADA ADD (CODSIGMA VARCHAR2(7))'; - exception when object_exists then null; +declare + object_exists exception; + pragma exception_init (object_exists , -01430); +begin + execute immediate 'ALTER TABLE PARADA ADD (CODSIGMA VARCHAR2(7))'; + exception when object_exists then null; end; \ No newline at end of file From ffd7ada45367a73a4e47a3c4638129342c4c73fa Mon Sep 17 00:00:00 2001 From: valdevir Date: Wed, 17 Jul 2024 19:26:20 -0300 Subject: [PATCH 25/37] fixes bug #AL-4647 --- pom.xml | 2 +- src/db/migration/V20240717_1744__AL-4647.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240717_1744__AL-4647.sql diff --git a/pom.xml b/pom.xml index 5a92d7be0..98f4239fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.69.0 + 1.70.0 diff --git a/src/db/migration/V20240717_1744__AL-4647.sql b/src/db/migration/V20240717_1744__AL-4647.sql new file mode 100644 index 000000000..88e9412dc --- /dev/null +++ b/src/db/migration/V20240717_1744__AL-4647.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE empresa ADD INDQRCODEFORMMARCOREG NUMBER(1,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file From 71946aff8fd8d6bf2d2ea5c493efbbf03b4c302e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Thu, 18 Jul 2024 00:31:02 -0300 Subject: [PATCH 26/37] fixes bug#AL-4586 --- pom.xml | 2 +- src/db/migration/V20240716_1320__AL-4587.sql | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240716_1320__AL-4587.sql diff --git a/pom.xml b/pom.xml index 98f4239fc..5b18b4295 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.70.0 + 1.71.0 diff --git a/src/db/migration/V20240716_1320__AL-4587.sql b/src/db/migration/V20240716_1320__AL-4587.sql new file mode 100644 index 000000000..c9fe1d553 --- /dev/null +++ b/src/db/migration/V20240716_1320__AL-4587.sql @@ -0,0 +1,14 @@ +-- INSERT / UPDATE +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'INSERT INTO funcion_sistema VALUES (funcion_sistema_seq.NEXTVAL, 1, ''ADM > RELATORIOS > RELATORIOS > RELATORIOS ESTATISTICO > RELATORIO DESCONTO POR CUPOM'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIODESCONTOPORCUPOM'', 1, SYSDATE, 1)'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; \ No newline at end of file From 163ef2f7ebcde252f68bc50d1a6304817109e17f Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 18 Jul 2024 11:17:32 -0300 Subject: [PATCH 27/37] Cadastro de convenio transportadora feat bug#AL-4346 --- pom.xml | 2 +- src/db/migration/V20240708_1537__AL-4346.sql | 2 +- src/db/migration/V20240710_1907__AL-4346.sql | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5b18b4295..bc5d38ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.71.0 + 1.72.0 diff --git a/src/db/migration/V20240708_1537__AL-4346.sql b/src/db/migration/V20240708_1537__AL-4346.sql index a7c52af92..7a29c8ce4 100644 --- a/src/db/migration/V20240708_1537__AL-4346.sql +++ b/src/db/migration/V20240708_1537__AL-4346.sql @@ -2,7 +2,7 @@ declare object_exists exception; pragma exception_init (object_exists , -00955); begin - execute immediate 'CREATE TABLE CONVENIO_TRANSPORT ( + execute immediate 'CREATE TABLE CONVENIO_TRANSPORTADORA ( CONVENIOTRANSPORTADORA_ID NUMBER(7,0) PRIMARY KEY, TRANSPORTADORA_ID NUMBER(7,0), NOME_CONVENIO VARCHAR2(150), diff --git a/src/db/migration/V20240710_1907__AL-4346.sql b/src/db/migration/V20240710_1907__AL-4346.sql index 14ca502f1..fb6e2ebd1 100644 --- a/src/db/migration/V20240710_1907__AL-4346.sql +++ b/src/db/migration/V20240710_1907__AL-4346.sql @@ -24,4 +24,5 @@ declare begin execute immediate 'CREATE SEQUENCE "TARIFA_CONVENIO_TRANSP_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; exception when object_exists then null; -end; \ No newline at end of file +end; +/ \ No newline at end of file From f80fb883ad93449b8075618406071cce68d9f035 Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 18 Jul 2024 16:31:52 -0300 Subject: [PATCH 28/37] fixes bug #AL-4657 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc5d38ca9..efc8a73b5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.72.0 + 1.73.0 From 6ecdaa42252e0e735b16879b6e41817942d42f0b Mon Sep 17 00:00:00 2001 From: valdevir Date: Fri, 19 Jul 2024 10:53:58 -0300 Subject: [PATCH 29/37] fixes bug #AL-4657 --- pom.xml | 2 +- src/db/migration/V20240617_1834__AL-4505.sql | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240617_1834__AL-4505.sql diff --git a/pom.xml b/pom.xml index efc8a73b5..7f91d4056 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.73.0 + 1.74.0 diff --git a/src/db/migration/V20240617_1834__AL-4505.sql b/src/db/migration/V20240617_1834__AL-4505.sql new file mode 100644 index 000000000..aaf59bd1a --- /dev/null +++ b/src/db/migration/V20240617_1834__AL-4505.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE PARAM_RECOLECCION ADD IMPORTEBASE NUMBER(7,2)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file From a7142ba6ebd01fda0bff92732b10ca5645a65437 Mon Sep 17 00:00:00 2001 From: Fabio Date: Fri, 19 Jul 2024 12:44:02 -0300 Subject: [PATCH 30/37] Funcionalidade de adicao ao contrato feat bug#AL-4343 --- pom.xml | 2 +- src/db/migration/V20240710_1052__AL-4343.sql | 24 -------------------- src/db/migration/V20240718_1844__AL-4343.sql | 15 ++++++++++++ src/db/migration/V20240719_1127__AL-4343.sql | 16 +++++++++++++ 4 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 src/db/migration/V20240710_1052__AL-4343.sql create mode 100644 src/db/migration/V20240718_1844__AL-4343.sql create mode 100644 src/db/migration/V20240719_1127__AL-4343.sql diff --git a/pom.xml b/pom.xml index 7f91d4056..c611698bd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.74.0 + 1.75.0 diff --git a/src/db/migration/V20240710_1052__AL-4343.sql b/src/db/migration/V20240710_1052__AL-4343.sql deleted file mode 100644 index 30c1c8f91..000000000 --- a/src/db/migration/V20240710_1052__AL-4343.sql +++ /dev/null @@ -1,24 +0,0 @@ -declare - object_exists exception; - pragma exception_init (object_exists , -00955); -begin - execute immediate 'CREATE TABLE TIPO_LANCAMENTO_CAIXA ( - TIPO_LANCAMENTO_ID NUMBER(7,0) PRIMARY KEY, - NOME_LANCAMENTO VARCHAR2(255), - INDACRESCIMO NUMBER(1,0), - ACTIVO NUMBER(1,0), - USUARIO_ID NUMBER(7,0), - FECMODIF DATE, - CONSTRAINT fk_usuario_tipo_lancamento FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) - )'; - exception when object_exists then null; -end; -/ -declare - object_exists exception; - pragma exception_init (object_exists , -00955); -begin - execute immediate 'CREATE SEQUENCE "TIPO_LANCAMENTO_CAIXA_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; - exception when object_exists then null; -end; -/ diff --git a/src/db/migration/V20240718_1844__AL-4343.sql b/src/db/migration/V20240718_1844__AL-4343.sql new file mode 100644 index 000000000..a61f52fa4 --- /dev/null +++ b/src/db/migration/V20240718_1844__AL-4343.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CAIXA_CONTRATO ADD OBSERVACAO VARCHAR2(150)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; diff --git a/src/db/migration/V20240719_1127__AL-4343.sql b/src/db/migration/V20240719_1127__AL-4343.sql new file mode 100644 index 000000000..56af4c4d0 --- /dev/null +++ b/src/db/migration/V20240719_1127__AL-4343.sql @@ -0,0 +1,16 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CAIXA_CONTRATO DROP CONSTRAINT FK_TIPO_LANCAMENTO_CAIXA_CONTRATO'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ From cf9f7812f429dfb4ac392ecf574a68c2dac8afb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aristides=20dos=20Reis=20J=C3=BAnior?= Date: Fri, 19 Jul 2024 20:39:13 -0300 Subject: [PATCH 31/37] fixes bug#AL-4587 --- pom.xml | 2 +- src/db/migration/V20240705_11706__AL-4587.sql | 122 ++++++++++++++++++ 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240705_11706__AL-4587.sql diff --git a/pom.xml b/pom.xml index c611698bd..3ad150081 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.75.0 + 1.75.1 diff --git a/src/db/migration/V20240705_11706__AL-4587.sql b/src/db/migration/V20240705_11706__AL-4587.sql new file mode 100644 index 000000000..1a66ca654 --- /dev/null +++ b/src/db/migration/V20240705_11706__AL-4587.sql @@ -0,0 +1,122 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE BOLETO ADD CONVENIOCAMPANHA_ID NUMBER(7,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ + + +declare + object_exists exception; + except_02275 exception; + except_02270 exception; + except_02261 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_02275 , -02275); + pragma exception_init (except_02270 , -02270); + pragma exception_init (except_02261 , -02261); +begin + execute immediate 'ALTER TABLE BOLETO + ADD CONSTRAINT FK_BOLETO_CONVENIOCAMPANHA + FOREIGN KEY (CONVENIOCAMPANHA_ID) + REFERENCES CONVENIO (CONVENIO_ID)'; + exception + when object_exists then null; + when except_02275 then null; + when except_02270 then null; + when except_02261 then null; +end; +/ + +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CAJA ADD CONVENIOCAMPANHA_ID NUMBER(7,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; +/ + + +declare + object_exists exception; + except_02275 exception; + except_02270 exception; + except_02261 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_02275 , -02275); + pragma exception_init (except_02270 , -02270); + pragma exception_init (except_02261 , -02261); +begin + execute immediate 'ALTER TABLE CAJA + ADD CONSTRAINT FK_CAJA_CONVENIOCAMPANHA + FOREIGN KEY (CONVENIOCAMPANHA_ID) + REFERENCES CONVENIO (CONVENIO_ID)'; + exception + when object_exists then null; + when except_02275 then null; + when except_02270 then null; + when except_02261 then null; +end; +/ + + + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CAMPANHACUPOMSORTEADO ( + CAMPANHACUPOMSORTEADO_ID NUMBER(7,0) NOT NULL ENABLE, + BOLETOSORTEADO_ID NUMBER(15,0), + BOLETOCUPOM_ID NUMBER(15,0), + CONVENIO_ID NUMBER(7,0), + PUNTOVENTA_ID NUMBER(7,0), + EMPRESA_ID NUMBER(7,0), + CODIGOCUPOM VARCHAR2(40 BYTE), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + FECCREACION DATE, + USUARIO_ID NUMBER(7,0), + PRIMARY KEY (CAMPANHACUPOMSORTEADO_ID), + FOREIGN KEY (BOLETOSORTEADO_ID) + REFERENCES BOLETO (BOLETO_ID) ENABLE, + FOREIGN KEY (BOLETOCUPOM_ID) + REFERENCES BOLETO (BOLETO_ID) ENABLE, + FOREIGN KEY (PUNTOVENTA_ID) + REFERENCES PUNTO_VENTA (PUNTOVENTA_ID) ENABLE, + FOREIGN KEY (EMPRESA_ID) + REFERENCES EMPRESA (EMPRESA_ID) ENABLE, + FOREIGN KEY (CONVENIO_ID) + REFERENCES CONVENIO (CONVENIO_ID) ENABLE )'; + exception when object_exists then null; +end; +/ + +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE CAMPANHACUPOMSORTEADO_SEQ INCREMENT BY 1 START WITH 1 NOCACHE ORDER NOCYCLE'; + exception when object_exists then null; +end; \ No newline at end of file From d746ac68f3de4da55f19569cb8c3a7ef59a9f5e8 Mon Sep 17 00:00:00 2001 From: "valdir.cordeiro" Date: Mon, 22 Jul 2024 10:32:24 -0300 Subject: [PATCH 32/37] =?UTF-8?q?Espec=20Bolivariano=20-=20Integra=C3=A7?= =?UTF-8?q?=C3=A3o=20Infobit.=20fixes=20bug#AL-4273?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/db/migration/V20240718_1507__AL-4237.sql | 8 ++++++++ src/db/migration/V20240722_0941__AL-4273.sql | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240718_1507__AL-4237.sql create mode 100644 src/db/migration/V20240722_0941__AL-4273.sql diff --git a/pom.xml b/pom.xml index 3ad150081..eb3ff046b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.75.1 + 1.75.2 diff --git a/src/db/migration/V20240718_1507__AL-4237.sql b/src/db/migration/V20240718_1507__AL-4237.sql new file mode 100644 index 000000000..901514365 --- /dev/null +++ b/src/db/migration/V20240718_1507__AL-4237.sql @@ -0,0 +1,8 @@ +declare + dup_val_on_index exception; + pragma exception_init (dup_val_on_index , -00001); +begin + execute immediate 'INSERT INTO CONSTANTE (CONSTANTE_ID, NOMBCONSTANTE, DESCCONSTANTE, VALORCONSTANTE, INDTIPOCONSTANTE, INDMANTENIMIENTOUSUARIO, ACTIVO, FECMODIF, USUARIO_ID) + VALUES (CONSTANTE_SEQ.nextval, ''URL_API_RJ_INFOBIP'', ''URL da API da RJ que faz conexao com a api da INFOBIP'', null, ''1'', ''1'', ''1'', sysdate, ''1'')'; + exception when dup_val_on_index then null; +end; \ No newline at end of file diff --git a/src/db/migration/V20240722_0941__AL-4273.sql b/src/db/migration/V20240722_0941__AL-4273.sql new file mode 100644 index 000000000..7e32f9845 --- /dev/null +++ b/src/db/migration/V20240722_0941__AL-4273.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CONF_COMPROVANTE_PASSAGEM ADD IDIOMA_TEMPLATE VARCHAR2(20)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; From 23f0f4ee4b49e226238b8f04ae6aee2d9c5efbe7 Mon Sep 17 00:00:00 2001 From: Leonardo Oliveira Date: Wed, 24 Jul 2024 17:46:49 -0300 Subject: [PATCH 33/37] =?UTF-8?q?Bolivariano=20-=20Autoriza=C3=A7=C3=A3o?= =?UTF-8?q?=20de=20viagem=20fixes=20bug#AL-4453?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/db/migration/V20240717_1958__AL-4453.sql | 15 +++++++++++++++ src/db/migration/V20240722_1930__AL-4453.sql | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/db/migration/V20240717_1958__AL-4453.sql create mode 100644 src/db/migration/V20240722_1930__AL-4453.sql diff --git a/pom.xml b/pom.xml index bd171c161..0772696b5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.63.0 + 1.64.0 diff --git a/src/db/migration/V20240717_1958__AL-4453.sql b/src/db/migration/V20240717_1958__AL-4453.sql new file mode 100644 index 000000000..c677d71f9 --- /dev/null +++ b/src/db/migration/V20240717_1958__AL-4453.sql @@ -0,0 +1,15 @@ +declare + object_exists exception; + except_01451 exception; + except_01442 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_01451 , -01451); + pragma exception_init (except_01442 , -01442); +begin + execute immediate 'ALTER TABLE CATEGORIA ADD INDEMITEFORMAUTORIZACAO NUMBER(1,0)'; + exception + when object_exists then null; + when except_01451 then null; + when except_01442 then null; +end; \ No newline at end of file diff --git a/src/db/migration/V20240722_1930__AL-4453.sql b/src/db/migration/V20240722_1930__AL-4453.sql new file mode 100644 index 000000000..5d68c5320 --- /dev/null +++ b/src/db/migration/V20240722_1930__AL-4453.sql @@ -0,0 +1,18 @@ +-- CREATE TABLE/CREATE SEQUENCE +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CATEGORIA_FORM_AUTORIZACAO ( + CATEGORIA_ID NUMBER(7,0), + EMPRESA_ID NUMBER(7,0), + TEXTO CLOB, + ACTIVO NUMBER(1,0), + USUARIO_ID NUMBER(7,0), + FECMODIF DATE, + PRIMARY KEY ( CATEGORIA_ID, EMPRESA_ID), + CONSTRAINT "fk_categoriafrmautorizacao_categoria" FOREIGN KEY ("CATEGORIA_ID") REFERENCES "CATEGORIA"("CATEGORIA_ID"), + CONSTRAINT "fk_categoriafrmautorizacao_empresa" FOREIGN KEY ("EMPRESA_ID") REFERENCES "EMPRESA"("EMPRESA_ID") + )'; + exception when object_exists then null; +end; \ No newline at end of file From 463c4be2ee7c5a30b0d8575c8c91f476898d1f04 Mon Sep 17 00:00:00 2001 From: Leonardo Oliveira Date: Thu, 25 Jul 2024 11:31:56 -0300 Subject: [PATCH 34/37] alteradas as constraints pois o nome nao deve exceder 30 caracteres fixes bug#AL-4453 --- src/db/migration/V20240722_1930__AL-4453.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/db/migration/V20240722_1930__AL-4453.sql b/src/db/migration/V20240722_1930__AL-4453.sql index 5d68c5320..cda58c797 100644 --- a/src/db/migration/V20240722_1930__AL-4453.sql +++ b/src/db/migration/V20240722_1930__AL-4453.sql @@ -11,8 +11,8 @@ begin USUARIO_ID NUMBER(7,0), FECMODIF DATE, PRIMARY KEY ( CATEGORIA_ID, EMPRESA_ID), - CONSTRAINT "fk_categoriafrmautorizacao_categoria" FOREIGN KEY ("CATEGORIA_ID") REFERENCES "CATEGORIA"("CATEGORIA_ID"), - CONSTRAINT "fk_categoriafrmautorizacao_empresa" FOREIGN KEY ("EMPRESA_ID") REFERENCES "EMPRESA"("EMPRESA_ID") + CONSTRAINT "fk_frmautorizacao_categoria" FOREIGN KEY ("CATEGORIA_ID") REFERENCES "CATEGORIA"("CATEGORIA_ID"), + CONSTRAINT "fk_frmautorizacao_empresa" FOREIGN KEY ("EMPRESA_ID") REFERENCES "EMPRESA"("EMPRESA_ID") )'; exception when object_exists then null; end; \ No newline at end of file From 90e7d7ddba8c908c8ce00817d9f88a64af06d336 Mon Sep 17 00:00:00 2001 From: Leonardo Oliveira Date: Thu, 25 Jul 2024 16:31:27 -0300 Subject: [PATCH 35/37] alterada a primary key composta para simples fixes bug#AL-4453 --- src/db/migration/V20240722_1930__AL-4453.sql | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/db/migration/V20240722_1930__AL-4453.sql b/src/db/migration/V20240722_1930__AL-4453.sql index cda58c797..9571115eb 100644 --- a/src/db/migration/V20240722_1930__AL-4453.sql +++ b/src/db/migration/V20240722_1930__AL-4453.sql @@ -4,15 +4,25 @@ declare pragma exception_init (object_exists , -00955); begin execute immediate 'CREATE TABLE CATEGORIA_FORM_AUTORIZACAO ( + CATEGORIAFORMAUTORIZACAO_ID NUMBER(7,0), CATEGORIA_ID NUMBER(7,0), EMPRESA_ID NUMBER(7,0), TEXTO CLOB, ACTIVO NUMBER(1,0), USUARIO_ID NUMBER(7,0), FECMODIF DATE, - PRIMARY KEY ( CATEGORIA_ID, EMPRESA_ID), + PRIMARY KEY (CATEGORIAFORMAUTORIZACAO_ID), CONSTRAINT "fk_frmautorizacao_categoria" FOREIGN KEY ("CATEGORIA_ID") REFERENCES "CATEGORIA"("CATEGORIA_ID"), CONSTRAINT "fk_frmautorizacao_empresa" FOREIGN KEY ("EMPRESA_ID") REFERENCES "EMPRESA"("EMPRESA_ID") )'; exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate + 'CREATE SEQUENCE "CAT_FORM_AUTORIZACAO_SEQ" MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; end; \ No newline at end of file From f2f861ca8072c34b77a9c6042f5ccc83d27a64fa Mon Sep 17 00:00:00 2001 From: Leonardo Oliveira Date: Thu, 25 Jul 2024 16:34:58 -0300 Subject: [PATCH 36/37] alterada a primary key composta para simples fixes bug#AL-4453 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3dc39a666..7cc52f4a8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.76.0 + 1.76.1 From feb6b7b0e4a51886fc91c8daa28cb900b3b3c8c2 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 1 Aug 2024 16:02:25 -0300 Subject: [PATCH 37/37] =?UTF-8?q?Consulta=20e=20Legaliza=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20Voucher=20feat=20bug#AL-4249?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/db/migration/V20240710_1053__AL-4343.sql | 4 +- src/db/migration/V20240724_1314__AL-4279.sql | 17 +++++++ src/db/migration/V20240725_1353__AL-4279.sql | 45 +++++++++++++++++++ src/db/migration/V20240731_1120__AL-4279.sql | 28 ++++++++++++ ...L-4343.sql => V20240801_1501__AL-4279.sql} | 3 +- src/db/migration/V20240801_1510__AL-4279.sql | 18 ++++++++ 7 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 src/db/migration/V20240724_1314__AL-4279.sql create mode 100644 src/db/migration/V20240725_1353__AL-4279.sql create mode 100644 src/db/migration/V20240731_1120__AL-4279.sql rename src/db/migration/{V20240719_1127__AL-4343.sql => V20240801_1501__AL-4279.sql} (78%) create mode 100644 src/db/migration/V20240801_1510__AL-4279.sql diff --git a/pom.xml b/pom.xml index 7cc52f4a8..50a78a9c6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.76.1 + 1.77.0 diff --git a/src/db/migration/V20240710_1053__AL-4343.sql b/src/db/migration/V20240710_1053__AL-4343.sql index 3356d57b1..ea893a795 100644 --- a/src/db/migration/V20240710_1053__AL-4343.sql +++ b/src/db/migration/V20240710_1053__AL-4343.sql @@ -11,13 +11,13 @@ begin EVENTOEXTRA_ID NUMBER(7,0), USUARIO_ID NUMBER(7,0), TIPO_LANCAMENTO_ID NUMBER(7,0), + OBSERVACAO VARCHAR2(150), ACTIVO NUMBER(1,0), FECMODIF DATE, CONSTRAINT fk_contrato_caixa_contrato FOREIGN KEY (CONTRATO_ID) REFERENCES CONTRATO_CORPORATIVO(CONTRATO_ID), CONSTRAINT fk_caja_caixa_contrato FOREIGN KEY (CAJA_ID) REFERENCES CAJA(CAJA_ID), CONSTRAINT fk_eventoextra_caixa_contrato FOREIGN KEY (EVENTOEXTRA_ID) REFERENCES EVENTO_EXTRA(EVENTOEXTRA_ID), - CONSTRAINT fk_usuario_caixa_contrato FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID), - CONSTRAINT fk_tipo_lancamento_caixa_contrato FOREIGN KEY (TIPO_LANCAMENTO_ID) REFERENCES TIPO_LANCAMENTO_CAIXA(TIPO_LANCAMENTO_ID) + CONSTRAINT fk_usuario_caixa_contrato FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID) )'; exception when object_exists then null; end; diff --git a/src/db/migration/V20240724_1314__AL-4279.sql b/src/db/migration/V20240724_1314__AL-4279.sql new file mode 100644 index 000000000..8bfc6be4f --- /dev/null +++ b/src/db/migration/V20240724_1314__AL-4279.sql @@ -0,0 +1,17 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate + 'INSERT INTO funcion_sistema (FUNCIONSISTEMA_ID,SISTEMA_ID,NOMBFUNCION,DESCRUTA,ACTIVO,FECMODIF,USUARIO_ID) + VALUES + (funcion_sistema_seq.NEXTVAL, 1, ''ADM > CONFIGURAÇÃO COMERCIAL >> NEGOCIOS CORPORATIVOS >> VOUCHER'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MENU.VOUCHER'', 1, SYSDATE, 1)'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; diff --git a/src/db/migration/V20240725_1353__AL-4279.sql b/src/db/migration/V20240725_1353__AL-4279.sql new file mode 100644 index 000000000..5170c56ff --- /dev/null +++ b/src/db/migration/V20240725_1353__AL-4279.sql @@ -0,0 +1,45 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE VOUCHER ( + VOUCHER_ID NUMBER(15,0) PRIMARY KEY, + NOME_PASSAGEIRO VARCHAR2(150), + NUM_FATURA VARCHAR2(30), + VALOR_LICITADO NUMBER(15,2), + VALOR_LEGALIZADO NUMBER(15,2), + DATA_VALIDADE DATE, + STATUS NUMBER(1,0), + DATA_INCLUSAO DATE, + ORIGEN_ID NUMBER(7,0), + DESTINO_ID NUMBER(7,0), + CLASESERVICIO_ID NUMBER(2,0), + CONTRATO_ID NUMBER(7,0), + MOTIVOCANCELACION_ID NUMBER(7,0), + CLIENTECORPORATIVO_ID NUMBER(7,0), + GRUPOCONTRATO_ID NUMBER(7,0), + TRANSPORTADORA_ID NUMBER(7,0), + USUARIO_ID NUMBER(15,0), + ACTIVO NUMBER(1,0), + FECMODIF DATE, + CONSTRAINT fk_usuario_voucher FOREIGN KEY (USUARIO_ID) REFERENCES USUARIO(USUARIO_ID), + CONSTRAINT fk_origen_voucher FOREIGN KEY (ORIGEN_ID) REFERENCES PARADA(PARADA_ID), + CONSTRAINT fk_destino_voucher FOREIGN KEY (DESTINO_ID) REFERENCES PARADA(PARADA_ID), + CONSTRAINT fk_contrato_voucher FOREIGN KEY (CONTRATO_ID) REFERENCES CONTRATO_CORPORATIVO(CONTRATO_ID), + CONSTRAINT fk_cliente_corp_voucher FOREIGN KEY (CLIENTECORPORATIVO_ID) REFERENCES CLIENTE_CORPORATIVO(CLIENTECORPORATIVO_ID), + CONSTRAINT fk_motivo_cancel_voucher FOREIGN KEY (MOTIVOCANCELACION_ID) REFERENCES MOTIVO_CANCELACION(MOTIVOCANCELACION_ID), + CONSTRAINT fk_grupo_contrato_voucher FOREIGN KEY (GRUPOCONTRATO_ID) REFERENCES GRUPO_CONTRATO(GRUPOCONTRATO_ID), + CONSTRAINT fk_transportadora_voucher FOREIGN KEY (TRANSPORTADORA_ID) REFERENCES TRANSPORTADORA(TRANSPORTADORA_ID), + CONSTRAINT fk_clase_servicio_voucher FOREIGN KEY (CLASESERVICIO_ID) REFERENCES CLASE_SERVICIO(CLASESERVICIO_ID) + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "VOUCHER_SEQ" MINVALUE 1 MAXVALUE 999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE'; + exception when object_exists then null; +end; +/ diff --git a/src/db/migration/V20240731_1120__AL-4279.sql b/src/db/migration/V20240731_1120__AL-4279.sql new file mode 100644 index 000000000..5a878fb6b --- /dev/null +++ b/src/db/migration/V20240731_1120__AL-4279.sql @@ -0,0 +1,28 @@ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'Insert into TRANSPORTADORA (TRANSPORTADORA_ID, NIT, NOME_TRANSPORTADORA, USUARIO_ID, ACTIVO, FECMODIF) + values (''1'', '''', ''Expreso Bolivariano'', ''1'', ''1'', sysdate)'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; +/ +declare + dup_val_on_index exception; + except_02291 exception; + + pragma exception_init (dup_val_on_index , -00001); + pragma exception_init (except_02291 , -02291); +begin + execute immediate 'Insert into TRANSPORTADORA (TRANSPORTADORA_ID, NIT, NOME_TRANSPORTADORA, USUARIO_ID, ACTIVO, FECMODIF) + values (''2'', '''', ''Continental Bus'', ''1'', ''1'', sysdate)'; + exception + when dup_val_on_index then null; + when except_02291 then null; +end; +/ \ No newline at end of file diff --git a/src/db/migration/V20240719_1127__AL-4343.sql b/src/db/migration/V20240801_1501__AL-4279.sql similarity index 78% rename from src/db/migration/V20240719_1127__AL-4343.sql rename to src/db/migration/V20240801_1501__AL-4279.sql index 56af4c4d0..404f032f2 100644 --- a/src/db/migration/V20240719_1127__AL-4343.sql +++ b/src/db/migration/V20240801_1501__AL-4279.sql @@ -7,10 +7,9 @@ declare pragma exception_init (except_01451 , -01451); pragma exception_init (except_01442 , -01442); begin - execute immediate 'ALTER TABLE CAIXA_CONTRATO DROP CONSTRAINT FK_TIPO_LANCAMENTO_CAIXA_CONTRATO'; + execute immediate 'ALTER TABLE CAIXA_CONTRATO ADD VOUCHER_ID NUMBER(15,0)'; exception when object_exists then null; when except_01451 then null; when except_01442 then null; end; -/ diff --git a/src/db/migration/V20240801_1510__AL-4279.sql b/src/db/migration/V20240801_1510__AL-4279.sql new file mode 100644 index 000000000..197201ae6 --- /dev/null +++ b/src/db/migration/V20240801_1510__AL-4279.sql @@ -0,0 +1,18 @@ +declare + object_exists exception; + except_02275 exception; + except_02270 exception; + except_02261 exception; + + pragma exception_init (object_exists , -01430); + pragma exception_init (except_02275 , -02275); + pragma exception_init (except_02270 , -02270); + pragma exception_init (except_02261 , -02261); +begin + execute immediate 'ALTER TABLE CAIXA_CONTRATO ADD CONSTRAINT FK_VOUCHER_CAIXA FOREIGN KEY(VOUCHER_ID) REFERENCES VOUCHER(VOUCHER_ID) ENABLE'; + exception + when object_exists then null; + when except_02275 then null; + when except_02270 then null; + when except_02261 then null; +end;