From 28ac2839fb933147caffe3294df25cc077e41f09 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 28 Nov 2018 15:03:52 +0100
Subject: [PATCH] Merge branch 'next_version'
---
.gitignore | 2 --
web_service/sql/sqlQueries.xml | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 98ef169d..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-web_service/conf/properties*
-web_service/conf/version.inc
diff --git a/web_service/sql/sqlQueries.xml b/web_service/sql/sqlQueries.xml
index a61dcbb2..2249532b 100644
--- a/web_service/sql/sqlQueries.xml
+++ b/web_service/sql/sqlQueries.xml
@@ -1515,7 +1515,7 @@
ALTER TABLE ONLY "s_cadastre"."tc_sym" ADD CONSTRAINT "tc_sym_pkey" PRIMARY KEY ("sym_code");
ALTER TABLE ONLY "s_cadastre"."tc_can" ADD CONSTRAINT "tc_can_pkey" PRIMARY KEY ("can_code");
ALTER TABLE ONLY "s_cadastre"."tc_copl" ADD CONSTRAINT "tc_copl_pkey" PRIMARY KEY ("copl_code");
- CREATE TABLE "s_cadastre".version ( version character varying(10) NOT NULL, build integer NOT NULL, date timestamp with time zone NOT NULL, active boolean ) WITH (OIDS = FALSE);
+ CREATE TABLE "s_cadastre".version ( version character varying(100) NOT NULL, build integer NOT NULL, date timestamp with time zone NOT NULL, active boolean ) WITH (OIDS = FALSE);
ALTER TABLE "s_cadastre".version OWNER TO u_vitis;
CREATE TABLE "s_cadastre".batiment (id bigserial NOT NULL,id_com character(5) NOT NULL,dur_code character (2),pre character(3),section character(2), geom public.geometry(MultiPolygon), CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = $(SRID))) WITH (OIDS=FALSE);
ALTER TABLE "s_cadastre".batiment OWNER TO u_vitis;
--
GitLab