From c07602f748f566ce4df8f7fe1ecb29ce22f00f39 Mon Sep 17 00:00:00 2001
From: alberto <alberto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 10 Jul 2018 17:49:49 +0000
Subject: [PATCH] =?UTF-8?q?Adapta=C3=A7=C3=A3o=20do=20Totalbus=20para=20se?=
 =?UTF-8?q?r=20compat=C3=ADvel=20com=20o=20postgresql=20bug#11508=20dev:tr?=
 =?UTF-8?q?evezani=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/BD/FlyWay/trunk@83259 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../rjconsultores/ventaboletos/FlyWay.java    |  7 +++++
 .../migration/V20180601_1704__mantis11052.sql |  9 ++++++
 .../migration/V20180604_1707__mantis11273.sql |  8 +++++
 .../migration/V20180605_1649__mantis11132.sql |  7 +++++
 .../migration/V20180606_1112__mantis11299.sql |  8 +++++
 .../migration/V20180606_1404__mantis11299.sql | 26 ++++++++++++++++
 .../migration/V20180606_1610__mantis11304.sql |  9 ++++++
 .../migration/V20180606_1611__mantis11304.sql |  7 +++++
 .../migration/V20180608_1800__mantis10074.sql | 30 +++++++++++++++++++
 .../migration/V20180611_1050__mantis10873.sql |  7 +++++
 .../migration/V20180612_1421__mantis11340.sql |  7 +++++
 .../migration/V20180613_1420__mantis11130.sql |  7 +++++
 .../migration/V20180613_1650__mantis11130.sql |  7 +++++
 .../migration/V20180614_1830__mantis11130.sql |  7 +++++
 .../migration/V20180615_1525__mantis11386.sql |  2 ++
 .../migration/V20180627_1644__mantis11406.sql | 11 +++++++
 .../migration/V20180628_1800__mantis10971.sql |  7 +++++
 .../migration/V20180703_1104__mantis11325.sql |  8 +++++
 18 files changed, 174 insertions(+)
 create mode 100644 src/db/postgresql/migration/V20180601_1704__mantis11052.sql
 create mode 100644 src/db/postgresql/migration/V20180604_1707__mantis11273.sql
 create mode 100644 src/db/postgresql/migration/V20180605_1649__mantis11132.sql
 create mode 100644 src/db/postgresql/migration/V20180606_1112__mantis11299.sql
 create mode 100644 src/db/postgresql/migration/V20180606_1404__mantis11299.sql
 create mode 100644 src/db/postgresql/migration/V20180606_1610__mantis11304.sql
 create mode 100644 src/db/postgresql/migration/V20180606_1611__mantis11304.sql
 create mode 100644 src/db/postgresql/migration/V20180608_1800__mantis10074.sql
 create mode 100644 src/db/postgresql/migration/V20180611_1050__mantis10873.sql
 create mode 100644 src/db/postgresql/migration/V20180612_1421__mantis11340.sql
 create mode 100644 src/db/postgresql/migration/V20180613_1420__mantis11130.sql
 create mode 100644 src/db/postgresql/migration/V20180613_1650__mantis11130.sql
 create mode 100644 src/db/postgresql/migration/V20180614_1830__mantis11130.sql
 create mode 100644 src/db/postgresql/migration/V20180615_1525__mantis11386.sql
 create mode 100644 src/db/postgresql/migration/V20180627_1644__mantis11406.sql
 create mode 100644 src/db/postgresql/migration/V20180628_1800__mantis10971.sql
 create mode 100644 src/db/postgresql/migration/V20180703_1104__mantis11325.sql

diff --git a/src/com/rjconsultores/ventaboletos/FlyWay.java b/src/com/rjconsultores/ventaboletos/FlyWay.java
index 5ca71f256..87e0d14a0 100644
--- a/src/com/rjconsultores/ventaboletos/FlyWay.java
+++ b/src/com/rjconsultores/ventaboletos/FlyWay.java
@@ -16,11 +16,16 @@ public class FlyWay {
 	private static final FlyWay INSTANCE = new FlyWay();
 	
 	private DataSource dataSource = null;
+	private String location = "db.migration";
 	
 	public static FlyWay getInstance() {
 		return INSTANCE;
 	}
 	
+	public void defineLocation(final String location) {
+		this.location = location;
+	}
+	
 	public void defineDataSource(final DataSource dataSource) {
 		this.dataSource = dataSource;
 		
@@ -72,6 +77,7 @@ public class FlyWay {
 		try{
 			final Flyway flyway = new Flyway();
 	
+			flyway.setLocations(this.location);
 			flyway.setDataSource(dataSource);
 			
 			execute(flyway);
@@ -93,6 +99,7 @@ public class FlyWay {
 		try{
 			final Flyway flyway = new Flyway();
 	
+			flyway.setLocations("classpath: " + this.location);
 			flyway.setDataSource(url, user, password);
 			
 			execute(flyway);
diff --git a/src/db/postgresql/migration/V20180601_1704__mantis11052.sql b/src/db/postgresql/migration/V20180601_1704__mantis11052.sql
new file mode 100644
index 000000000..e4b319419
--- /dev/null
+++ b/src/db/postgresql/migration/V20180601_1704__mantis11052.sql
@@ -0,0 +1,9 @@
+DO $$
+BEGIN
+  ALTER TABLE SECRETARIA ADD COLUMN RUT NUMERIC(12);
+  ALTER TABLE SECRETARIA ADD COLUMN DIRSECRETARIA VARCHAR(60);
+  ALTER TABLE SECRETARIA ADD COLUMN CIUDAD VARCHAR(60);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180604_1707__mantis11273.sql b/src/db/postgresql/migration/V20180604_1707__mantis11273.sql
new file mode 100644
index 000000000..2b36ee98d
--- /dev/null
+++ b/src/db/postgresql/migration/V20180604_1707__mantis11273.sql
@@ -0,0 +1,8 @@
+DO $$
+BEGIN
+  ALTER TABLE BPE ADD COLUMN TROCO NUMERIC(10,2);
+  ALTER TABLE BPE ADD COLUMN VALORPAGO NUMERIC(10,2);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180605_1649__mantis11132.sql b/src/db/postgresql/migration/V20180605_1649__mantis11132.sql
new file mode 100644
index 000000000..0eac237a2
--- /dev/null
+++ b/src/db/postgresql/migration/V20180605_1649__mantis11132.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE EMPRESA ADD COLUMN INDCANCELABPETROCAORIGDEST NUMERIC(1,0);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180606_1112__mantis11299.sql b/src/db/postgresql/migration/V20180606_1112__mantis11299.sql
new file mode 100644
index 000000000..a34efc951
--- /dev/null
+++ b/src/db/postgresql/migration/V20180606_1112__mantis11299.sql
@@ -0,0 +1,8 @@
+DO $$
+BEGIN
+  insert into funcion_sistema (funcionsistema_id,sistema_id,nombfuncion,descruta,activo,fecmodif,usuario_id) 
+  values (nextval('funcion_sistema_seq'),2,'ADM > CONFIGURCAO COMERCIAL > PRESTACAO CONTAS > RECALCULO DE COMISSAO > AUTORIZACAO > PERMITE CALCULO TODAS AGENCIAS','COM.RJCONSULTORES.ADM.CALCULODIARIOCOMISSAO.AUTORIZACAOCALCULOTODASAGENCIAS',1,now(),1);  
+
+  EXCEPTION WHEN unique_violation THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180606_1404__mantis11299.sql b/src/db/postgresql/migration/V20180606_1404__mantis11299.sql
new file mode 100644
index 000000000..2abdfb5f2
--- /dev/null
+++ b/src/db/postgresql/migration/V20180606_1404__mantis11299.sql
@@ -0,0 +1,26 @@
+DO $$
+BEGIN
+  ALTER TABLE COMISSAO_RECEITA 
+    ALTER COLUMN BPR TYPE NUMERIC(13,2),
+    ALTER COLUMN GAP TYPE NUMERIC(13,2),
+    ALTER COLUMN IMPGAP TYPE NUMERIC(13,2),
+    ALTER COLUMN INTERNET TYPE NUMERIC(13,2),
+    ALTER COLUMN CANCELADOS TYPE NUMERIC(13,2),
+    ALTER COLUMN CANCELGAP TYPE NUMERIC(13,2),
+    ALTER COLUMN DEVOLVIDOS TYPE NUMERIC(13,2),
+    ALTER COLUMN DEVGAP TYPE NUMERIC(13,2),
+    ALTER COLUMN EXCESSO_BAGAGEM TYPE NUMERIC(13,2),
+    ALTER COLUMN SEG_OPCIONAL TYPE NUMERIC(13,2),
+    ALTER COLUMN RECEITA_OUTROS TYPE NUMERIC(13,2),
+    ALTER COLUMN DEVOLVIDOS_ORIGEM TYPE NUMERIC(13,2),
+    ALTER COLUMN DEVOLVIDOS_ORIGEM_GAP TYPE NUMERIC(13,2),
+    ALTER COLUMN QTDE_IMPGAP TYPE NUMERIC(13,2),
+    ALTER COLUMN COMISSAO_BPR TYPE NUMERIC(13,2),
+    ALTER COLUMN COMISSAO_ENTREGA_PASSAGEM TYPE NUMERIC(13,2),
+    ALTER COLUMN COMISSAO_ENTREGA_BAGAGEM TYPE NUMERIC(13,2),
+    ALTER COLUMN COMISSAO_SEG_OPCIONAL TYPE NUMERIC(13,2),
+    ALTER COLUMN COMISSAO_OUTROS TYPE NUMERIC(13,2);
+
+  EXCEPTION WHEN OTHERS THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180606_1610__mantis11304.sql b/src/db/postgresql/migration/V20180606_1610__mantis11304.sql
new file mode 100644
index 000000000..77ac4559e
--- /dev/null
+++ b/src/db/postgresql/migration/V20180606_1610__mantis11304.sql
@@ -0,0 +1,9 @@
+DO $$
+BEGIN
+  CREATE UNIQUE INDEX PK__BPE__BPE_ID ON BPE (BPE_ID);
+  CREATE INDEX IDX__BPE_BOLETO ON BPE (BOLETO_ID);
+  CREATE INDEX IDX__BPE_BPESUBSTITUICAO ON BPE (BPESUBSTITUICAO_ID);
+  
+  EXCEPTION WHEN duplicate_table THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180606_1611__mantis11304.sql b/src/db/postgresql/migration/V20180606_1611__mantis11304.sql
new file mode 100644
index 000000000..03461315e
--- /dev/null
+++ b/src/db/postgresql/migration/V20180606_1611__mantis11304.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE BPE ADD CONSTRAINT BPE_BOLETO FOREIGN KEY (BOLETO_ID) REFERENCES BOLETO (BOLETO_ID);
+  
+  EXCEPTION WHEN duplicate_object THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180608_1800__mantis10074.sql b/src/db/postgresql/migration/V20180608_1800__mantis10074.sql
new file mode 100644
index 000000000..185d333da
--- /dev/null
+++ b/src/db/postgresql/migration/V20180608_1800__mantis10074.sql
@@ -0,0 +1,30 @@
+DO $$
+BEGIN
+  CREATE TABLE FACTURACION_SICFE (
+		FACTURACIONSICFE_ID NUMERIC(7) NOT NULL,
+		TIPOCFE NUMERIC(5),
+		SERIE VARCHAR(20),
+		NUMFISCALCFE NUMERIC(20),
+		RUTEMISOR NUMERIC(12),
+		HASH  VARCHAR(50),
+		TELEFONO VARCHAR(14),
+		NUMOPERACION VARCHAR(36),
+		PDFSICFE bytea,
+        ACTIVO SMALLINT,
+        FECMODIF TIME without TIME zone,
+        USUARIO_ID NUMERIC(7),
+        PRIMARY KEY (FACTURACIONSICFE_ID)
+	);
+	
+  CREATE SEQUENCE FACTURACION_SICFE_SEQ INCREMENT BY 1 START WITH 1 NO CYCLE;
+
+  ALTER TABLE PUNTO_VENTA ADD COLUMN SUCURSALDGI VARCHAR(10);
+  ALTER TABLE EMPRESA ADD COLUMN TIPOTASA VARCHAR(1);
+  ALTER TABLE EMPRESA ADD COLUMN PORCTASA NUMERIC(4,2);
+  
+  EXCEPTION 
+    WHEN duplicate_table THEN NULL;
+    WHEN duplicate_object THEN NULL;
+    WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180611_1050__mantis10873.sql b/src/db/postgresql/migration/V20180611_1050__mantis10873.sql
new file mode 100644
index 000000000..80ee64136
--- /dev/null
+++ b/src/db/postgresql/migration/V20180611_1050__mantis10873.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE BPE ALTER COLUMN RETORNO_ID TYPE VARCHAR(50);
+  
+  EXCEPTION WHEN OTHERS THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180612_1421__mantis11340.sql b/src/db/postgresql/migration/V20180612_1421__mantis11340.sql
new file mode 100644
index 000000000..cf7d05531
--- /dev/null
+++ b/src/db/postgresql/migration/V20180612_1421__mantis11340.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE EMPRESA ADD COLUMN INDTRANSFERENCIABPEMOVICAJA NUMERIC(1,0);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180613_1420__mantis11130.sql b/src/db/postgresql/migration/V20180613_1420__mantis11130.sql
new file mode 100644
index 000000000..5472fdf33
--- /dev/null
+++ b/src/db/postgresql/migration/V20180613_1420__mantis11130.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE MD_LOG ALTER COLUMN OBSERVACAO TYPE VARCHAR(300);
+  
+  EXCEPTION WHEN OTHERS THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180613_1650__mantis11130.sql b/src/db/postgresql/migration/V20180613_1650__mantis11130.sql
new file mode 100644
index 000000000..7f6db6c34
--- /dev/null
+++ b/src/db/postgresql/migration/V20180613_1650__mantis11130.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE MD_LOG ADD COLUMN VERSAO NUMERIC(8);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180614_1830__mantis11130.sql b/src/db/postgresql/migration/V20180614_1830__mantis11130.sql
new file mode 100644
index 000000000..51f1e38c5
--- /dev/null
+++ b/src/db/postgresql/migration/V20180614_1830__mantis11130.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE MD_LOG ADD COLUMN USUARIO_ID NUMERIC(7);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180615_1525__mantis11386.sql b/src/db/postgresql/migration/V20180615_1525__mantis11386.sql
new file mode 100644
index 000000000..71409ea18
--- /dev/null
+++ b/src/db/postgresql/migration/V20180615_1525__mantis11386.sql
@@ -0,0 +1,2 @@
+UPDATE PTOVTA_SEGURO SET INDVENDSEGTABELA = 1 WHERE INDVENDSEGTABELA IS NULL OR INDVENDSEGTABELA = 0;
+UPDATE PTOVTA_SEGURO SET INDESTANSEGTABELA = 1 WHERE INDESTANSEGTABELA IS NULL OR INDESTANSEGTABELA = 0;
\ No newline at end of file
diff --git a/src/db/postgresql/migration/V20180627_1644__mantis11406.sql b/src/db/postgresql/migration/V20180627_1644__mantis11406.sql
new file mode 100644
index 000000000..c79d528c5
--- /dev/null
+++ b/src/db/postgresql/migration/V20180627_1644__mantis11406.sql
@@ -0,0 +1,11 @@
+DO $$
+BEGIN
+  ALTER TABLE FISCAL_IMPRESSORA ADD COLUMN INTEGRADOTOTVS NUMERIC(1,0);
+  ALTER TABLE FISCAL_IMPRESSORA ADD COLUMN ERRO VARCHAR(4000);
+  
+  ALTER TABLE FISCAL_R2 ADD COLUMN INTEGRADOTOTVS NUMERIC(1,0);
+  ALTER TABLE FISCAL_R2 ADD COLUMN ERRO VARCHAR(4000);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180628_1800__mantis10971.sql b/src/db/postgresql/migration/V20180628_1800__mantis10971.sql
new file mode 100644
index 000000000..22eb88441
--- /dev/null
+++ b/src/db/postgresql/migration/V20180628_1800__mantis10971.sql
@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  ALTER TABLE EMPRESA ADD COLUMN INDUSAALIASLOCALIDADE NUMERIC(1,0);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;
diff --git a/src/db/postgresql/migration/V20180703_1104__mantis11325.sql b/src/db/postgresql/migration/V20180703_1104__mantis11325.sql
new file mode 100644
index 000000000..94c739d17
--- /dev/null
+++ b/src/db/postgresql/migration/V20180703_1104__mantis11325.sql
@@ -0,0 +1,8 @@
+DO $$
+BEGIN
+  ALTER TABLE EVENTO_EXTRA ADD COLUMN ERRO VARCHAR(4000);
+  ALTER TABLE TIPO_EVENTO_EXTRA ADD COLUMN ERRO VARCHAR(4000);
+  
+  EXCEPTION WHEN duplicate_column THEN NULL;
+END
+$$;