Author: josx Date: 2007-02-28 12:19:55 -0300 (Wed, 28 Feb 2007) New Revision: 4339 Modified: prosistem/alba/trunk/alba/config/schema.xml prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql prosistem/alba/trunk/alba/data/sql/schema.sql prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php Log: Cambie en la base el campo fk_conceptobaja_id de la tabla alumno ( de obligatorio a no obligatorio ) Modified: prosistem/alba/trunk/alba/config/schema.xml =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/config/schema.xml 2007-02-28 15:19:55 UTC (rev 4339) @@ -246,7 +246,7 @@ <column name="fk_cuenta_id" type="INTEGER" required="true" default="0"/> <column name="certificado_medico" type="boolean" required="true" default="0"/> <column name="activo" type="boolean" required="true" default="true"/> - <column name="fk_conceptobaja_id" type="INTEGER" required="true" default="0"/> + <column name="fk_conceptobaja_id" type="INTEGER" required="false"/> <column name="fk_pais_id" type="INTEGER" required="true" default="0"/> <foreign-key foreignTable="tipodocumento"> <reference local="fk_tipodocumento_id" foreign="id"/> Modified: prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/data/sql/actualizacion_1.0b_a_1.0rc.sql 2007-02-28 15:19:55 UTC (rev 4339) @@ -107,4 +107,6 @@ ALTER TABLE `alumno` ADD `lugar_nacimiento` VARCHAR( 128 ) NOT NULL AFTER `id` , ADD `fk_pais_id` INT NOT NULL AFTER `lugar_nacimiento` ; -SET FOREIGN_KEY_CHECKS = 1; +ALTER TABLE `alumno` CHANGE `fk_cuenta_id` `fk_cuenta_id` INT NULL; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file Modified: prosistem/alba/trunk/alba/data/sql/schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/schema.sql 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/data/sql/schema.sql 2007-02-28 15:19:55 UTC (rev 4339) @@ -482,7 +482,7 @@ `fk_cuenta_id` INTEGER default 0 NOT NULL, `certificado_medico` INTEGER default 0 NOT NULL, `activo` INTEGER default 1 NOT NULL, - `fk_conceptobaja_id` INTEGER default 0 NOT NULL, + `fk_conceptobaja_id` INTEGER, `fk_pais_id` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`), INDEX `alumno_FI_1` (`fk_tipodocumento_id`), Modified: prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-02-28 15:19:55 UTC (rev 4339) @@ -106,7 +106,7 @@ $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); - $tMap->addForeignKey('FK_CONCEPTOBAJA_ID', 'FkConceptobajaId', 'int', CreoleTypes::INTEGER, 'conceptobaja', 'ID', true, null); + $tMap->addForeignKey('FK_CONCEPTOBAJA_ID', 'FkConceptobajaId', 'int', CreoleTypes::INTEGER, 'conceptobaja', 'ID', false, null); $tMap->addForeignKey('FK_PAIS_ID', 'FkPaisId', 'int', CreoleTypes::INTEGER, 'pais', 'ID', true, null); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-02-28 15:03:54 UTC (rev 4338) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-02-28 15:19:55 UTC (rev 4339) @@ -179,7 +179,7 @@ * The value for the fk_conceptobaja_id field. * @var int */ - protected $fk_conceptobaja_id = 0; + protected $fk_conceptobaja_id; /** @@ -958,7 +958,7 @@ public function setFkConceptobajaId($v) { - if ($this->fk_conceptobaja_id !== $v || $v === 0) { + if ($this->fk_conceptobaja_id !== $v) { $this->fk_conceptobaja_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_CONCEPTOBAJA_ID; } @@ -2151,7 +2151,7 @@ if ($v === null) { - $this->setFkConceptobajaId('0'); + $this->setFkConceptobajaId(NULL); } else { $this->setFkConceptobajaId($v->getId()); }