[Alba-desarrollo] SVN Alba r4795 - prosistem/alba/trunk/alba/data/sql

[commits en pressenter.com.ar]

Author: hsanchez
Date: 2007-07-02 13:44:23 -0300 (Mon, 02 Jul 2007)
New Revision: 4795

Modified:
   prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql
   prosistem/alba/trunk/alba/data/sql/schema.sql
Log:
Nuevo Estructura de DB, modificando  rel_activdad_docente

Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql
===================================================================
--- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql	2007-06-29 17:38:51 UTC (rev 4794)
+++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0rc_a_1.0rc2.sql	2007-07-02 16:44:23 UTC (rev 4795)
@@ -71,7 +71,9 @@
 
 ALTER TABLE responsable DROP COLUMN relacion;
 
-SET FOREIGN_KEY_CHECKS = 1;
 ALTER TABLE tipoiva ADD COLUMN orden INT DEFAULT 0 NOTt NULL;
 
+ALTER TABLE `rel_actividad_docente` DROP COLUMN id;
+ALTER TABLE `rel_actividad_docente` ADD PRIMARY KEY ( `fk_actividad_id` , `fk_docente_id` ) ;
 
+SET FOREIGN_KEY_CHECKS = 1;

Modified: prosistem/alba/trunk/alba/data/sql/schema.sql
===================================================================
--- prosistem/alba/trunk/alba/data/sql/schema.sql	2007-06-29 17:38:51 UTC (rev 4794)
+++ prosistem/alba/trunk/alba/data/sql/schema.sql	2007-07-02 16:44:23 UTC (rev 4795)
@@ -398,6 +398,7 @@
 	`id` INTEGER  NOT NULL,
 	`nombre` VARCHAR(128) default '' NOT NULL,
 	`descripcion` VARCHAR(255) default '',
+	`orden` INTEGER default 0,
 	PRIMARY KEY (`id`)
 )Type=InnoDB;
 
@@ -1218,15 +1219,13 @@
 
 CREATE TABLE `rel_actividad_docente`
 (
-	`id` INTEGER(11)  NOT NULL AUTO_INCREMENT,
-	`fk_actividad_id` INTEGER(11) default 0 NOT NULL,
-	`fk_docente_id` INTEGER(11) default 0 NOT NULL,
-	PRIMARY KEY (`id`),
+	`fk_actividad_id` INTEGER(11)  NOT NULL,
+	`fk_docente_id` INTEGER(11)  NOT NULL,
+	PRIMARY KEY (`fk_actividad_id`,`fk_docente_id`),
 	INDEX `rel_actividad_docente_FI_1` (`fk_docente_id`),
 	CONSTRAINT `rel_actividad_docente_FK_1`
 		FOREIGN KEY (`fk_docente_id`)
 		REFERENCES `docente` (`id`),
-	INDEX `rel_actividad_docente_FI_2` (`fk_actividad_id`),
 	CONSTRAINT `rel_actividad_docente_FK_2`
 		FOREIGN KEY (`fk_actividad_id`)
 		REFERENCES `actividad` (`id`)
@@ -1281,20 +1280,6 @@
 )Type=InnoDB;
 
 #-----------------------------------------------------------------------------
-#-- legajocategoria
-#-----------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS `legajocategoria`;
-
-
-CREATE TABLE `legajocategoria`
-(
-	`id` INTEGER(11)  NOT NULL AUTO_INCREMENT,
-	`descripcion` VARCHAR(255)  NOT NULL,
-	PRIMARY KEY (`id`)
-)Type=InnoDB;
-
-#-----------------------------------------------------------------------------
 #-- horarioescolar
 #-----------------------------------------------------------------------------