[Globalstore-code] [Global-Store Repo] Global Store branch, master, updated. 875f23f0be21120b15806ba47d88cb52d0484a70

[Eduardo G. <my4...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Global Store".

The branch, master has been updated
       via  875f23f0be21120b15806ba47d88cb52d0484a70 (commit)
       via  f6ceefff8fa7f2b8086331224cd15b4136ae0c3a (commit)
      from  f13dc295c3e0f1468de75f6da38efc9a321517b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 875f23f0be21120b15806ba47d88cb52d0484a70
Merge: f6ceeff f13dc29
Author: Eduardo <epp...@gm...>
Date:   Sat Jan 24 00:55:12 2015 -0430

    Merge branch 'master' of ssh://git.code.sf.net/p/globalstore/code


commit f6ceefff8fa7f2b8086331224cd15b4136ae0c3a
Author: Eduardo <epp...@gm...>
Date:   Sat Jan 24 00:54:37 2015 -0430

    Documentos drops, constrain, vistas

diff --git a/docs/Entrega IV/Vistas.sql b/docs/Entrega IV/Vistas.sql
index 7e41c7c..b46e695 100644
--- a/docs/Entrega IV/Vistas.sql	
+++ b/docs/Entrega IV/Vistas.sql	
@@ -63,7 +63,7 @@ CREATE VIEW REPORT_5 AS (
     JOIN FROM_PLACE F ON D.FK_Place=F.Pla_Id
     JOIN PLACE P ON P.Pla_ID=F.Path
     JOIN APPLICATION AS A ON A.fk_Developer=D.Dev_ID
-	GROUP BY D.dev_id, d.dev_name , F.path, P.pla_id,P.Pla_name;
+	GROUP BY D.dev_id, d.dev_name , F.path, P.pla_id,P.Pla_name
 );
 
 CREATE VIEW REPORT_6 AS (
@@ -363,13 +363,13 @@ CREATE VIEW REPORT_39 AS (
 );
 
 CREATE VIEW REPORT_40 AS (
-	select dev_id, dev_name as desarrollador, extract(isoyear from inv_emission_date) as "Año", count(pur_id) as "Descargas", sum(pur_cost) as "Ingresos"
+	select dev_id, dev_name as desarrollador, extract(isoyear from inv_emission_date) as fecha, count(pur_id) as "Descargas", sum(pur_cost) as "Ingresos"
 	from developer
 		join application on fk_developer=dev_id
 		join purchase on application.fk_content=purchase.fk_content
 		join invoice on inv_id=fk_invoice
-	group by "Año", dev_name, dev_id
-	order by "Año"
+	group by fecha, dev_name, dev_id
+	order by fecha
 );
 
 
diff --git a/src/sql/constraints.sql b/src/sql/constraints.sql
index 41d46b3..2a58a52 100644
--- a/src/sql/constraints.sql
+++ b/src/sql/constraints.sql
@@ -1059,15 +1059,6 @@ Descripcion: Un grupo de reporte puede tener subgrupos de reportes, esta relacio
 
 ALTER TABLE GROUP_REPORT ADD CONSTRAINT FK_GROUP_REPORT_GROUP_REPORT FOREIGN KEY (FK_Group_Report) REFERENCES GROUP_REPORT (GR_ID) ON DELETE RESTRICT ON UPDATE CASCADE;
 
-/*FK_SYS_MODULE_GROUP_REPORT
-SYS_MODULE->GROUP_REPORT
-Entidad: GROUP_REPORT
-Descripcion: Un grupo de reporte pertenece a un modulo del sistema, esta relacion se denota en FK_Sys_Module
-25/11/14
-*/
-
-ALTER TABLE GROUP_REPORT ADD CONSTRAINT FK_SYS_MODULE_GROUP_REPORT FOREIGN KEY (FK_Sys_Module) REFERENCES SYS_MODULE (SM_ID) ON DELETE RESTRICT ON UPDATE CASCADE;
-
 /*FK_WEB_CONT_IMAGE
 WEB_CONT->IMAGE
 Entidad:IMAGE
diff --git a/src/sql/drops.sql b/src/sql/drops.sql
index 74aab7e..4e686fb 100644
--- a/src/sql/drops.sql
+++ b/src/sql/drops.sql
@@ -15,6 +15,7 @@ DROP TABLE IF EXISTS Tabla;
 */
 
 /*--------------------------------ELIMINACION DE LAS VISTAS----------------------------------------------------------*/
+
 DROP VIEW REPORT_40;
 DROP VIEW REPORT_39;
 DROP VIEW REPORT_38;
@@ -249,13 +250,6 @@ GROUP_REPORT
 
 ALTER TABLE GROUP_REPORT DROP CONSTRAINT FK_GROUP_REPORT_GROUP_REPORT ;
 
-/*FK_SYS_MODULE_GROUP_REPORT
-GROUP_REPORT
-25/11/14
-*/
-
-ALTER TABLE GROUP_REPORT DROP CONSTRAINT FK_SYS_MODULE_GROUP_REPORT ;
-
 /*FK_WEB_CONT_IMAGE
 IMAGE
 25/11/14

-----------------------------------------------------------------------

Summary of changes:
 docs/Entrega IV/Vistas.sql |    8 ++++----
 src/sql/constraints.sql    |    9 ---------
 src/sql/drops.sql          |    8 +-------
 3 files changed, 5 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Global Store