From 47e021aca6b6a1715680db3b31dfb6576effb451 Mon Sep 17 00:00:00 2001 From: "valdir.cordeiro" Date: Mon, 17 Jun 2024 11:49:57 -0300 Subject: [PATCH 01/11] =?UTF-8?q?bug#al-4269=20Espec=20-=20Bolivariano=20-?= =?UTF-8?q?=20Restaura=C3=A7=C3=A3o=20de=20senha.=20dev:=20qua:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 877287d05..7ce9d9d6f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.47.2 + 1.47.2 From 14264a9983b8cabdf8cd877fa2fa6bf192a963b4 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 18 Jun 2024 12:54:59 -0300 Subject: [PATCH 02/11] Cadastro de clientes corporativos feat bug#AL-4275 --- pom.xml | 2 +- src/db/migration/V20240502_1619__AL-3857.sql | 2 +- src/db/migration/V20240610_1611__AL-4275.sql | 33 +++++++++++++ src/db/migration/V20240611_0912__AL-4275.sql | 52 ++++++++++++++++++++ src/db/migration/V20240612_1500__AL-4275.sql | 17 +++++++ 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 src/db/migration/V20240610_1611__AL-4275.sql create mode 100644 src/db/migration/V20240611_0912__AL-4275.sql create mode 100644 src/db/migration/V20240612_1500__AL-4275.sql diff --git a/pom.xml b/pom.xml index 7ce9d9d6f..768a882e5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores Flyway - 1.47.2 + 1.48.0 diff --git a/src/db/migration/V20240502_1619__AL-3857.sql b/src/db/migration/V20240502_1619__AL-3857.sql index 317774add..7963d8a06 100644 --- a/src/db/migration/V20240502_1619__AL-3857.sql +++ b/src/db/migration/V20240502_1619__AL-3857.sql @@ -4,7 +4,7 @@ declare begin execute immediate 'CREATE TABLE ALIAS_CLASSE_SERVICO ( - "ALIASCLASSE_ID" NUMBER(7,0) NOT NULL ENABLE, + "ALIASCLASSE_ID" NUMBER(7,0) PRIMARY KEY, "CLASSE_ID" NUMBER(7,0), "ALIAS_ID" NUMBER(7,0), "ORGAOCONCEDENTE_ID" NUMBER(7,0), diff --git a/src/db/migration/V20240610_1611__AL-4275.sql b/src/db/migration/V20240610_1611__AL-4275.sql new file mode 100644 index 000000000..1ee5f8392 --- /dev/null +++ b/src/db/migration/V20240610_1611__AL-4275.sql @@ -0,0 +1,33 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CLIENTE_CORPORATIVO ( + "CLIENTECORPORATIVO_ID" NUMBER(7,0) PRIMARY KEY, + "EMPRESA_ID" NUMBER(7,0) NOT NULL ENABLE, + "IDENTIFICACAO" NUMBER(9,0), + "NOMCLIENTECORP" VARCHAR2(255) NULL, + "DATA_CRIACAO" DATE , + "LOGRADOURO" VARCHAR2(255) NULL, + "NUMERO" VARCHAR2(6) NULL, + "BAIRRO" VARCHAR2(255) NULL, + "COMPLEMENTO" VARCHAR2(100) NULL, + "CEP" VARCHAR2(20) NULL, + "TELEFONE" VARCHAR2(20) NULL, + "EMAIL" VARCHAR2(150) NULL, + "CIUDAD_ID" NUMBER(7,0), + "USUARIO_ID" NUMBER(7,0), + "ACTIVO" NUMBER(1,0), + "FECMODIF" DATE , + 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 "CLIENTE_CORPORATIVO_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/V20240611_0912__AL-4275.sql b/src/db/migration/V20240611_0912__AL-4275.sql new file mode 100644 index 000000000..d559c409a --- /dev/null +++ b/src/db/migration/V20240611_0912__AL-4275.sql @@ -0,0 +1,52 @@ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE TABLE CONTRATO_CORPORATIVO ( + "CONTRATO_ID" NUMBER(7) PRIMARY KEY, + "CLIENTECORPORATIVO_ID" NUMBER(7), + "NUMCONTRATO" VARCHAR2(15), + "DATA_INICIO" DATE, + "DATA_FIM" DATE, + "VALOR_CONTRATO" NUMBER(10, 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), + "OBSERVACAO" VARCHAR2(255), + "DIVISAO" VARCHAR2(255), + "STATUS_CONTRATO" NUMBER(7), + "DESCONTO_FATURA" NUMBER(10, 2), + "IND_BILHETES_CONFIRMADOS" NUMBER(1), + "IND_RESERVA_BILHETE" NUMBER(1), + "IND_MANIPULA_BONUS" NUMBER(1), + "IND_EXIGE_EXCEDENTE" NUMBER(1), + "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") + )'; + exception when object_exists then null; +end; +/ +declare + object_exists exception; + pragma exception_init (object_exists , -00955); +begin + execute immediate 'CREATE SEQUENCE "CONTRATO_CORPORATIVO_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/V20240612_1500__AL-4275.sql b/src/db/migration/V20240612_1500__AL-4275.sql new file mode 100644 index 000000000..e5727c8c1 --- /dev/null +++ b/src/db/migration/V20240612_1500__AL-4275.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 >> CLIENTE CORPORATIVO'', + ''COM.RJCONSULTORES.ADMINISTRACION.GUI.CONFIGURACIONECCOMERCIALES.MENU.CLIENTECORPORATIVO'', 1, SYSDATE, 1)'; + + exception + when dup_val_on_index then null; + when except_02291 then null; +end; From 378986b38580f62b9a53eec9909c73cb5736c224 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 25 Jun 2024 16:18:32 -0300 Subject: [PATCH 03/11] 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 04/11] 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 05/11] =?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 ee696c8a6e2d2e932fee64ab7a9f8df4359873c9 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 27 Jun 2024 19:25:41 -0300 Subject: [PATCH 06/11] 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 07/11] 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 08/11] =?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 09/11] 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 10/11] 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 11/11] 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"),