[opencimetiere-Commits] r859 - in trunk: . data/pgsql

[sof...@adullact.net]

Author: softime
Date: 2018-12-27 11:42:32 +0100 (Thu, 27 Dec 2018)
New Revision: 859

Added:
trunk/data/pgsql/v4.0.0.sql
Removed:
trunk/data/pgsql/v4.0.0.dev0.init_data.sql
trunk/data/pgsql/v4.0.0.dev0.sql
Modified:
trunk/HISTORY.txt
trunk/VERSION.txt
trunk/data/pgsql/init_metier.sql
trunk/data/pgsql/install.sql
Log:
* Preparation release : 4.0.0

Modified: trunk/HISTORY.txt
===================================================================
--- trunk/HISTORY.txt 2018-12-27 09:33:45 UTC (rev 858)
+++ trunk/HISTORY.txt 2018-12-27 10:42:32 UTC (rev 859)
@@ -1,7 +1,7 @@
openCimetière Historique des versions
=====================================

-4.0.0 (unreleased)
+4.0.0 (27/12/2018)
------------------

* Évolution : Amélioration de la vue synthétique des emplacements sur la carte.

Modified: trunk/VERSION.txt
===================================================================
--- trunk/VERSION.txt 2018-12-27 09:33:45 UTC (rev 858)
+++ trunk/VERSION.txt 2018-12-27 10:42:32 UTC (rev 859)
@@ -1 +1 @@
-4.0.0.dev0
\ No newline at end of file
+4.0.0

Modified: trunk/data/pgsql/init_metier.sql
===================================================================
--- trunk/data/pgsql/init_metier.sql 2018-12-27 09:33:45 UTC (rev 858)
+++ trunk/data/pgsql/init_metier.sql 2018-12-27 10:42:32 UTC (rev 859)
@@ -6,6 +6,7 @@
-- SET lock_timeout = 0;
-- SET client_encoding = 'UTF8';
-- SET standard_conforming_strings = on;
+-- SELECT pg_catalog.set_config('search_path', '', false);
-- SET check_function_bodies = false;
-- SET client_min_messages = warning;

@@ -16,13 +17,6 @@
-- CREATE SCHEMA opencimetiere;


--- SET search_path = opencimetiere, pg_catalog;
-
-
---
--- Name: updatecorps(text, text); Type: FUNCTION; Schema: opencimetiere; Owner: -
---
-
-- SET default_tablespace = '';

-- SET default_with_oids = false;
@@ -435,6 +429,50 @@


--
+-- Name: voie; Type: TABLE; Schema: opencimetiere; Owner: -; Tablespace:
+--
+
+CREATE TABLE voie (
+ voie integer NOT NULL,
+ zone integer NOT NULL,
+ voietype integer NOT NULL,
+ voielib character varying(40) NOT NULL,
+ geom public.geometry(MultiPolygon,2154)
+);
+
+
+--
+-- Name: zone; Type: TABLE; Schema: opencimetiere; Owner: -; Tablespace:
+--
+
+CREATE TABLE zone (
+ zone integer NOT NULL,
+ cimetiere integer NOT NULL,
+ zonetype integer NOT NULL,
+ zonelib character varying(40) NOT NULL,
+ geom public.geometry(MultiPolygon,2154)
+);
+
+
+--
+-- Name: geo_loc_emplacement; Type: VIEW; Schema: opencimetiere; Owner: -
+--
+
+CREATE VIEW geo_loc_emplacement AS
+ SELECT e.emplacement,
+ CASE
+ WHEN (v.geom IS NOT NULL) THEN (public.st_boundary(v.geom))::public.geometry(MultiLineString,2154)
+ WHEN (z.geom IS NOT NULL) THEN (public.st_boundary(z.geom))::public.geometry(MultiLineString,2154)
+ ELSE (public.st_boundary(c.geom))::public.geometry(MultiLineString,2154)
+ END AS geom
+ FROM (((emplacement e
+ JOIN voie v ON ((e.voie = v.voie)))
+ JOIN zone z ON ((z.zone = v.zone)))
+ JOIN cimetiere c ON ((c.cimetiere = z.cimetiere)))
+ WHERE (((v.geom IS NOT NULL) OR (z.geom IS NOT NULL)) OR (c.geom IS NOT NULL));
+
+
+--
-- Name: numdossier_seq; Type: SEQUENCE; Schema: opencimetiere; Owner: -
--

@@ -781,19 +819,6 @@


--
--- Name: voie; Type: TABLE; Schema: opencimetiere; Owner: -; Tablespace:
---
-
-CREATE TABLE voie (
- voie integer NOT NULL,
- zone integer NOT NULL,
- voietype integer NOT NULL,
- voielib character varying(40) NOT NULL,
- geom public.geometry(MultiPolygon,2154)
-);
-
-
---
-- Name: voie_seq; Type: SEQUENCE; Schema: opencimetiere; Owner: -
--

@@ -846,19 +871,6 @@


--
--- Name: zone; Type: TABLE; Schema: opencimetiere; Owner: -; Tablespace:
---
-
-CREATE TABLE zone (
- zone integer NOT NULL,
- cimetiere integer NOT NULL,
- zonetype integer NOT NULL,
- zonelib character varying(40) NOT NULL,
- geom public.geometry(MultiPolygon,2154)
-);
-
-
---
-- Name: zone_seq; Type: SEQUENCE; Schema: opencimetiere; Owner: -
--

@@ -910,19 +922,6 @@
ALTER SEQUENCE zone_type_seq OWNED BY zone_type.zone_type;


-CREATE OR REPLACE VIEW geo_loc_emplacement AS
-SELECT e.emplacement,
- CASE WHEN v.geom IS NOT NULL THEN st_boundary(v.geom)::geometry(MultiLineString,2154)
- WHEN z.geom IS NOT NULL THEN st_boundary(z.geom)::geometry(MultiLineString,2154)
- ELSE st_boundary(c.geom)::geometry(MultiLineString,2154)
- END AS geom
-FROM emplacement e
-JOIN voie v ON e.voie = v.voie
-JOIN zone z ON z.zone = v.zone
-JOIN cimetiere c ON c.cimetiere = z.cimetiere
-WHERE v.geom IS NOT NULL OR z.geom IS NOT NULL OR c.geom IS NOT NULL;
-
-
--
-- Name: autorisation_archive_pkey; Type: CONSTRAINT; Schema: opencimetiere; Owner: -; Tablespace:
--

Modified: trunk/data/pgsql/install.sql
===================================================================
--- trunk/data/pgsql/install.sql 2018-12-27 09:33:45 UTC (rev 858)
+++ trunk/data/pgsql/install.sql 2018-12-27 10:42:32 UTC (rev 859)
@@ -36,8 +36,8 @@
\i ../../core/data/pgsql/init_parametrage.sql

-- Mise à jour depuis la dernière version (en cours de développement)
-\i v4.0.0.dev0.sql
-\i v4.0.0.dev0.init_data.sql
+--\i v4.0.0.dev0.sql
+--\i v4.0.0.dev0.init_data.sql

--
COMMIT;

Deleted: trunk/data/pgsql/v4.0.0.dev0.init_data.sql
===================================================================
Deleted: trunk/data/pgsql/v4.0.0.dev0.sql
===================================================================
--- trunk/data/pgsql/v4.0.0.dev0.sql 2018-12-27 09:33:45 UTC (rev 858)
+++ trunk/data/pgsql/v4.0.0.dev0.sql 2018-12-27 10:42:32 UTC (rev 859)
@@ -1,20 +0,0 @@
---------------------------------------------------------------------------------
--- Script de mise à jour vers la version v4.0.0 d'openCimetière
---
--- @package opencimetiere
--- @version SVN : $Id$
--------------------------------------------------------------------------------
-
---
--- Mise à jour vers la version v4.6.0 du framework - BEGIN
---
---\i ../../core/data/pgsql/v4.6.0.sql
---
--- Mise à jour vers la version v4.6.0 du framework - END
---
-
---
--- Correction du bug #????
---
-UPDATE operation set categorie='reduction' where categorie='reduction_enfeu';
-

Copied: trunk/data/pgsql/v4.0.0.sql (from rev 858, trunk/data/pgsql/v4.0.0.dev0.sql)
===================================================================
--- trunk/data/pgsql/v4.0.0.sql (rev 0)
+++ trunk/data/pgsql/v4.0.0.sql 2018-12-27 10:42:32 UTC (rev 859)
@@ -0,0 +1,18 @@
+--------------------------------------------------------------------------------
+-- Script de mise à jour vers la version v4.0.0 d'openCimetière
+--
+-- @package opencimetiere
+-- @version SVN : $Id$
+-------------------------------------------------------------------------------
+
+--
+-- BEGIN / [#9017] Mise à jour du framework openMairie vers la version 4.9.0
+--
+
+-- Les scripts app/ liés aux opérations sont désormais gérés dans des méthodes
+-- de la classe opération
+UPDATE operation set categorie = 'reduction' where categorie = 'reduction_enfeu';
+
+--
+-- END / [#9017] Mise à jour du framework openMairie vers la version 4.9.0
+--