July 2007 - Alba-desarrollo - lists.ourproject.org

SVN Alba r4797 - prosistem/alba/trunk/alba/config
by commits＠pressenter.com.ar 02 Jul '07

02 Jul '07

Author: hsanchez Date: 2007-07-02 13:45:54 -0300 (Mon, 02 Jul 2007) New Revision: 4797 Modified: prosistem/alba/trunk/alba/config/schema.xml Log: Cambiando el schema para rel_actividad_docente Modified: prosistem/alba/trunk/alba/config/schema.xml =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml 2007-07-02 16:45:01 UTC (rev 4796) +++ prosistem/alba/trunk/alba/config/schema.xml 2007-07-02 16:45:54 UTC (rev 4797) @@ -642,9 +642,8 @@ <column name="orden" type="integer" size="11" required="false" default="0"/> </table> <table name="rel_actividad_docente" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="fk_actividad_id" type="integer" size="11" required="true" default="0"/> - <column name="fk_docente_id" type="integer" size="11" required="true" default="0"/> + <column name="fk_actividad_id" type="integer" size="11" required="true" primaryKey="true"/> + <column name="fk_docente_id" type="integer" size="11" required="true" primaryKey="true"/> <foreign-key foreignTable="docente"> <reference local="fk_docente_id" foreign="id"/> </foreign-key> @@ -677,10 +676,6 @@ <reference local="fk_ciclolectivo_id" foreign="id"/> </foreign-key> </table> - <table name="legajocategoria" idMethod="native"> - <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> - <column name="descripcion" type="varchar" size="255" required="true"/> - </table> <table name="horarioescolar" idMethod="native"> <column name="id" type="integer" size="11" required="true" autoIncrement="true" primaryKey="true"/> <column name="dia" type="integer" size="11" required="true" default="0"/>

1 0

SVN Alba r4796 - in prosistem/alba/trunk/alba/lib/model: map om
by commits＠pressenter.com.ar 02 Jul '07

02 Jul '07

Author: hsanchez Date: 2007-07-02 13:45:01 -0300 (Mon, 02 Jul 2007) New Revision: 4796 Modified: prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DocenteHorarioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/MenuMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ModuloMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelRolPermisoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPermisoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/TurnosMapBuilder.php prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseActividadPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php prosistem/alba/trunk/alba/lib/model/om/BaseAsistenciaPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividadesPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptualPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseConcepto.php prosistem/alba/trunk/alba/lib/model/om/BaseConceptoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php prosistem/alba/trunk/alba/lib/model/om/BaseDivisionPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseDocentePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php prosistem/alba/trunk/alba/lib/model/om/BaseEscalanotaPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php prosistem/alba/trunk/alba/lib/model/om/BaseEspacioPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php prosistem/alba/trunk/alba/lib/model/om/BaseExamenPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php prosistem/alba/trunk/alba/lib/model/om/BaseFeriadoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajocategoria.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php prosistem/alba/trunk/alba/lib/model/om/BaseLocacionPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseMenu.php prosistem/alba/trunk/alba/lib/model/om/BaseMenuPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php prosistem/alba/trunk/alba/lib/model/om/BasePais.php prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php prosistem/alba/trunk/alba/lib/model/om/BasePeriodoPeer.php prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php prosistem/alba/trunk/alba/lib/model/om/BasePermisoPeer.php prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php prosistem/alba/trunk/alba/lib/model/om/BaseProvinciaPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacion.php prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacionPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermiso.php prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermisoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsablePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermiso.php prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermisoPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPreferencia.php prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php prosistem/alba/trunk/alba/lib/model/om/BaseRol.php prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php prosistem/alba/trunk/alba/lib/model/om/BaseTurnosPeer.php prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php prosistem/alba/trunk/alba/lib/model/om/BaseUsuarioPeer.php Log: Nuevo modelo cambiando pk de rel_actividad_docente Modified: prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ActividadMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ActividadMapBuilder { - const CLASS_NAME = 'lib.model.map.ActividadMapBuilder'; + const CLASS_NAME = 'lib.model.map.ActividadMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('actividad'); $tMap->setPhpName('Actividad'); @@ -39,6 +39,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/AdjuntoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class AdjuntoMapBuilder { - const CLASS_NAME = 'lib.model.map.AdjuntoMapBuilder'; + const CLASS_NAME = 'lib.model.map.AdjuntoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('adjunto'); $tMap->setPhpName('Adjunto'); @@ -44,7 +44,7 @@ $tMap->addColumn('RUTA', 'Ruta', 'string', CreoleTypes::VARCHAR, true, 255); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); - - } + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/AlumnoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class AlumnoMapBuilder { - const CLASS_NAME = 'lib.model.map.AlumnoMapBuilder'; + const CLASS_NAME = 'lib.model.map.AlumnoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('alumno'); $tMap->setPhpName('Alumno'); @@ -38,7 +38,7 @@ $tMap->addColumn('APELLIDO', 'Apellido', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('FECHA_NACIMIENTO', 'FechaNacimiento', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_NACIMIENTO', 'FechaNacimiento', 'int', CreoleTypes::TIMESTAMP, true, null); $tMap->addColumn('DIRECCION', 'Direccion', 'string', CreoleTypes::VARCHAR, true, 128); @@ -56,27 +56,27 @@ $tMap->addColumn('NRO_DOCUMENTO', 'NroDocumento', 'string', CreoleTypes::VARCHAR, true, 16); - $tMap->addColumn('SEXO', 'Sexo', 'string', CreoleTypes::CHAR, true); + $tMap->addColumn('SEXO', 'Sexo', 'string', CreoleTypes::CHAR, true, 1); $tMap->addColumn('EMAIL', 'Email', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('DISTANCIA_ESCUELA', 'DistanciaEscuela', 'int', CreoleTypes::INTEGER, false); + $tMap->addColumn('DISTANCIA_ESCUELA', 'DistanciaEscuela', 'int', CreoleTypes::INTEGER, false, null); - $tMap->addColumn('HERMANOS_ESCUELA', 'HermanosEscuela', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('HERMANOS_ESCUELA', 'HermanosEscuela', 'boolean', CreoleTypes::BOOLEAN, true, null); - $tMap->addColumn('HIJO_MAESTRO_ESCUELA', 'HijoMaestroEscuela', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('HIJO_MAESTRO_ESCUELA', 'HijoMaestroEscuela', 'boolean', CreoleTypes::BOOLEAN, true, null); $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, null); $tMap->addForeignKey('FK_CUENTA_ID', 'FkCuentaId', 'int', CreoleTypes::INTEGER, 'cuenta', 'ID', true, null); - $tMap->addColumn('CERTIFICADO_MEDICO', 'CertificadoMedico', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('CERTIFICADO_MEDICO', 'CertificadoMedico', 'boolean', CreoleTypes::BOOLEAN, true, null); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, 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); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/AnioMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class AnioMapBuilder { - const CLASS_NAME = 'lib.model.map.AnioMapBuilder'; + const CLASS_NAME = 'lib.model.map.AnioMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('anio'); $tMap->setPhpName('Anio'); @@ -37,6 +37,6 @@ $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, 11); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/AsistenciaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class AsistenciaMapBuilder { - const CLASS_NAME = 'lib.model.map.AsistenciaMapBuilder'; + const CLASS_NAME = 'lib.model.map.AsistenciaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('asistencia'); $tMap->setPhpName('Asistencia'); @@ -38,7 +38,7 @@ $tMap->addForeignKey('FK_TIPOASISTENCIA_ID', 'FkTipoasistenciaId', 'int', CreoleTypes::INTEGER, 'tipoasistencia', 'ID', true, 11); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); - - } + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/BoletinActividadesMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class BoletinActividadesMapBuilder { - const CLASS_NAME = 'lib.model.map.BoletinActividadesMapBuilder'; + const CLASS_NAME = 'lib.model.map.BoletinActividadesMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('boletin_actividades'); $tMap->setPhpName('BoletinActividades'); @@ -42,9 +42,9 @@ $tMap->addForeignKey('FK_PERIODO_ID', 'FkPeriodoId', 'int', CreoleTypes::INTEGER, 'periodo', 'ID', true, 11); - $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::BLOB, true); + $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::BLOB, true, null); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); - - } + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/BoletinConceptualMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class BoletinConceptualMapBuilder { - const CLASS_NAME = 'lib.model.map.BoletinConceptualMapBuilder'; + const CLASS_NAME = 'lib.model.map.BoletinConceptualMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('boletin_conceptual'); $tMap->setPhpName('BoletinConceptual'); @@ -42,9 +42,9 @@ $tMap->addForeignKey('FK_PERIODO_ID', 'FkPeriodoId', 'int', CreoleTypes::INTEGER, 'periodo', 'ID', true, 11); - $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::BLOB, true); + $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::BLOB, true, null); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); - - } + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/CalendariovacunacionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class CalendariovacunacionMapBuilder { - const CLASS_NAME = 'lib.model.map.CalendariovacunacionMapBuilder'; + const CLASS_NAME = 'lib.model.map.CalendariovacunacionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('calendariovacunacion'); $tMap->setPhpName('Calendariovacunacion'); @@ -41,6 +41,6 @@ $tMap->addColumn('PERIODO', 'Periodo', 'string', CreoleTypes::VARCHAR, false, 128); $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/CargobajaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class CargobajaMapBuilder { - const CLASS_NAME = 'lib.model.map.CargobajaMapBuilder'; + const CLASS_NAME = 'lib.model.map.CargobajaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('cargobaja'); $tMap->setPhpName('Cargobaja'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/CiclolectivoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class CiclolectivoMapBuilder { - const CLASS_NAME = 'lib.model.map.CiclolectivoMapBuilder'; + const CLASS_NAME = 'lib.model.map.CiclolectivoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('ciclolectivo'); $tMap->setPhpName('Ciclolectivo'); @@ -36,13 +36,13 @@ $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, 11); - $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true, null); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); - $tMap->addColumn('ACTUAL', 'Actual', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('ACTUAL', 'Actual', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ConceptoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ConceptoMapBuilder { - const CLASS_NAME = 'lib.model.map.ConceptoMapBuilder'; + const CLASS_NAME = 'lib.model.map.ConceptoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('concepto'); $tMap->setPhpName('Concepto'); @@ -39,6 +39,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ConceptobajaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ConceptobajaMapBuilder { - const CLASS_NAME = 'lib.model.map.ConceptobajaMapBuilder'; + const CLASS_NAME = 'lib.model.map.ConceptobajaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('conceptobaja'); $tMap->setPhpName('Conceptobaja'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/CuentaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class CuentaMapBuilder { - const CLASS_NAME = 'lib.model.map.CuentaMapBuilder'; + const CLASS_NAME = 'lib.model.map.CuentaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('cuenta'); $tMap->setPhpName('Cuenta'); @@ -51,6 +51,6 @@ $tMap->addForeignKey('FK_PROVINCIA_ID', 'FkProvinciaId', 'int', CreoleTypes::INTEGER, 'provincia', 'ID', true, null); $tMap->addForeignKey('FK_TIPOIVA_ID', 'FkTipoivaId', 'int', CreoleTypes::INTEGER, 'tipoiva', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/DistritoescolarMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class DistritoescolarMapBuilder { - const CLASS_NAME = 'lib.model.map.DistritoescolarMapBuilder'; + const CLASS_NAME = 'lib.model.map.DistritoescolarMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('distritoescolar'); $tMap->setPhpName('Distritoescolar'); @@ -41,6 +41,6 @@ $tMap->addColumn('TELEFONO', 'Telefono', 'string', CreoleTypes::VARCHAR, false, 20); $tMap->addColumn('CIUDAD', 'Ciudad', 'string', CreoleTypes::VARCHAR, false, 128); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/DivisionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class DivisionMapBuilder { - const CLASS_NAME = 'lib.model.map.DivisionMapBuilder'; + const CLASS_NAME = 'lib.model.map.DivisionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('division'); $tMap->setPhpName('Division'); @@ -40,7 +40,7 @@ $tMap->addForeignKey('FK_TURNOS_ID', 'FkTurnosId', 'int', CreoleTypes::INTEGER, 'turnos', 'ID', true, 11); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/DocenteHorarioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DocenteHorarioMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/DocenteHorarioMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class DocenteHorarioMapBuilder { - const CLASS_NAME = 'lib.model.map.DocenteHorarioMapBuilder'; + const CLASS_NAME = 'lib.model.map.DocenteHorarioMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('docente_horario'); $tMap->setPhpName('DocenteHorario'); @@ -38,11 +38,11 @@ $tMap->addForeignKey('FK_REPETICION_ID', 'FkRepeticionId', 'int', CreoleTypes::INTEGER, 'repeticion', 'ID', true, 11); - $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true, null); - $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true, null); - $tMap->addColumn('DIA', 'Dia', 'int', CreoleTypes::INTEGER, true); - - } + $tMap->addColumn('DIA', 'Dia', 'int', CreoleTypes::INTEGER, true, 11); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/DocenteMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class DocenteMapBuilder { - const CLASS_NAME = 'lib.model.map.DocenteMapBuilder'; + const CLASS_NAME = 'lib.model.map.DocenteMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('docente'); $tMap->setPhpName('Docente'); @@ -38,9 +38,9 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('SEXO', 'Sexo', 'string', CreoleTypes::CHAR, false); + $tMap->addColumn('SEXO', 'Sexo', 'string', CreoleTypes::CHAR, false, 1); - $tMap->addColumn('FECHA_NACIMIENTO', 'FechaNacimiento', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_NACIMIENTO', 'FechaNacimiento', 'int', CreoleTypes::TIMESTAMP, true, null); $tMap->addForeignKey('FK_TIPODOCUMENTO_ID', 'FkTipodocumentoId', 'int', CreoleTypes::INTEGER, 'tipodocumento', 'ID', true, 11); @@ -60,13 +60,13 @@ $tMap->addColumn('TITULO', 'Titulo', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('LIBRETA_SANITARIA', 'LibretaSanitaria', 'boolean', CreoleTypes::BOOLEAN, false); + $tMap->addColumn('LIBRETA_SANITARIA', 'LibretaSanitaria', 'boolean', CreoleTypes::BOOLEAN, false, null); - $tMap->addColumn('PSICOFISICO', 'Psicofisico', 'boolean', CreoleTypes::BOOLEAN, false); + $tMap->addColumn('PSICOFISICO', 'Psicofisico', 'boolean', CreoleTypes::BOOLEAN, false, null); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, false); + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, false, null); $tMap->addForeignKey('FK_PROVINCIA_ID', 'FkProvinciaId', 'int', CreoleTypes::INTEGER, 'provincia', 'ID', true, 11); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/EscalanotaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class EscalanotaMapBuilder { - const CLASS_NAME = 'lib.model.map.EscalanotaMapBuilder'; + const CLASS_NAME = 'lib.model.map.EscalanotaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('escalanota'); $tMap->setPhpName('Escalanota'); @@ -40,9 +40,9 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, true, 11); - $tMap->addColumn('APROBADO', 'Aprobado', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('APROBADO', 'Aprobado', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/EspacioMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class EspacioMapBuilder { - const CLASS_NAME = 'lib.model.map.EspacioMapBuilder'; + const CLASS_NAME = 'lib.model.map.EspacioMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('espacio'); $tMap->setPhpName('Espacio'); @@ -36,7 +36,7 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('M2', 'M2', 'double', CreoleTypes::FLOAT, false); + $tMap->addColumn('M2', 'M2', 'double', CreoleTypes::FLOAT, false, null); $tMap->addColumn('CAPACIDAD', 'Capacidad', 'string', CreoleTypes::VARCHAR, false, 255); @@ -47,6 +47,6 @@ $tMap->addForeignKey('FK_TIPOESPACIO_ID', 'FkTipoespacioId', 'int', CreoleTypes::INTEGER, 'tipoespacio', 'ID', false, 11); $tMap->addForeignKey('FK_LOCACION_ID', 'FkLocacionId', 'int', CreoleTypes::INTEGER, 'locacion', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/EstablecimientoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class EstablecimientoMapBuilder { - const CLASS_NAME = 'lib.model.map.EstablecimientoMapBuilder'; + const CLASS_NAME = 'lib.model.map.EstablecimientoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('establecimiento'); $tMap->setPhpName('Establecimiento'); @@ -43,6 +43,6 @@ $tMap->addForeignKey('FK_ORGANIZACION_ID', 'FkOrganizacionId', 'int', CreoleTypes::INTEGER, 'organizacion', 'ID', true, null); $tMap->addForeignKey('FK_NIVELTIPO_ID', 'FkNiveltipoId', 'int', CreoleTypes::INTEGER, 'niveltipo', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/EventoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class EventoMapBuilder { - const CLASS_NAME = 'lib.model.map.EventoMapBuilder'; + const CLASS_NAME = 'lib.model.map.EventoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('evento'); $tMap->setPhpName('Evento'); @@ -36,21 +36,21 @@ $tMap->addColumn('TITULO', 'Titulo', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('TIPO', 'Tipo', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('TIPO', 'Tipo', 'int', CreoleTypes::INTEGER, true, null); - $tMap->addColumn('FRECUENCIA', 'Frecuencia', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('FRECUENCIA', 'Frecuencia', 'int', CreoleTypes::INTEGER, true, null); - $tMap->addColumn('FRECUENCIA_INTERVALO', 'FrecuenciaIntervalo', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('FRECUENCIA_INTERVALO', 'FrecuenciaIntervalo', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('RECURRENCIA_FIN', 'RecurrenciaFin', 'string', CreoleTypes::VARCHAR, false, 16); - $tMap->addColumn('RECURRENCIA_DIAS', 'RecurrenciaDias', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('RECURRENCIA_DIAS', 'RecurrenciaDias', 'int', CreoleTypes::INTEGER, true, null); - $tMap->addColumn('ESTADO', 'Estado', 'int', CreoleTypes::INTEGER, true); - - } + $tMap->addColumn('ESTADO', 'Estado', 'int', CreoleTypes::INTEGER, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ExamenMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ExamenMapBuilder { - const CLASS_NAME = 'lib.model.map.ExamenMapBuilder'; + const CLASS_NAME = 'lib.model.map.ExamenMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('examen'); $tMap->setPhpName('Examen'); @@ -44,9 +44,9 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 255); - $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::BLOB, true); + $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::BLOB, true, null); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); - - } + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/FeriadoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class FeriadoMapBuilder { - const CLASS_NAME = 'lib.model.map.FeriadoMapBuilder'; + const CLASS_NAME = 'lib.model.map.FeriadoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('feriado'); $tMap->setPhpName('Feriado'); @@ -36,13 +36,13 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('REPETICION_ANUAL', 'RepeticionAnual', 'boolean', CreoleTypes::BOOLEAN, false); + $tMap->addColumn('REPETICION_ANUAL', 'RepeticionAnual', 'boolean', CreoleTypes::BOOLEAN, false, null); - $tMap->addColumn('INAMOVIBLE', 'Inamovible', 'boolean', CreoleTypes::BOOLEAN, false); + $tMap->addColumn('INAMOVIBLE', 'Inamovible', 'boolean', CreoleTypes::BOOLEAN, false, null); $tMap->addForeignKey('FK_CICLOLECTIVO_ID', 'FkCiclolectivoId', 'int', CreoleTypes::INTEGER, 'ciclolectivo', 'ID', true, 11); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/HorarioescolarMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class HorarioescolarMapBuilder { - const CLASS_NAME = 'lib.model.map.HorarioescolarMapBuilder'; + const CLASS_NAME = 'lib.model.map.HorarioescolarMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('horarioescolar'); $tMap->setPhpName('Horarioescolar'); @@ -34,11 +34,11 @@ $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, 11); - $tMap->addColumn('DIA', 'Dia', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('DIA', 'Dia', 'int', CreoleTypes::INTEGER, true, 11); - $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true, null); - $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true, null); $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); @@ -49,6 +49,6 @@ $tMap->addForeignKey('FK_TURNOS_ID', 'FkTurnosId', 'int', CreoleTypes::INTEGER, 'turnos', 'ID', true, null); $tMap->addForeignKey('FK_HORARIOESCOLARTIPO_ID', 'FkHorarioescolartipoId', 'int', CreoleTypes::INTEGER, 'horarioescolartipo', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/HorarioescolartipoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class HorarioescolartipoMapBuilder { - const CLASS_NAME = 'lib.model.map.HorarioescolartipoMapBuilder'; + const CLASS_NAME = 'lib.model.map.HorarioescolartipoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('horarioescolartipo'); $tMap->setPhpName('Horarioescolartipo'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/LegajoadjuntoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class LegajoadjuntoMapBuilder { - const CLASS_NAME = 'lib.model.map.LegajoadjuntoMapBuilder'; + const CLASS_NAME = 'lib.model.map.LegajoadjuntoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('legajoadjunto'); $tMap->setPhpName('Legajoadjunto'); @@ -35,6 +35,6 @@ $tMap->addForeignKey('FK_LEGAJOPEDAGOGICO_ID', 'FkLegajopedagogicoId', 'int', CreoleTypes::INTEGER, 'legajopedagogico', 'ID', true, 11); $tMap->addForeignKey('FK_ADJUNTO_ID', 'FkAdjuntoId', 'int', CreoleTypes::INTEGER, 'adjunto', 'ID', true, 11); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/LegajocategoriaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class LegajocategoriaMapBuilder { - const CLASS_NAME = 'lib.model.map.LegajocategoriaMapBuilder'; + const CLASS_NAME = 'lib.model.map.LegajocategoriaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('legajocategoria'); $tMap->setPhpName('Legajocategoria'); @@ -35,6 +35,6 @@ $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, 11); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/LegajopedagogicoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class LegajopedagogicoMapBuilder { - const CLASS_NAME = 'lib.model.map.LegajopedagogicoMapBuilder'; + const CLASS_NAME = 'lib.model.map.LegajopedagogicoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('legajopedagogico'); $tMap->setPhpName('Legajopedagogico'); @@ -38,15 +38,15 @@ $tMap->addColumn('TITULO', 'Titulo', 'string', CreoleTypes::VARCHAR, true, 255); - $tMap->addColumn('RESUMEN', 'Resumen', 'string', CreoleTypes::BLOB, true); + $tMap->addColumn('RESUMEN', 'Resumen', 'string', CreoleTypes::BLOB, true, null); - $tMap->addColumn('TEXTO', 'Texto', 'string', CreoleTypes::BLOB, true); + $tMap->addColumn('TEXTO', 'Texto', 'string', CreoleTypes::BLOB, true, null); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, true, null); $tMap->addForeignKey('FK_USUARIO_ID', 'FkUsuarioId', 'int', CreoleTypes::INTEGER, 'usuario', 'ID', true, 11); $tMap->addForeignKey('FK_LEGAJOCATEGORIA_ID', 'FkLegajocategoriaId', 'int', CreoleTypes::INTEGER, 'legajocategoria', 'ID', true, 11); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/LocacionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class LocacionMapBuilder { - const CLASS_NAME = 'lib.model.map.LocacionMapBuilder'; + const CLASS_NAME = 'lib.model.map.LocacionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('locacion'); $tMap->setPhpName('Locacion'); @@ -56,7 +56,7 @@ $tMap->addColumn('ENCARGADO_TELEFONO', 'EncargadoTelefono', 'string', CreoleTypes::VARCHAR, false, 20); - $tMap->addColumn('PRINCIPAL', 'Principal', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('PRINCIPAL', 'Principal', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/MenuMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/MenuMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/MenuMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class MenuMapBuilder { - const CLASS_NAME = 'lib.model.map.MenuMapBuilder'; + const CLASS_NAME = 'lib.model.map.MenuMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('menu'); $tMap->setPhpName('Menu'); @@ -44,7 +44,7 @@ $tMap->addForeignKey('FK_PADRE_MENU_ID', 'FkPadreMenuId', 'int', CreoleTypes::INTEGER, 'menu', 'ID', false, null); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/ModuloMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ModuloMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ModuloMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ModuloMapBuilder { - const CLASS_NAME = 'lib.model.map.ModuloMapBuilder'; + const CLASS_NAME = 'lib.model.map.ModuloMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('modulo'); $tMap->setPhpName('Modulo'); @@ -40,7 +40,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/NiveltipoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class NiveltipoMapBuilder { - const CLASS_NAME = 'lib.model.map.NiveltipoMapBuilder'; + const CLASS_NAME = 'lib.model.map.NiveltipoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('niveltipo'); $tMap->setPhpName('Niveltipo'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/OrganizacionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class OrganizacionMapBuilder { - const CLASS_NAME = 'lib.model.map.OrganizacionMapBuilder'; + const CLASS_NAME = 'lib.model.map.OrganizacionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('organizacion'); $tMap->setPhpName('Organizacion'); @@ -53,6 +53,6 @@ $tMap->addForeignKey('FK_PROVINCIA_ID', 'FkProvinciaId', 'int', CreoleTypes::INTEGER, 'provincia', 'ID', true, null); $tMap->addForeignKey('FK_TIPOIVA_ID', 'FkTipoivaId', 'int', CreoleTypes::INTEGER, 'tipoiva', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/PaisMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class PaisMapBuilder { - const CLASS_NAME = 'lib.model.map.PaisMapBuilder'; + const CLASS_NAME = 'lib.model.map.PaisMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('pais'); $tMap->setPhpName('Pais'); @@ -38,7 +38,7 @@ $tMap->addColumn('NOMBRE_CORTO', 'NombreCorto', 'string', CreoleTypes::VARCHAR, true, 32); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/PeriodoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class PeriodoMapBuilder { - const CLASS_NAME = 'lib.model.map.PeriodoMapBuilder'; + const CLASS_NAME = 'lib.model.map.PeriodoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('periodo'); $tMap->setPhpName('Periodo'); @@ -36,11 +36,11 @@ $tMap->addForeignKey('FK_CICLOLECTIVO_ID', 'FkCiclolectivoId', 'int', CreoleTypes::INTEGER, 'ciclolectivo', 'ID', true, 11); - $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true, null); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/PermisoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class PermisoMapBuilder { - const CLASS_NAME = 'lib.model.map.PermisoMapBuilder'; + const CLASS_NAME = 'lib.model.map.PermisoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('permiso'); $tMap->setPhpName('Permiso'); @@ -41,6 +41,6 @@ $tMap->addForeignKey('FK_MODULO_ID', 'FkModuloId', 'int', CreoleTypes::INTEGER, 'modulo', 'ID', true, null); $tMap->addColumn('CREDENCIAL', 'Credencial', 'string', CreoleTypes::VARCHAR, false, 32); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/PreferenciaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class PreferenciaMapBuilder { - const CLASS_NAME = 'lib.model.map.PreferenciaMapBuilder'; + const CLASS_NAME = 'lib.model.map.PreferenciaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('preferencia'); $tMap->setPhpName('Preferencia'); @@ -38,7 +38,7 @@ $tMap->addColumn('VALOR_POR_DEFECTO', 'ValorPorDefecto', 'string', CreoleTypes::VARCHAR, false, 128); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ProvinciaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ProvinciaMapBuilder { - const CLASS_NAME = 'lib.model.map.ProvinciaMapBuilder'; + const CLASS_NAME = 'lib.model.map.ProvinciaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('provincia'); $tMap->setPhpName('Provincia'); @@ -40,7 +40,7 @@ $tMap->addForeignKey('FK_PAIS_ID', 'FkPaisId', 'int', CreoleTypes::INTEGER, 'pais', 'ID', true, null); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelActividadDocenteMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,42 +1,40 @@ <?php - + class RelActividadDocenteMapBuilder { - const CLASS_NAME = 'lib.model.map.RelActividadDocenteMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelActividadDocenteMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_actividad_docente'); $tMap->setPhpName('RelActividadDocente'); - $tMap->setUseIdGenerator(true); + $tMap->setUseIdGenerator(false); - $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, 11); + $tMap->addForeignPrimaryKey('FK_ACTIVIDAD_ID', 'FkActividadId', 'int' , CreoleTypes::INTEGER, 'actividad', 'ID', true, 11); - $tMap->addForeignKey('FK_ACTIVIDAD_ID', 'FkActividadId', 'int', CreoleTypes::INTEGER, 'actividad', 'ID', true, 11); + $tMap->addForeignPrimaryKey('FK_DOCENTE_ID', 'FkDocenteId', 'int' , CreoleTypes::INTEGER, 'docente', 'ID', true, 11); - $tMap->addForeignKey('FK_DOCENTE_ID', 'FkDocenteId', 'int', CreoleTypes::INTEGER, 'docente', 'ID', true, 11); - - } + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelAlumnoDivisionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelAlumnoDivisionMapBuilder { - const CLASS_NAME = 'lib.model.map.RelAlumnoDivisionMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelAlumnoDivisionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_alumno_division'); $tMap->setPhpName('RelAlumnoDivision'); @@ -37,6 +37,6 @@ $tMap->addForeignKey('FK_DIVISION_ID', 'FkDivisionId', 'int', CreoleTypes::INTEGER, 'division', 'ID', true, 11); $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'int', CreoleTypes::INTEGER, 'alumno', 'ID', true, 11); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelAnioActividadMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelAnioActividadMapBuilder { - const CLASS_NAME = 'lib.model.map.RelAnioActividadMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelAnioActividadMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_anio_actividad'); $tMap->setPhpName('RelAnioActividad'); @@ -38,7 +38,7 @@ $tMap->addForeignKey('FK_ACTIVIDAD_ID', 'FkActividadId', 'int', CreoleTypes::INTEGER, 'actividad', 'ID', true, 11); - $tMap->addColumn('HORAS', 'Horas', 'double', CreoleTypes::DECIMAL, true); - - } + $tMap->addColumn('HORAS', 'Horas', 'double', CreoleTypes::DECIMAL, true, 10,2); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelCalendariovacunacionAlumnoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelCalendariovacunacionAlumnoMapBuilder { - const CLASS_NAME = 'lib.model.map.RelCalendariovacunacionAlumnoMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelCalendariovacunacionAlumnoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_calendariovacunacion_alumno'); $tMap->setPhpName('RelCalendariovacunacionAlumno'); @@ -40,9 +40,9 @@ $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('COMPROBANTE', 'Comprobante', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('COMPROBANTE', 'Comprobante', 'boolean', CreoleTypes::BOOLEAN, true, null); - $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, false); - - } + $tMap->addColumn('FECHA', 'Fecha', 'int', CreoleTypes::TIMESTAMP, false, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelDivisionActividadDocenteMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelDivisionActividadDocenteMapBuilder { - const CLASS_NAME = 'lib.model.map.RelDivisionActividadDocenteMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelDivisionActividadDocenteMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_division_actividad_docente'); $tMap->setPhpName('RelDivisionActividadDocente'); @@ -44,13 +44,13 @@ $tMap->addForeignKey('FK_REPETICION_ID', 'FkRepeticionId', 'int', CreoleTypes::INTEGER, 'repeticion', 'ID', false, 11); - $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_INICIO', 'FechaInicio', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_FIN', 'FechaFin', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true, null); - $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true); - - } + $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelDocenteEstablecimientoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelDocenteEstablecimientoMapBuilder { - const CLASS_NAME = 'lib.model.map.RelDocenteEstablecimientoMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelDocenteEstablecimientoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_docente_establecimiento'); $tMap->setPhpName('RelDocenteEstablecimiento'); @@ -35,6 +35,6 @@ $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, 11); $tMap->addForeignKey('FK_DOCENTE_ID', 'FkDocenteId', 'int', CreoleTypes::INTEGER, 'docente', 'ID', true, 11); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelEstablecimientoLocacionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelEstablecimientoLocacionMapBuilder { - const CLASS_NAME = 'lib.model.map.RelEstablecimientoLocacionMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelEstablecimientoLocacionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_establecimiento_locacion'); $tMap->setPhpName('RelEstablecimientoLocacion'); @@ -37,6 +37,6 @@ $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, null); $tMap->addForeignKey('FK_LOCACION_ID', 'FkLocacionId', 'int', CreoleTypes::INTEGER, 'locacion', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelRolPermisoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelRolPermisoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelRolPermisoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelRolPermisoMapBuilder { - const CLASS_NAME = 'lib.model.map.RelRolPermisoMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelRolPermisoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_rol_permiso'); $tMap->setPhpName('RelRolPermiso'); @@ -37,6 +37,6 @@ $tMap->addForeignKey('FK_ROL_ID', 'FkRolId', 'int', CreoleTypes::INTEGER, 'rol', 'ID', true, null); $tMap->addForeignKey('FK_PERMISO_ID', 'FkPermisoId', 'int', CreoleTypes::INTEGER, 'permiso', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelRolresponsableResponsableMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelRolresponsableResponsableMapBuilder { - const CLASS_NAME = 'lib.model.map.RelRolresponsableResponsableMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelRolresponsableResponsableMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_rolresponsable_responsable'); $tMap->setPhpName('RelRolresponsableResponsable'); @@ -41,6 +41,6 @@ $tMap->addForeignKey('FK_ALUMNO_ID', 'FkAlumnoId', 'int', CreoleTypes::INTEGER, 'alumno', 'ID', true, 11); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPermisoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPermisoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPermisoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelUsuarioPermisoMapBuilder { - const CLASS_NAME = 'lib.model.map.RelUsuarioPermisoMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelUsuarioPermisoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_usuario_permiso'); $tMap->setPhpName('RelUsuarioPermiso'); @@ -37,6 +37,6 @@ $tMap->addForeignKey('FK_USUARIO_ID', 'FkUsuarioId', 'int', CreoleTypes::INTEGER, 'usuario', 'ID', true, null); $tMap->addForeignKey('FK_PERMISO_ID', 'FkPermisoId', 'int', CreoleTypes::INTEGER, 'permiso', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RelUsuarioPreferenciaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RelUsuarioPreferenciaMapBuilder { - const CLASS_NAME = 'lib.model.map.RelUsuarioPreferenciaMapBuilder'; + const CLASS_NAME = 'lib.model.map.RelUsuarioPreferenciaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rel_usuario_preferencia'); $tMap->setPhpName('RelUsuarioPreferencia'); @@ -34,9 +34,9 @@ $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null); - $tMap->addColumn('FK_USUARIO_ID', 'FkUsuarioId', 'int', CreoleTypes::INTEGER, true); + $tMap->addColumn('FK_USUARIO_ID', 'FkUsuarioId', 'int', CreoleTypes::INTEGER, true, null); - $tMap->addColumn('FK_PREFERENCIA_ID', 'FkPreferenciaId', 'int', CreoleTypes::INTEGER, true); - - } + $tMap->addColumn('FK_PREFERENCIA_ID', 'FkPreferenciaId', 'int', CreoleTypes::INTEGER, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RepeticionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RepeticionMapBuilder { - const CLASS_NAME = 'lib.model.map.RepeticionMapBuilder'; + const CLASS_NAME = 'lib.model.map.RepeticionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('repeticion'); $tMap->setPhpName('Repeticion'); @@ -36,7 +36,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, true); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, true, 11); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/ResponsableMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class ResponsableMapBuilder { - const CLASS_NAME = 'lib.model.map.ResponsableMapBuilder'; + const CLASS_NAME = 'lib.model.map.ResponsableMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('responsable'); $tMap->setPhpName('Responsable'); @@ -54,17 +54,17 @@ $tMap->addForeignKey('FK_TIPODOCUMENTO_ID', 'FkTipodocumentoId', 'int', CreoleTypes::INTEGER, 'tipodocumento', 'ID', true, null); - $tMap->addColumn('SEXO', 'Sexo', 'string', CreoleTypes::CHAR, true); + $tMap->addColumn('SEXO', 'Sexo', 'string', CreoleTypes::CHAR, true, 1); $tMap->addColumn('EMAIL', 'Email', 'string', CreoleTypes::VARCHAR, false, 128); $tMap->addColumn('OBSERVACION', 'Observacion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('AUTORIZACION_RETIRO', 'AutorizacionRetiro', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('AUTORIZACION_RETIRO', 'AutorizacionRetiro', 'boolean', CreoleTypes::BOOLEAN, true, null); $tMap->addForeignKey('FK_CUENTA_ID', 'FkCuentaId', 'int', CreoleTypes::INTEGER, 'cuenta', 'ID', true, null); $tMap->addForeignKey('FK_ROLRESPONSABLE_ID', 'FkRolresponsableId', 'int', CreoleTypes::INTEGER, 'rol_responsable', 'ID', true, null); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RolMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RolMapBuilder { - const CLASS_NAME = 'lib.model.map.RolMapBuilder'; + const CLASS_NAME = 'lib.model.map.RolMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rol'); $tMap->setPhpName('Rol'); @@ -38,7 +38,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/RolResponsableMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class RolResponsableMapBuilder { - const CLASS_NAME = 'lib.model.map.RolResponsableMapBuilder'; + const CLASS_NAME = 'lib.model.map.RolResponsableMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('rol_responsable'); $tMap->setPhpName('RolResponsable'); @@ -38,7 +38,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TipoasistenciaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TipoasistenciaMapBuilder { - const CLASS_NAME = 'lib.model.map.TipoasistenciaMapBuilder'; + const CLASS_NAME = 'lib.model.map.TipoasistenciaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('tipoasistencia'); $tMap->setPhpName('Tipoasistencia'); @@ -38,11 +38,11 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('VALOR', 'Valor', 'double', CreoleTypes::DECIMAL, true); + $tMap->addColumn('VALOR', 'Valor', 'double', CreoleTypes::DECIMAL, true, 4,2); $tMap->addColumn('GRUPO', 'Grupo', 'string', CreoleTypes::VARCHAR, false, 30); - $tMap->addColumn('DEFECTO', 'Defecto', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('DEFECTO', 'Defecto', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TipodocenteMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TipodocenteMapBuilder { - const CLASS_NAME = 'lib.model.map.TipodocenteMapBuilder'; + const CLASS_NAME = 'lib.model.map.TipodocenteMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('tipodocente'); $tMap->setPhpName('Tipodocente'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TipodocumentoMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TipodocumentoMapBuilder { - const CLASS_NAME = 'lib.model.map.TipodocumentoMapBuilder'; + const CLASS_NAME = 'lib.model.map.TipodocumentoMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('tipodocumento'); $tMap->setPhpName('Tipodocumento'); @@ -38,7 +38,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, 11); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TipoespacioMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TipoespacioMapBuilder { - const CLASS_NAME = 'lib.model.map.TipoespacioMapBuilder'; + const CLASS_NAME = 'lib.model.map.TipoespacioMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('tipoespacio'); $tMap->setPhpName('Tipoespacio'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TipoivaMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TipoivaMapBuilder { - const CLASS_NAME = 'lib.model.map.TipoivaMapBuilder'; + const CLASS_NAME = 'lib.model.map.TipoivaMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('tipoiva'); $tMap->setPhpName('Tipoiva'); @@ -38,7 +38,7 @@ $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false); - - } + $tMap->addColumn('ORDEN', 'Orden', 'int', CreoleTypes::INTEGER, false, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TipolocacionMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TipolocacionMapBuilder { - const CLASS_NAME = 'lib.model.map.TipolocacionMapBuilder'; + const CLASS_NAME = 'lib.model.map.TipolocacionMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('tipolocacion'); $tMap->setPhpName('Tipolocacion'); @@ -37,6 +37,6 @@ $tMap->addColumn('NOMBRE', 'Nombre', 'string', CreoleTypes::VARCHAR, true, 128); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, false, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/TurnosMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/TurnosMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/TurnosMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class TurnosMapBuilder { - const CLASS_NAME = 'lib.model.map.TurnosMapBuilder'; + const CLASS_NAME = 'lib.model.map.TurnosMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('turnos'); $tMap->setPhpName('Turnos'); @@ -36,11 +36,11 @@ $tMap->addForeignKey('FK_CICLOLECTIVO_ID', 'FkCiclolectivoId', 'int', CreoleTypes::INTEGER, 'ciclolectivo', 'ID', true, 11); - $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_INICIO', 'HoraInicio', 'int', CreoleTypes::TIME, true, null); - $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true); + $tMap->addColumn('HORA_FIN', 'HoraFin', 'int', CreoleTypes::TIME, true, null); $tMap->addColumn('DESCRIPCION', 'Descripcion', 'string', CreoleTypes::VARCHAR, true, 255); - - } + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/map/UsuarioMapBuilder.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -1,32 +1,32 @@ <?php - + class UsuarioMapBuilder { - const CLASS_NAME = 'lib.model.map.UsuarioMapBuilder'; + const CLASS_NAME = 'lib.model.map.UsuarioMapBuilder'; - - private $dbMap; + + private $dbMap; - public function isBuilt() - { - return ($this->dbMap !== null); - } + public function isBuilt() + { + return ($this->dbMap !== null); + } - public function getDatabaseMap() - { - return $this->dbMap; - } + public function getDatabaseMap() + { + return $this->dbMap; + } - - public function doBuild() - { + + public function doBuild() + { $this->dbMap = Propel::getDatabaseMap('alba'); - + $tMap = $this->dbMap->addTable('usuario'); $tMap->setPhpName('Usuario'); @@ -38,13 +38,13 @@ $tMap->addColumn('CLAVE', 'Clave', 'string', CreoleTypes::VARCHAR, true, 48); - $tMap->addColumn('CORREO_PUBLICO', 'CorreoPublico', 'boolean', CreoleTypes::BOOLEAN, false); + $tMap->addColumn('CORREO_PUBLICO', 'CorreoPublico', 'boolean', CreoleTypes::BOOLEAN, false, null); - $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true); + $tMap->addColumn('ACTIVO', 'Activo', 'boolean', CreoleTypes::BOOLEAN, true, null); - $tMap->addColumn('FECHA_CREADO', 'FechaCreado', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_CREADO', 'FechaCreado', 'int', CreoleTypes::TIMESTAMP, true, null); - $tMap->addColumn('FECHA_ACTUALIZADO', 'FechaActualizado', 'int', CreoleTypes::TIMESTAMP, true); + $tMap->addColumn('FECHA_ACTUALIZADO', 'FechaActualizado', 'int', CreoleTypes::TIMESTAMP, true, null); $tMap->addColumn('SEGURIDAD_PREGUNTA', 'SeguridadPregunta', 'string', CreoleTypes::VARCHAR, false, 128); @@ -54,7 +54,7 @@ $tMap->addForeignKey('FK_ESTABLECIMIENTO_ID', 'FkEstablecimientoId', 'int', CreoleTypes::INTEGER, 'establecimiento', 'ID', true, null); - $tMap->addColumn('BORRADO', 'Borrado', 'boolean', CreoleTypes::BOOLEAN, true); - - } + $tMap->addColumn('BORRADO', 'Borrado', 'boolean', CreoleTypes::BOOLEAN, true, null); + + } } \ No newline at end of file Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -94,6 +94,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ActividadPeer::ID; @@ -104,6 +108,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = ActividadPeer::FK_ESTABLECIMIENTO_ID; @@ -118,6 +126,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = ActividadPeer::NOMBRE; @@ -128,6 +140,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = ActividadPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividadPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividadPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividadPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -192,14 +192,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ActividadPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -274,7 +274,7 @@ } else { $criteria->addSelectColumn(ActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -310,25 +310,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -337,7 +337,7 @@ $temp_obj2->addActividad($obj1); break; } } - + if ($newObject) { $obj2->initActividads(); $obj2->addActividad($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAdjunto.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -115,6 +115,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = AdjuntoPeer::ID; @@ -125,6 +129,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = AdjuntoPeer::DESCRIPCION; @@ -135,6 +143,10 @@ public function setTitulo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->titulo !== $v) { $this->titulo = $v; $this->modifiedColumns[] = AdjuntoPeer::TITULO; @@ -145,6 +157,10 @@ public function setNombreArchivo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre_archivo !== $v) { $this->nombre_archivo = $v; $this->modifiedColumns[] = AdjuntoPeer::NOMBRE_ARCHIVO; @@ -155,6 +171,10 @@ public function setTipoArchivo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->tipo_archivo !== $v) { $this->tipo_archivo = $v; $this->modifiedColumns[] = AdjuntoPeer::TIPO_ARCHIVO; @@ -165,6 +185,10 @@ public function setRuta($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ruta !== $v) { $this->ruta = $v; $this->modifiedColumns[] = AdjuntoPeer::RUTA; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -351,6 +351,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = AlumnoPeer::ID; @@ -361,6 +365,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = AlumnoPeer::NOMBRE; @@ -371,6 +379,10 @@ public function setApellido($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->apellido !== $v || $v === '') { $this->apellido = $v; $this->modifiedColumns[] = AlumnoPeer::APELLIDO; @@ -398,6 +410,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v || $v === '') { $this->direccion = $v; $this->modifiedColumns[] = AlumnoPeer::DIRECCION; @@ -408,6 +424,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v || $v === '') { $this->ciudad = $v; $this->modifiedColumns[] = AlumnoPeer::CIUDAD; @@ -418,6 +438,10 @@ public function setCodigoPostal($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->codigo_postal !== $v || $v === '') { $this->codigo_postal = $v; $this->modifiedColumns[] = AlumnoPeer::CODIGO_POSTAL; @@ -428,6 +452,10 @@ public function setFkProvinciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_provincia_id !== $v || $v === 0) { $this->fk_provincia_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_PROVINCIA_ID; @@ -442,6 +470,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v || $v === '') { $this->telefono = $v; $this->modifiedColumns[] = AlumnoPeer::TELEFONO; @@ -452,6 +484,10 @@ public function setLugarNacimiento($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->lugar_nacimiento !== $v || $v === '') { $this->lugar_nacimiento = $v; $this->modifiedColumns[] = AlumnoPeer::LUGAR_NACIMIENTO; @@ -462,6 +498,10 @@ public function setFkTipodocumentoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipodocumento_id !== $v || $v === 0) { $this->fk_tipodocumento_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_TIPODOCUMENTO_ID; @@ -476,6 +516,10 @@ public function setNroDocumento($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nro_documento !== $v || $v === '') { $this->nro_documento = $v; $this->modifiedColumns[] = AlumnoPeer::NRO_DOCUMENTO; @@ -486,6 +530,10 @@ public function setSexo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->sexo !== $v || $v === '') { $this->sexo = $v; $this->modifiedColumns[] = AlumnoPeer::SEXO; @@ -496,6 +544,10 @@ public function setEmail($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->email !== $v || $v === '') { $this->email = $v; $this->modifiedColumns[] = AlumnoPeer::EMAIL; @@ -506,6 +558,10 @@ public function setDistanciaEscuela($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->distancia_escuela !== $v || $v === 0) { $this->distancia_escuela = $v; $this->modifiedColumns[] = AlumnoPeer::DISTANCIA_ESCUELA; @@ -536,6 +592,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_ESTABLECIMIENTO_ID; @@ -550,6 +610,10 @@ public function setFkCuentaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_cuenta_id !== $v || $v === 0) { $this->fk_cuenta_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_CUENTA_ID; @@ -584,6 +648,10 @@ public function setFkConceptobajaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_conceptobaja_id !== $v) { $this->fk_conceptobaja_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_CONCEPTOBAJA_ID; @@ -598,6 +666,10 @@ public function setFkPaisId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_pais_id !== $v || $v === 0) { $this->fk_pais_id = $v; $this->modifiedColumns[] = AlumnoPeer::FK_PAIS_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumnoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -287,14 +287,14 @@ public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -315,14 +315,14 @@ public static function doCountJoinCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -343,14 +343,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -371,14 +371,14 @@ public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -399,14 +399,14 @@ public static function doCountJoinConceptobaja(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -427,14 +427,14 @@ public static function doCountJoinPais(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -744,7 +744,7 @@ } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -815,25 +815,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -842,21 +842,21 @@ $temp_obj2->addAlumno($obj1); break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); } - + $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -865,21 +865,21 @@ $temp_obj3->addAlumno($obj1); break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); } - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -888,21 +888,21 @@ $temp_obj4->addAlumno($obj1); break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); } - + $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -911,21 +911,21 @@ $temp_obj5->addAlumno($obj1); break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); } - + $omClass = ConceptobajaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -934,21 +934,21 @@ $temp_obj6->addAlumno($obj1); break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); } - + $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj7 = new $cls(); $obj7->hydrate($rs, $startcol7); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -957,7 +957,7 @@ $temp_obj7->addAlumno($obj1); break; } } - + if ($newObject) { $obj7->initAlumnos(); $obj7->addAlumno($obj1); @@ -973,14 +973,14 @@ public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1009,14 +1009,14 @@ public static function doCountJoinAllExceptCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1045,14 +1045,14 @@ public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1081,14 +1081,14 @@ public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1117,14 +1117,14 @@ public static function doCountJoinAllExceptConceptobaja(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1153,14 +1153,14 @@ public static function doCountJoinAllExceptPais(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1225,22 +1225,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1250,7 +1250,7 @@ break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); @@ -1258,11 +1258,11 @@ $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1272,7 +1272,7 @@ break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); @@ -1280,11 +1280,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1294,7 +1294,7 @@ break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); @@ -1302,11 +1302,11 @@ $omClass = ConceptobajaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1316,7 +1316,7 @@ break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); @@ -1324,11 +1324,11 @@ $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1338,7 +1338,7 @@ break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); @@ -1390,22 +1390,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1415,7 +1415,7 @@ break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); @@ -1423,11 +1423,11 @@ $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1437,7 +1437,7 @@ break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); @@ -1445,11 +1445,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1459,7 +1459,7 @@ break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); @@ -1467,11 +1467,11 @@ $omClass = ConceptobajaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1481,7 +1481,7 @@ break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); @@ -1489,11 +1489,11 @@ $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1503,7 +1503,7 @@ break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); @@ -1555,22 +1555,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1580,7 +1580,7 @@ break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); @@ -1588,11 +1588,11 @@ $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1602,7 +1602,7 @@ break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); @@ -1610,11 +1610,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1624,7 +1624,7 @@ break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); @@ -1632,11 +1632,11 @@ $omClass = ConceptobajaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1646,7 +1646,7 @@ break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); @@ -1654,11 +1654,11 @@ $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1668,7 +1668,7 @@ break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); @@ -1720,22 +1720,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1745,7 +1745,7 @@ break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); @@ -1753,11 +1753,11 @@ $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1767,7 +1767,7 @@ break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); @@ -1775,11 +1775,11 @@ $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1789,7 +1789,7 @@ break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); @@ -1797,11 +1797,11 @@ $omClass = ConceptobajaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1811,7 +1811,7 @@ break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); @@ -1819,11 +1819,11 @@ $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1833,7 +1833,7 @@ break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); @@ -1885,22 +1885,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1910,7 +1910,7 @@ break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); @@ -1918,11 +1918,11 @@ $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1932,7 +1932,7 @@ break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); @@ -1940,11 +1940,11 @@ $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1954,7 +1954,7 @@ break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); @@ -1962,11 +1962,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1976,7 +1976,7 @@ break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); @@ -1984,11 +1984,11 @@ $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1998,7 +1998,7 @@ break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); @@ -2050,22 +2050,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -2075,7 +2075,7 @@ break; } } - + if ($newObject) { $obj2->initAlumnos(); $obj2->addAlumno($obj1); @@ -2083,11 +2083,11 @@ $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -2097,7 +2097,7 @@ break; } } - + if ($newObject) { $obj3->initAlumnos(); $obj3->addAlumno($obj1); @@ -2105,11 +2105,11 @@ $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -2119,7 +2119,7 @@ break; } } - + if ($newObject) { $obj4->initAlumnos(); $obj4->addAlumno($obj1); @@ -2127,11 +2127,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -2141,7 +2141,7 @@ break; } } - + if ($newObject) { $obj5->initAlumnos(); $obj5->addAlumno($obj1); @@ -2149,11 +2149,11 @@ $omClass = ConceptobajaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -2163,7 +2163,7 @@ break; } } - + if ($newObject) { $obj6->initAlumnos(); $obj6->addAlumno($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -65,6 +65,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = AnioPeer::ID; @@ -75,6 +79,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = AnioPeer::FK_ESTABLECIMIENTO_ID; @@ -89,6 +97,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = AnioPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnioPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -187,14 +187,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AnioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AnioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -269,7 +269,7 @@ } else { $criteria->addSelectColumn(AnioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -305,25 +305,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AnioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -332,7 +332,7 @@ $temp_obj2->addAnio($obj1); break; } } - + if ($newObject) { $obj2->initAnios(); $obj2->addAnio($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAsistencia.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -82,6 +82,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = AsistenciaPeer::ID; @@ -92,6 +96,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = AsistenciaPeer::FK_ALUMNO_ID; @@ -106,6 +114,10 @@ public function setFkTipoasistenciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipoasistencia_id !== $v) { $this->fk_tipoasistencia_id = $v; $this->modifiedColumns[] = AsistenciaPeer::FK_TIPOASISTENCIA_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAsistenciaPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAsistenciaPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAsistenciaPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -192,14 +192,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AsistenciaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AsistenciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -220,14 +220,14 @@ public static function doCountJoinTipoasistencia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AsistenciaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AsistenciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -349,7 +349,7 @@ } else { $criteria->addSelectColumn(AsistenciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -392,25 +392,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AsistenciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -419,21 +419,21 @@ $temp_obj2->addAsistencia($obj1); break; } } - + if ($newObject) { $obj2->initAsistencias(); $obj2->addAsistencia($obj1); } - + $omClass = TipoasistenciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -442,7 +442,7 @@ $temp_obj3->addAsistencia($obj1); break; } } - + if ($newObject) { $obj3->initAsistencias(); $obj3->addAsistencia($obj1); @@ -458,14 +458,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AsistenciaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AsistenciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -486,14 +486,14 @@ public static function doCountJoinAllExceptTipoasistencia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(AsistenciaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(AsistenciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -530,22 +530,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AsistenciaPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipoasistenciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -555,7 +555,7 @@ break; } } - + if ($newObject) { $obj2->initAsistencias(); $obj2->addAsistencia($obj1); @@ -587,22 +587,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = AsistenciaPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -612,7 +612,7 @@ break; } } - + if ($newObject) { $obj2->initAsistencias(); $obj2->addAsistencia($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividades.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -121,6 +121,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = BoletinActividadesPeer::ID; @@ -131,6 +135,10 @@ public function setFkEscalanotaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_escalanota_id !== $v || $v === 0) { $this->fk_escalanota_id = $v; $this->modifiedColumns[] = BoletinActividadesPeer::FK_ESCALANOTA_ID; @@ -145,6 +153,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v || $v === 0) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = BoletinActividadesPeer::FK_ALUMNO_ID; @@ -159,6 +171,10 @@ public function setFkActividadId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_actividad_id !== $v || $v === 0) { $this->fk_actividad_id = $v; $this->modifiedColumns[] = BoletinActividadesPeer::FK_ACTIVIDAD_ID; @@ -173,6 +189,10 @@ public function setFkPeriodoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_periodo_id !== $v || $v === 0) { $this->fk_periodo_id = $v; $this->modifiedColumns[] = BoletinActividadesPeer::FK_PERIODO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividadesPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividadesPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinActividadesPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -207,14 +207,14 @@ public static function doCountJoinEscalanota(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -235,14 +235,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -263,14 +263,14 @@ public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -291,14 +291,14 @@ public static function doCountJoinPeriodo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -514,7 +514,7 @@ } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -571,25 +571,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinActividadesPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -598,21 +598,21 @@ $temp_obj2->addBoletinActividades($obj1); break; } } - + if ($newObject) { $obj2->initBoletinActividadess(); $obj2->addBoletinActividades($obj1); } - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -621,21 +621,21 @@ $temp_obj3->addBoletinActividades($obj1); break; } } - + if ($newObject) { $obj3->initBoletinActividadess(); $obj3->addBoletinActividades($obj1); } - + $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -644,21 +644,21 @@ $temp_obj4->addBoletinActividades($obj1); break; } } - + if ($newObject) { $obj4->initBoletinActividadess(); $obj4->addBoletinActividades($obj1); } - + $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -667,7 +667,7 @@ $temp_obj5->addBoletinActividades($obj1); break; } } - + if ($newObject) { $obj5->initBoletinActividadess(); $obj5->addBoletinActividades($obj1); @@ -683,14 +683,14 @@ public static function doCountJoinAllExceptEscalanota(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -715,14 +715,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -747,14 +747,14 @@ public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -779,14 +779,14 @@ public static function doCountJoinAllExceptPeriodo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinActividadesPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -837,22 +837,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinActividadesPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -862,7 +862,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinActividadess(); $obj2->addBoletinActividades($obj1); @@ -870,11 +870,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -884,7 +884,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinActividadess(); $obj3->addBoletinActividades($obj1); @@ -892,11 +892,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -906,7 +906,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinActividadess(); $obj4->addBoletinActividades($obj1); @@ -948,22 +948,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinActividadesPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -973,7 +973,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinActividadess(); $obj2->addBoletinActividades($obj1); @@ -981,11 +981,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -995,7 +995,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinActividadess(); $obj3->addBoletinActividades($obj1); @@ -1003,11 +1003,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1017,7 +1017,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinActividadess(); $obj4->addBoletinActividades($obj1); @@ -1059,22 +1059,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinActividadesPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1084,7 +1084,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinActividadess(); $obj2->addBoletinActividades($obj1); @@ -1092,11 +1092,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1106,7 +1106,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinActividadess(); $obj3->addBoletinActividades($obj1); @@ -1114,11 +1114,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1128,7 +1128,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinActividadess(); $obj4->addBoletinActividades($obj1); @@ -1170,22 +1170,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinActividadesPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1195,7 +1195,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinActividadess(); $obj2->addBoletinActividades($obj1); @@ -1203,11 +1203,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1217,7 +1217,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinActividadess(); $obj3->addBoletinActividades($obj1); @@ -1225,11 +1225,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1239,7 +1239,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinActividadess(); $obj4->addBoletinActividades($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptual.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -121,6 +121,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = BoletinConceptualPeer::ID; @@ -131,6 +135,10 @@ public function setFkEscalanotaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_escalanota_id !== $v || $v === 0) { $this->fk_escalanota_id = $v; $this->modifiedColumns[] = BoletinConceptualPeer::FK_ESCALANOTA_ID; @@ -145,6 +153,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v || $v === 0) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = BoletinConceptualPeer::FK_ALUMNO_ID; @@ -159,6 +171,10 @@ public function setFkConceptoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_concepto_id !== $v || $v === 0) { $this->fk_concepto_id = $v; $this->modifiedColumns[] = BoletinConceptualPeer::FK_CONCEPTO_ID; @@ -173,6 +189,10 @@ public function setFkPeriodoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_periodo_id !== $v || $v === 0) { $this->fk_periodo_id = $v; $this->modifiedColumns[] = BoletinConceptualPeer::FK_PERIODO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptualPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptualPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseBoletinConceptualPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -207,14 +207,14 @@ public static function doCountJoinEscalanota(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -235,14 +235,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -263,14 +263,14 @@ public static function doCountJoinConcepto(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -291,14 +291,14 @@ public static function doCountJoinPeriodo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -514,7 +514,7 @@ } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -571,25 +571,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinConceptualPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -598,21 +598,21 @@ $temp_obj2->addBoletinConceptual($obj1); break; } } - + if ($newObject) { $obj2->initBoletinConceptuals(); $obj2->addBoletinConceptual($obj1); } - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -621,21 +621,21 @@ $temp_obj3->addBoletinConceptual($obj1); break; } } - + if ($newObject) { $obj3->initBoletinConceptuals(); $obj3->addBoletinConceptual($obj1); } - + $omClass = ConceptoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -644,21 +644,21 @@ $temp_obj4->addBoletinConceptual($obj1); break; } } - + if ($newObject) { $obj4->initBoletinConceptuals(); $obj4->addBoletinConceptual($obj1); } - + $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -667,7 +667,7 @@ $temp_obj5->addBoletinConceptual($obj1); break; } } - + if ($newObject) { $obj5->initBoletinConceptuals(); $obj5->addBoletinConceptual($obj1); @@ -683,14 +683,14 @@ public static function doCountJoinAllExceptEscalanota(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -715,14 +715,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -747,14 +747,14 @@ public static function doCountJoinAllExceptConcepto(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -779,14 +779,14 @@ public static function doCountJoinAllExceptPeriodo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(BoletinConceptualPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -837,22 +837,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinConceptualPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -862,7 +862,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinConceptuals(); $obj2->addBoletinConceptual($obj1); @@ -870,11 +870,11 @@ $omClass = ConceptoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -884,7 +884,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinConceptuals(); $obj3->addBoletinConceptual($obj1); @@ -892,11 +892,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -906,7 +906,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinConceptuals(); $obj4->addBoletinConceptual($obj1); @@ -948,22 +948,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinConceptualPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -973,7 +973,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinConceptuals(); $obj2->addBoletinConceptual($obj1); @@ -981,11 +981,11 @@ $omClass = ConceptoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -995,7 +995,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinConceptuals(); $obj3->addBoletinConceptual($obj1); @@ -1003,11 +1003,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1017,7 +1017,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinConceptuals(); $obj4->addBoletinConceptual($obj1); @@ -1059,22 +1059,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinConceptualPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1084,7 +1084,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinConceptuals(); $obj2->addBoletinConceptual($obj1); @@ -1092,11 +1092,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1106,7 +1106,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinConceptuals(); $obj3->addBoletinConceptual($obj1); @@ -1114,11 +1114,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1128,7 +1128,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinConceptuals(); $obj4->addBoletinConceptual($obj1); @@ -1170,22 +1170,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = BoletinConceptualPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1195,7 +1195,7 @@ break; } } - + if ($newObject) { $obj2->initBoletinConceptuals(); $obj2->addBoletinConceptual($obj1); @@ -1203,11 +1203,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1217,7 +1217,7 @@ break; } } - + if ($newObject) { $obj3->initBoletinConceptuals(); $obj3->addBoletinConceptual($obj1); @@ -1225,11 +1225,11 @@ $omClass = ConceptoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1239,7 +1239,7 @@ break; } } - + if ($newObject) { $obj4->initBoletinConceptuals(); $obj4->addBoletinConceptual($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -78,6 +78,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = CalendariovacunacionPeer::ID; @@ -88,6 +92,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = CalendariovacunacionPeer::NOMBRE; @@ -98,6 +106,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = CalendariovacunacionPeer::DESCRIPCION; @@ -108,6 +120,10 @@ public function setPeriodo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->periodo !== $v) { $this->periodo = $v; $this->modifiedColumns[] = CalendariovacunacionPeer::PERIODO; @@ -118,6 +134,10 @@ public function setObservacion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->observacion !== $v || $v === '') { $this->observacion = $v; $this->modifiedColumns[] = CalendariovacunacionPeer::OBSERVACION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -50,6 +50,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = CargobajaPeer::ID; @@ -60,6 +64,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = CargobajaPeer::NOMBRE; @@ -70,6 +78,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = CargobajaPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -134,6 +134,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = CiclolectivoPeer::ID; @@ -144,6 +148,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = CiclolectivoPeer::FK_ESTABLECIMIENTO_ID; @@ -192,6 +200,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = CiclolectivoPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,14 +202,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(CiclolectivoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(CiclolectivoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -284,7 +284,7 @@ } else { $criteria->addSelectColumn(CiclolectivoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -320,25 +320,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = CiclolectivoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -347,7 +347,7 @@ $temp_obj2->addCiclolectivo($obj1); break; } } - + if ($newObject) { $obj2->initCiclolectivos(); $obj2->addCiclolectivo($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConcepto.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseConcepto.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseConcepto.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -70,6 +70,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ConceptoPeer::ID; @@ -80,6 +84,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = ConceptoPeer::FK_ESTABLECIMIENTO_ID; @@ -94,6 +102,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = ConceptoPeer::NOMBRE; @@ -104,6 +116,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = ConceptoPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConceptoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseConceptoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseConceptoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -192,14 +192,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ConceptoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ConceptoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -274,7 +274,7 @@ } else { $criteria->addSelectColumn(ConceptoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -310,25 +310,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ConceptoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -337,7 +337,7 @@ $temp_obj2->addConcepto($obj1); break; } } - + if ($newObject) { $obj2->initConceptos(); $obj2->addConcepto($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ConceptobajaPeer::ID; @@ -66,6 +70,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = ConceptobajaPeer::NOMBRE; @@ -76,6 +84,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = ConceptobajaPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -145,6 +145,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = CuentaPeer::ID; @@ -155,6 +159,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = CuentaPeer::NOMBRE; @@ -165,6 +173,10 @@ public function setRazonSocial($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->razon_social !== $v || $v === '') { $this->razon_social = $v; $this->modifiedColumns[] = CuentaPeer::RAZON_SOCIAL; @@ -175,6 +187,10 @@ public function setCuit($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->cuit !== $v || $v === '') { $this->cuit = $v; $this->modifiedColumns[] = CuentaPeer::CUIT; @@ -185,6 +201,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v || $v === '') { $this->direccion = $v; $this->modifiedColumns[] = CuentaPeer::DIRECCION; @@ -195,6 +215,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v || $v === '') { $this->ciudad = $v; $this->modifiedColumns[] = CuentaPeer::CIUDAD; @@ -205,6 +229,10 @@ public function setCodigoPostal($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->codigo_postal !== $v || $v === '') { $this->codigo_postal = $v; $this->modifiedColumns[] = CuentaPeer::CODIGO_POSTAL; @@ -215,6 +243,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v || $v === '') { $this->telefono = $v; $this->modifiedColumns[] = CuentaPeer::TELEFONO; @@ -225,6 +257,10 @@ public function setFkProvinciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_provincia_id !== $v || $v === 0) { $this->fk_provincia_id = $v; $this->modifiedColumns[] = CuentaPeer::FK_PROVINCIA_ID; @@ -239,6 +275,10 @@ public function setFkTipoivaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipoiva_id !== $v || $v === 0) { $this->fk_tipoiva_id = $v; $this->modifiedColumns[] = CuentaPeer::FK_TIPOIVA_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCuentaPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -222,14 +222,14 @@ public static function doCountJoinTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(CuentaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(CuentaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -250,14 +250,14 @@ public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(CuentaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(CuentaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -379,7 +379,7 @@ } else { $criteria->addSelectColumn(CuentaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -422,25 +422,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = TipoivaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -449,21 +449,21 @@ $temp_obj2->addCuenta($obj1); break; } } - + if ($newObject) { $obj2->initCuentas(); $obj2->addCuenta($obj1); } - + $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -472,7 +472,7 @@ $temp_obj3->addCuenta($obj1); break; } } - + if ($newObject) { $obj3->initCuentas(); $obj3->addCuenta($obj1); @@ -488,14 +488,14 @@ public static function doCountJoinAllExceptTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(CuentaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(CuentaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -516,14 +516,14 @@ public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(CuentaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(CuentaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -560,22 +560,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -585,7 +585,7 @@ break; } } - + if ($newObject) { $obj2->initCuentas(); $obj2->addCuenta($obj1); @@ -617,22 +617,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = CuentaPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipoivaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -642,7 +642,7 @@ break; } } - + if ($newObject) { $obj2->initCuentas(); $obj2->addCuenta($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -78,6 +78,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = DistritoescolarPeer::ID; @@ -88,6 +92,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = DistritoescolarPeer::NOMBRE; @@ -98,6 +106,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = DistritoescolarPeer::DIRECCION; @@ -108,6 +120,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = DistritoescolarPeer::TELEFONO; @@ -118,6 +134,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = DistritoescolarPeer::CIUDAD; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -90,6 +90,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = DivisionPeer::ID; @@ -100,6 +104,10 @@ public function setFkAnioId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_anio_id !== $v || $v === 0) { $this->fk_anio_id = $v; $this->modifiedColumns[] = DivisionPeer::FK_ANIO_ID; @@ -114,6 +122,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = DivisionPeer::DESCRIPCION; @@ -124,6 +136,10 @@ public function setFkTurnosId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_turnos_id !== $v || $v === 0) { $this->fk_turnos_id = $v; $this->modifiedColumns[] = DivisionPeer::FK_TURNOS_ID; @@ -138,6 +154,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v || $v === 0) { $this->orden = $v; $this->modifiedColumns[] = DivisionPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDivisionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDivisionPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDivisionPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -197,14 +197,14 @@ public static function doCountJoinAnio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -225,14 +225,14 @@ public static function doCountJoinTurnos(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -354,7 +354,7 @@ } else { $criteria->addSelectColumn(DivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -397,25 +397,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = AnioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -424,21 +424,21 @@ $temp_obj2->addDivision($obj1); break; } } - + if ($newObject) { $obj2->initDivisions(); $obj2->addDivision($obj1); } - + $omClass = TurnosPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -447,7 +447,7 @@ $temp_obj3->addDivision($obj1); break; } } - + if ($newObject) { $obj3->initDivisions(); $obj3->addDivision($obj1); @@ -463,14 +463,14 @@ public static function doCountJoinAllExceptAnio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -491,14 +491,14 @@ public static function doCountJoinAllExceptTurnos(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -535,22 +535,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DivisionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TurnosPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -560,7 +560,7 @@ break; } } - + if ($newObject) { $obj2->initDivisions(); $obj2->addDivision($obj1); @@ -592,22 +592,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DivisionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AnioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -617,7 +617,7 @@ break; } } - + if ($newObject) { $obj2->initDivisions(); $obj2->addDivision($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -260,6 +260,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = DocentePeer::ID; @@ -270,6 +274,10 @@ public function setApellido($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->apellido !== $v || $v === '') { $this->apellido = $v; $this->modifiedColumns[] = DocentePeer::APELLIDO; @@ -280,6 +288,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = DocentePeer::NOMBRE; @@ -290,6 +302,10 @@ public function setSexo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->sexo !== $v || $v === 'U') { $this->sexo = $v; $this->modifiedColumns[] = DocentePeer::SEXO; @@ -317,6 +333,10 @@ public function setFkTipodocumentoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipodocumento_id !== $v || $v === 0) { $this->fk_tipodocumento_id = $v; $this->modifiedColumns[] = DocentePeer::FK_TIPODOCUMENTO_ID; @@ -331,6 +351,10 @@ public function setNroDocumento($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nro_documento !== $v || $v === '') { $this->nro_documento = $v; $this->modifiedColumns[] = DocentePeer::NRO_DOCUMENTO; @@ -341,6 +365,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v || $v === '') { $this->direccion = $v; $this->modifiedColumns[] = DocentePeer::DIRECCION; @@ -351,6 +379,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v || $v === '') { $this->ciudad = $v; $this->modifiedColumns[] = DocentePeer::CIUDAD; @@ -361,6 +393,10 @@ public function setCodigoPostal($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->codigo_postal !== $v || $v === '') { $this->codigo_postal = $v; $this->modifiedColumns[] = DocentePeer::CODIGO_POSTAL; @@ -371,6 +407,10 @@ public function setEmail($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->email !== $v || $v === '') { $this->email = $v; $this->modifiedColumns[] = DocentePeer::EMAIL; @@ -381,6 +421,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v || $v === '') { $this->telefono = $v; $this->modifiedColumns[] = DocentePeer::TELEFONO; @@ -391,6 +435,10 @@ public function setTelefonoMovil($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono_movil !== $v || $v === '') { $this->telefono_movil = $v; $this->modifiedColumns[] = DocentePeer::TELEFONO_MOVIL; @@ -401,6 +449,10 @@ public function setTitulo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->titulo !== $v || $v === '') { $this->titulo = $v; $this->modifiedColumns[] = DocentePeer::TITULO; @@ -441,6 +493,10 @@ public function setFkProvinciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_provincia_id !== $v || $v === 0) { $this->fk_provincia_id = $v; $this->modifiedColumns[] = DocentePeer::FK_PROVINCIA_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorario.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -119,6 +119,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = DocenteHorarioPeer::ID; @@ -129,6 +133,10 @@ public function setFkDocenteId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_docente_id !== $v || $v === 0) { $this->fk_docente_id = $v; $this->modifiedColumns[] = DocenteHorarioPeer::FK_DOCENTE_ID; @@ -143,6 +151,10 @@ public function setFkRepeticionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_repeticion_id !== $v || $v === 0) { $this->fk_repeticion_id = $v; $this->modifiedColumns[] = DocenteHorarioPeer::FK_REPETICION_ID; @@ -191,6 +203,10 @@ public function setDia($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->dia !== $v || $v === 0) { $this->dia = $v; $this->modifiedColumns[] = DocenteHorarioPeer::DIA; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocenteHorarioPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,14 +202,14 @@ public static function doCountJoinRepeticion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -230,14 +230,14 @@ public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -359,7 +359,7 @@ } else { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -402,25 +402,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DocenteHorarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -429,21 +429,21 @@ $temp_obj2->addDocenteHorario($obj1); break; } } - + if ($newObject) { $obj2->initDocenteHorarios(); $obj2->addDocenteHorario($obj1); } - + $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -452,7 +452,7 @@ $temp_obj3->addDocenteHorario($obj1); break; } } - + if ($newObject) { $obj3->initDocenteHorarios(); $obj3->addDocenteHorario($obj1); @@ -468,14 +468,14 @@ public static function doCountJoinAllExceptRepeticion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -496,14 +496,14 @@ public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocenteHorarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -540,22 +540,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DocenteHorarioPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -565,7 +565,7 @@ break; } } - + if ($newObject) { $obj2->initDocenteHorarios(); $obj2->addDocenteHorario($obj1); @@ -597,22 +597,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DocenteHorarioPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -622,7 +622,7 @@ break; } } - + if ($newObject) { $obj2->initDocenteHorarios(); $obj2->addDocenteHorario($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocentePeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocentePeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -262,14 +262,14 @@ public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -290,14 +290,14 @@ public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -419,7 +419,7 @@ } else { $criteria->addSelectColumn(DocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -462,25 +462,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -489,21 +489,21 @@ $temp_obj2->addDocente($obj1); break; } } - + if ($newObject) { $obj2->initDocentes(); $obj2->addDocente($obj1); } - + $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -512,7 +512,7 @@ $temp_obj3->addDocente($obj1); break; } } - + if ($newObject) { $obj3->initDocentes(); $obj3->addDocente($obj1); @@ -528,14 +528,14 @@ public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -556,14 +556,14 @@ public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(DocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(DocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -600,22 +600,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -625,7 +625,7 @@ break; } } - + if ($newObject) { $obj2->initDocentes(); $obj2->addDocente($obj1); @@ -657,22 +657,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = DocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -682,7 +682,7 @@ break; } } - + if ($newObject) { $obj2->initDocentes(); $obj2->addDocente($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEscalanota.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -104,6 +104,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = EscalanotaPeer::ID; @@ -114,6 +118,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = EscalanotaPeer::FK_ESTABLECIMIENTO_ID; @@ -128,6 +136,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = EscalanotaPeer::NOMBRE; @@ -138,6 +150,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = EscalanotaPeer::DESCRIPCION; @@ -148,6 +164,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v) { $this->orden = $v; $this->modifiedColumns[] = EscalanotaPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEscalanotaPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEscalanotaPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEscalanotaPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,14 +202,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EscalanotaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EscalanotaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -284,7 +284,7 @@ } else { $criteria->addSelectColumn(EscalanotaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -320,25 +320,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -347,7 +347,7 @@ $temp_obj2->addEscalanota($obj1); break; } } - + if ($newObject) { $obj2->initEscalanotas(); $obj2->addEscalanota($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -111,6 +111,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = EspacioPeer::ID; @@ -121,6 +125,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = EspacioPeer::NOMBRE; @@ -141,6 +149,10 @@ public function setCapacidad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->capacidad !== $v) { $this->capacidad = $v; $this->modifiedColumns[] = EspacioPeer::CAPACIDAD; @@ -151,6 +163,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = EspacioPeer::DESCRIPCION; @@ -161,6 +177,10 @@ public function setEstado($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->estado !== $v) { $this->estado = $v; $this->modifiedColumns[] = EspacioPeer::ESTADO; @@ -171,6 +191,10 @@ public function setFkTipoespacioId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipoespacio_id !== $v) { $this->fk_tipoespacio_id = $v; $this->modifiedColumns[] = EspacioPeer::FK_TIPOESPACIO_ID; @@ -185,6 +209,10 @@ public function setFkLocacionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_locacion_id !== $v || $v === 0) { $this->fk_locacion_id = $v; $this->modifiedColumns[] = EspacioPeer::FK_LOCACION_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEspacioPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEspacioPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEspacioPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -212,14 +212,14 @@ public static function doCountJoinTipoespacio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EspacioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EspacioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -240,14 +240,14 @@ public static function doCountJoinLocacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EspacioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EspacioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -369,7 +369,7 @@ } else { $criteria->addSelectColumn(EspacioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -412,25 +412,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EspacioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = TipoespacioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -439,21 +439,21 @@ $temp_obj2->addEspacio($obj1); break; } } - + if ($newObject) { $obj2->initEspacios(); $obj2->addEspacio($obj1); } - + $omClass = LocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -462,7 +462,7 @@ $temp_obj3->addEspacio($obj1); break; } } - + if ($newObject) { $obj3->initEspacios(); $obj3->addEspacio($obj1); @@ -478,14 +478,14 @@ public static function doCountJoinAllExceptTipoespacio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EspacioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EspacioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -506,14 +506,14 @@ public static function doCountJoinAllExceptLocacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EspacioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EspacioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -550,22 +550,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EspacioPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = LocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -575,7 +575,7 @@ break; } } - + if ($newObject) { $obj2->initEspacios(); $obj2->addEspacio($obj1); @@ -607,22 +607,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EspacioPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipoespacioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -632,7 +632,7 @@ break; } } - + if ($newObject) { $obj2->initEspacios(); $obj2->addEspacio($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -152,6 +152,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = EstablecimientoPeer::ID; @@ -162,6 +166,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = EstablecimientoPeer::NOMBRE; @@ -172,6 +180,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = EstablecimientoPeer::DESCRIPCION; @@ -182,6 +194,10 @@ public function setFkDistritoescolarId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_distritoescolar_id !== $v || $v === 0) { $this->fk_distritoescolar_id = $v; $this->modifiedColumns[] = EstablecimientoPeer::FK_DISTRITOESCOLAR_ID; @@ -196,6 +212,10 @@ public function setFkOrganizacionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_organizacion_id !== $v || $v === 0) { $this->fk_organizacion_id = $v; $this->modifiedColumns[] = EstablecimientoPeer::FK_ORGANIZACION_ID; @@ -210,6 +230,10 @@ public function setFkNiveltipoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_niveltipo_id !== $v || $v === 0) { $this->fk_niveltipo_id = $v; $this->modifiedColumns[] = EstablecimientoPeer::FK_NIVELTIPO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimientoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,14 +202,14 @@ public static function doCountJoinNiveltipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -230,14 +230,14 @@ public static function doCountJoinOrganizacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -258,14 +258,14 @@ public static function doCountJoinDistritoescolar(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -434,7 +434,7 @@ } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -484,25 +484,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = NiveltipoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -511,21 +511,21 @@ $temp_obj2->addEstablecimiento($obj1); break; } } - + if ($newObject) { $obj2->initEstablecimientos(); $obj2->addEstablecimiento($obj1); } - + $omClass = OrganizacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -534,21 +534,21 @@ $temp_obj3->addEstablecimiento($obj1); break; } } - + if ($newObject) { $obj3->initEstablecimientos(); $obj3->addEstablecimiento($obj1); } - + $omClass = DistritoescolarPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -557,7 +557,7 @@ $temp_obj4->addEstablecimiento($obj1); break; } } - + if ($newObject) { $obj4->initEstablecimientos(); $obj4->addEstablecimiento($obj1); @@ -573,14 +573,14 @@ public static function doCountJoinAllExceptNiveltipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -603,14 +603,14 @@ public static function doCountJoinAllExceptOrganizacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -633,14 +633,14 @@ public static function doCountJoinAllExceptDistritoescolar(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(EstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(EstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -684,22 +684,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = OrganizacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -709,7 +709,7 @@ break; } } - + if ($newObject) { $obj2->initEstablecimientos(); $obj2->addEstablecimiento($obj1); @@ -717,11 +717,11 @@ $omClass = DistritoescolarPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -731,7 +731,7 @@ break; } } - + if ($newObject) { $obj3->initEstablecimientos(); $obj3->addEstablecimiento($obj1); @@ -768,22 +768,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = NiveltipoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -793,7 +793,7 @@ break; } } - + if ($newObject) { $obj2->initEstablecimientos(); $obj2->addEstablecimiento($obj1); @@ -801,11 +801,11 @@ $omClass = DistritoescolarPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -815,7 +815,7 @@ break; } } - + if ($newObject) { $obj3->initEstablecimientos(); $obj3->addEstablecimiento($obj1); @@ -852,22 +852,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = EstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = NiveltipoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -877,7 +877,7 @@ break; } } - + if ($newObject) { $obj2->initEstablecimientos(); $obj2->addEstablecimiento($obj1); @@ -885,11 +885,11 @@ $omClass = OrganizacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -899,7 +899,7 @@ break; } } - + if ($newObject) { $obj3->initEstablecimientos(); $obj3->addEstablecimiento($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -163,6 +163,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = EventoPeer::ID; @@ -173,6 +177,10 @@ public function setTitulo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->titulo !== $v) { $this->titulo = $v; $this->modifiedColumns[] = EventoPeer::TITULO; @@ -217,6 +225,10 @@ public function setTipo($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->tipo !== $v || $v === 0) { $this->tipo = $v; $this->modifiedColumns[] = EventoPeer::TIPO; @@ -227,6 +239,10 @@ public function setFrecuencia($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->frecuencia !== $v || $v === 0) { $this->frecuencia = $v; $this->modifiedColumns[] = EventoPeer::FRECUENCIA; @@ -237,6 +253,10 @@ public function setFrecuenciaIntervalo($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->frecuencia_intervalo !== $v || $v === 0) { $this->frecuencia_intervalo = $v; $this->modifiedColumns[] = EventoPeer::FRECUENCIA_INTERVALO; @@ -247,6 +267,10 @@ public function setRecurrenciaFin($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->recurrencia_fin !== $v || $v === '') { $this->recurrencia_fin = $v; $this->modifiedColumns[] = EventoPeer::RECURRENCIA_FIN; @@ -257,6 +281,10 @@ public function setRecurrenciaDias($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->recurrencia_dias !== $v || $v === 0) { $this->recurrencia_dias = $v; $this->modifiedColumns[] = EventoPeer::RECURRENCIA_DIAS; @@ -267,6 +295,10 @@ public function setEstado($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->estado !== $v || $v === 0) { $this->estado = $v; $this->modifiedColumns[] = EventoPeer::ESTADO; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -132,6 +132,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ExamenPeer::ID; @@ -142,6 +146,10 @@ public function setFkEscalanotaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_escalanota_id !== $v || $v === 0) { $this->fk_escalanota_id = $v; $this->modifiedColumns[] = ExamenPeer::FK_ESCALANOTA_ID; @@ -156,6 +164,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v || $v === 0) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = ExamenPeer::FK_ALUMNO_ID; @@ -170,6 +182,10 @@ public function setFkActividadId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_actividad_id !== $v || $v === 0) { $this->fk_actividad_id = $v; $this->modifiedColumns[] = ExamenPeer::FK_ACTIVIDAD_ID; @@ -184,6 +200,10 @@ public function setFkPeriodoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_periodo_id !== $v || $v === 0) { $this->fk_periodo_id = $v; $this->modifiedColumns[] = ExamenPeer::FK_PERIODO_ID; @@ -198,6 +218,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = ExamenPeer::NOMBRE; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseExamenPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseExamenPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseExamenPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -212,14 +212,14 @@ public static function doCountJoinEscalanota(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -240,14 +240,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -268,14 +268,14 @@ public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -296,14 +296,14 @@ public static function doCountJoinPeriodo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -519,7 +519,7 @@ } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -576,25 +576,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ExamenPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -603,21 +603,21 @@ $temp_obj2->addExamen($obj1); break; } } - + if ($newObject) { $obj2->initExamens(); $obj2->addExamen($obj1); } - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -626,21 +626,21 @@ $temp_obj3->addExamen($obj1); break; } } - + if ($newObject) { $obj3->initExamens(); $obj3->addExamen($obj1); } - + $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -649,21 +649,21 @@ $temp_obj4->addExamen($obj1); break; } } - + if ($newObject) { $obj4->initExamens(); $obj4->addExamen($obj1); } - + $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -672,7 +672,7 @@ $temp_obj5->addExamen($obj1); break; } } - + if ($newObject) { $obj5->initExamens(); $obj5->addExamen($obj1); @@ -688,14 +688,14 @@ public static function doCountJoinAllExceptEscalanota(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -720,14 +720,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -752,14 +752,14 @@ public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -784,14 +784,14 @@ public static function doCountJoinAllExceptPeriodo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ExamenPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ExamenPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -842,22 +842,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ExamenPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -867,7 +867,7 @@ break; } } - + if ($newObject) { $obj2->initExamens(); $obj2->addExamen($obj1); @@ -875,11 +875,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -889,7 +889,7 @@ break; } } - + if ($newObject) { $obj3->initExamens(); $obj3->addExamen($obj1); @@ -897,11 +897,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -911,7 +911,7 @@ break; } } - + if ($newObject) { $obj4->initExamens(); $obj4->addExamen($obj1); @@ -953,22 +953,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ExamenPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -978,7 +978,7 @@ break; } } - + if ($newObject) { $obj2->initExamens(); $obj2->addExamen($obj1); @@ -986,11 +986,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1000,7 +1000,7 @@ break; } } - + if ($newObject) { $obj3->initExamens(); $obj3->addExamen($obj1); @@ -1008,11 +1008,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1022,7 +1022,7 @@ break; } } - + if ($newObject) { $obj4->initExamens(); $obj4->addExamen($obj1); @@ -1064,22 +1064,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ExamenPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1089,7 +1089,7 @@ break; } } - + if ($newObject) { $obj2->initExamens(); $obj2->addExamen($obj1); @@ -1097,11 +1097,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1111,7 +1111,7 @@ break; } } - + if ($newObject) { $obj3->initExamens(); $obj3->addExamen($obj1); @@ -1119,11 +1119,11 @@ $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1133,7 +1133,7 @@ break; } } - + if ($newObject) { $obj4->initExamens(); $obj4->addExamen($obj1); @@ -1175,22 +1175,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ExamenPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EscalanotaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1200,7 +1200,7 @@ break; } } - + if ($newObject) { $obj2->initExamens(); $obj2->addExamen($obj1); @@ -1208,11 +1208,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1222,7 +1222,7 @@ break; } } - + if ($newObject) { $obj3->initExamens(); $obj3->addExamen($obj1); @@ -1230,11 +1230,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1244,7 +1244,7 @@ break; } } - + if ($newObject) { $obj4->initExamens(); $obj4->addExamen($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseFeriado.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -101,6 +101,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = FeriadoPeer::ID; @@ -111,6 +115,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = FeriadoPeer::NOMBRE; @@ -158,6 +166,10 @@ public function setFkCiclolectivoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_ciclolectivo_id !== $v || $v === 0) { $this->fk_ciclolectivo_id = $v; $this->modifiedColumns[] = FeriadoPeer::FK_CICLOLECTIVO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseFeriadoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseFeriadoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseFeriadoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,14 +202,14 @@ public static function doCountJoinCiclolectivo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(FeriadoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(FeriadoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -284,7 +284,7 @@ } else { $criteria->addSelectColumn(FeriadoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -320,25 +320,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = FeriadoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = CiclolectivoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -347,7 +347,7 @@ $temp_obj2->addFeriado($obj1); break; } } - + if ($newObject) { $obj2->initFeriados(); $obj2->addFeriado($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolar.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -155,6 +155,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = HorarioescolarPeer::ID; @@ -165,6 +169,10 @@ public function setDia($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->dia !== $v || $v === 0) { $this->dia = $v; $this->modifiedColumns[] = HorarioescolarPeer::DIA; @@ -209,6 +217,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = HorarioescolarPeer::NOMBRE; @@ -219,6 +231,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = HorarioescolarPeer::DESCRIPCION; @@ -229,6 +245,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = HorarioescolarPeer::FK_ESTABLECIMIENTO_ID; @@ -243,6 +263,10 @@ public function setFkTurnosId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_turnos_id !== $v || $v === 0) { $this->fk_turnos_id = $v; $this->modifiedColumns[] = HorarioescolarPeer::FK_TURNOS_ID; @@ -257,6 +281,10 @@ public function setFkHorarioescolartipoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_horarioescolartipo_id !== $v || $v === 0) { $this->fk_horarioescolartipo_id = $v; $this->modifiedColumns[] = HorarioescolarPeer::FK_HORARIOESCOLARTIPO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolarPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -217,14 +217,14 @@ public static function doCountJoinHorarioescolartipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(HorarioescolarPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -245,14 +245,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(HorarioescolarPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -273,14 +273,14 @@ public static function doCountJoinTurnos(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(HorarioescolarPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -449,7 +449,7 @@ } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -499,25 +499,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = HorarioescolarPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = HorarioescolartipoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -526,21 +526,21 @@ $temp_obj2->addHorarioescolar($obj1); break; } } - + if ($newObject) { $obj2->initHorarioescolars(); $obj2->addHorarioescolar($obj1); } - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -549,21 +549,21 @@ $temp_obj3->addHorarioescolar($obj1); break; } } - + if ($newObject) { $obj3->initHorarioescolars(); $obj3->addHorarioescolar($obj1); } - + $omClass = TurnosPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -572,7 +572,7 @@ $temp_obj4->addHorarioescolar($obj1); break; } } - + if ($newObject) { $obj4->initHorarioescolars(); $obj4->addHorarioescolar($obj1); @@ -588,14 +588,14 @@ public static function doCountJoinAllExceptHorarioescolartipo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(HorarioescolarPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -618,14 +618,14 @@ public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(HorarioescolarPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -648,14 +648,14 @@ public static function doCountJoinAllExceptTurnos(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(HorarioescolarPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(HorarioescolarPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -699,22 +699,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = HorarioescolarPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -724,7 +724,7 @@ break; } } - + if ($newObject) { $obj2->initHorarioescolars(); $obj2->addHorarioescolar($obj1); @@ -732,11 +732,11 @@ $omClass = TurnosPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -746,7 +746,7 @@ break; } } - + if ($newObject) { $obj3->initHorarioescolars(); $obj3->addHorarioescolar($obj1); @@ -783,22 +783,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = HorarioescolarPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = HorarioescolartipoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -808,7 +808,7 @@ break; } } - + if ($newObject) { $obj2->initHorarioescolars(); $obj2->addHorarioescolar($obj1); @@ -816,11 +816,11 @@ $omClass = TurnosPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -830,7 +830,7 @@ break; } } - + if ($newObject) { $obj3->initHorarioescolars(); $obj3->addHorarioescolar($obj1); @@ -867,22 +867,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = HorarioescolarPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = HorarioescolartipoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -892,7 +892,7 @@ break; } } - + if ($newObject) { $obj2->initHorarioescolars(); $obj2->addHorarioescolar($obj1); @@ -900,11 +900,11 @@ $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -914,7 +914,7 @@ break; } } - + if ($newObject) { $obj3->initHorarioescolars(); $obj3->addHorarioescolar($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = HorarioescolartipoPeer::ID; @@ -66,6 +70,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = HorarioescolartipoPeer::NOMBRE; @@ -76,6 +84,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = HorarioescolartipoPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjunto.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -45,6 +45,10 @@ public function setFkLegajopedagogicoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_legajopedagogico_id !== $v) { $this->fk_legajopedagogico_id = $v; $this->modifiedColumns[] = LegajoadjuntoPeer::FK_LEGAJOPEDAGOGICO_ID; @@ -59,6 +63,10 @@ public function setFkAdjuntoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_adjunto_id !== $v) { $this->fk_adjunto_id = $v; $this->modifiedColumns[] = LegajoadjuntoPeer::FK_ADJUNTO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajoadjuntoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -182,14 +182,14 @@ public static function doCountJoinAdjunto(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -210,14 +210,14 @@ public static function doCountJoinLegajopedagogico(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -339,7 +339,7 @@ } else { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -382,25 +382,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajoadjuntoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = AdjuntoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -409,21 +409,21 @@ $temp_obj2->addLegajoadjunto($obj1); break; } } - + if ($newObject) { $obj2->initLegajoadjuntos(); $obj2->addLegajoadjunto($obj1); } - + $omClass = LegajopedagogicoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -432,7 +432,7 @@ $temp_obj3->addLegajoadjunto($obj1); break; } } - + if ($newObject) { $obj3->initLegajoadjuntos(); $obj3->addLegajoadjunto($obj1); @@ -448,14 +448,14 @@ public static function doCountJoinAllExceptAdjunto(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -476,14 +476,14 @@ public static function doCountJoinAllExceptLegajopedagogico(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajoadjuntoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -520,22 +520,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajoadjuntoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = LegajopedagogicoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -545,7 +545,7 @@ break; } } - + if ($newObject) { $obj2->initLegajoadjuntos(); $obj2->addLegajoadjunto($obj1); @@ -577,22 +577,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajoadjuntoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AdjuntoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -602,7 +602,7 @@ break; } } - + if ($newObject) { $obj2->initLegajoadjuntos(); $obj2->addLegajoadjunto($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajocategoria.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajocategoria.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajocategoria.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -45,6 +45,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = LegajocategoriaPeer::ID; @@ -55,6 +59,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = LegajocategoriaPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogico.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -135,6 +135,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = LegajopedagogicoPeer::ID; @@ -145,6 +149,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = LegajopedagogicoPeer::FK_ALUMNO_ID; @@ -159,6 +167,10 @@ public function setTitulo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->titulo !== $v) { $this->titulo = $v; $this->modifiedColumns[] = LegajopedagogicoPeer::TITULO; @@ -228,6 +240,10 @@ public function setFkUsuarioId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_usuario_id !== $v) { $this->fk_usuario_id = $v; $this->modifiedColumns[] = LegajopedagogicoPeer::FK_USUARIO_ID; @@ -242,6 +258,10 @@ public function setFkLegajocategoriaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_legajocategoria_id !== $v) { $this->fk_legajocategoria_id = $v; $this->modifiedColumns[] = LegajopedagogicoPeer::FK_LEGAJOCATEGORIA_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLegajopedagogicoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -212,14 +212,14 @@ public static function doCountJoinLegajocategoria(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -240,14 +240,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -268,14 +268,14 @@ public static function doCountJoinUsuario(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -444,7 +444,7 @@ } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -494,25 +494,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajopedagogicoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = LegajocategoriaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -521,21 +521,21 @@ $temp_obj2->addLegajopedagogico($obj1); break; } } - + if ($newObject) { $obj2->initLegajopedagogicos(); $obj2->addLegajopedagogico($obj1); } - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -544,21 +544,21 @@ $temp_obj3->addLegajopedagogico($obj1); break; } } - + if ($newObject) { $obj3->initLegajopedagogicos(); $obj3->addLegajopedagogico($obj1); } - + $omClass = UsuarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -567,7 +567,7 @@ $temp_obj4->addLegajopedagogico($obj1); break; } } - + if ($newObject) { $obj4->initLegajopedagogicos(); $obj4->addLegajopedagogico($obj1); @@ -583,14 +583,14 @@ public static function doCountJoinAllExceptLegajocategoria(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -613,14 +613,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -643,14 +643,14 @@ public static function doCountJoinAllExceptUsuario(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LegajopedagogicoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -694,22 +694,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajopedagogicoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -719,7 +719,7 @@ break; } } - + if ($newObject) { $obj2->initLegajopedagogicos(); $obj2->addLegajopedagogico($obj1); @@ -727,11 +727,11 @@ $omClass = UsuarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -741,7 +741,7 @@ break; } } - + if ($newObject) { $obj3->initLegajopedagogicos(); $obj3->addLegajopedagogico($obj1); @@ -778,22 +778,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajopedagogicoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = LegajocategoriaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -803,7 +803,7 @@ break; } } - + if ($newObject) { $obj2->initLegajopedagogicos(); $obj2->addLegajopedagogico($obj1); @@ -811,11 +811,11 @@ $omClass = UsuarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -825,7 +825,7 @@ break; } } - + if ($newObject) { $obj3->initLegajopedagogicos(); $obj3->addLegajopedagogico($obj1); @@ -862,22 +862,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LegajopedagogicoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = LegajocategoriaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -887,7 +887,7 @@ break; } } - + if ($newObject) { $obj2->initLegajopedagogicos(); $obj2->addLegajopedagogico($obj1); @@ -895,11 +895,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -909,7 +909,7 @@ break; } } - + if ($newObject) { $obj3->initLegajopedagogicos(); $obj3->addLegajopedagogico($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -178,6 +178,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = LocacionPeer::ID; @@ -188,6 +192,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = LocacionPeer::NOMBRE; @@ -198,6 +206,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = LocacionPeer::DESCRIPCION; @@ -208,6 +220,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v || $v === '') { $this->direccion = $v; $this->modifiedColumns[] = LocacionPeer::DIRECCION; @@ -218,6 +234,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v || $v === '') { $this->ciudad = $v; $this->modifiedColumns[] = LocacionPeer::CIUDAD; @@ -228,6 +248,10 @@ public function setCodigoPostal($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->codigo_postal !== $v || $v === '') { $this->codigo_postal = $v; $this->modifiedColumns[] = LocacionPeer::CODIGO_POSTAL; @@ -238,6 +262,10 @@ public function setFkProvinciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_provincia_id !== $v || $v === 0) { $this->fk_provincia_id = $v; $this->modifiedColumns[] = LocacionPeer::FK_PROVINCIA_ID; @@ -252,6 +280,10 @@ public function setFkTipolocacionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipolocacion_id !== $v || $v === 0) { $this->fk_tipolocacion_id = $v; $this->modifiedColumns[] = LocacionPeer::FK_TIPOLOCACION_ID; @@ -266,6 +298,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = LocacionPeer::TELEFONO; @@ -276,6 +312,10 @@ public function setFax($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->fax !== $v) { $this->fax = $v; $this->modifiedColumns[] = LocacionPeer::FAX; @@ -286,6 +326,10 @@ public function setEncargado($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->encargado !== $v) { $this->encargado = $v; $this->modifiedColumns[] = LocacionPeer::ENCARGADO; @@ -296,6 +340,10 @@ public function setEncargadoTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->encargado_telefono !== $v) { $this->encargado_telefono = $v; $this->modifiedColumns[] = LocacionPeer::ENCARGADO_TELEFONO; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLocacionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLocacionPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLocacionPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -237,14 +237,14 @@ public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -265,14 +265,14 @@ public static function doCountJoinTipolocacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -394,7 +394,7 @@ } else { $criteria->addSelectColumn(LocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -437,25 +437,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -464,21 +464,21 @@ $temp_obj2->addLocacion($obj1); break; } } - + if ($newObject) { $obj2->initLocacions(); $obj2->addLocacion($obj1); } - + $omClass = TipolocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -487,7 +487,7 @@ $temp_obj3->addLocacion($obj1); break; } } - + if ($newObject) { $obj3->initLocacions(); $obj3->addLocacion($obj1); @@ -503,14 +503,14 @@ public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -531,14 +531,14 @@ public static function doCountJoinAllExceptTipolocacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(LocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(LocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -575,22 +575,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LocacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipolocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -600,7 +600,7 @@ break; } } - + if ($newObject) { $obj2->initLocacions(); $obj2->addLocacion($obj1); @@ -632,22 +632,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = LocacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -657,7 +657,7 @@ break; } } - + if ($newObject) { $obj2->initLocacions(); $obj2->addLocacion($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseMenu.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseMenu.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseMenu.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -103,6 +103,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = MenuPeer::ID; @@ -113,6 +117,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = MenuPeer::NOMBRE; @@ -123,6 +131,10 @@ public function setLink($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->link !== $v || $v === '') { $this->link = $v; $this->modifiedColumns[] = MenuPeer::LINK; @@ -133,6 +145,10 @@ public function setPerm($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->perm !== $v || $v === '') { $this->perm = $v; $this->modifiedColumns[] = MenuPeer::PERM; @@ -143,6 +159,10 @@ public function setTarget($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->target !== $v || $v === '') { $this->target = $v; $this->modifiedColumns[] = MenuPeer::TARGET; @@ -153,6 +173,10 @@ public function setFkPadreMenuId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_padre_menu_id !== $v) { $this->fk_padre_menu_id = $v; $this->modifiedColumns[] = MenuPeer::FK_PADRE_MENU_ID; @@ -167,6 +191,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v) { $this->orden = $v; $this->modifiedColumns[] = MenuPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseMenuPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseMenuPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseMenuPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -214,7 +214,7 @@ } else { $criteria->addSelectColumn(MenuPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -243,12 +243,12 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = MenuPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -78,6 +78,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ModuloPeer::ID; @@ -88,6 +92,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = ModuloPeer::NOMBRE; @@ -98,6 +106,10 @@ public function setTitulo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->titulo !== $v) { $this->titulo = $v; $this->modifiedColumns[] = ModuloPeer::TITULO; @@ -108,6 +120,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = ModuloPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = NiveltipoPeer::ID; @@ -66,6 +70,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = NiveltipoPeer::NOMBRE; @@ -76,6 +84,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = NiveltipoPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -150,6 +150,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = OrganizacionPeer::ID; @@ -160,6 +164,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = OrganizacionPeer::NOMBRE; @@ -170,6 +178,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = OrganizacionPeer::DESCRIPCION; @@ -180,6 +192,10 @@ public function setRazonSocial($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->razon_social !== $v || $v === '') { $this->razon_social = $v; $this->modifiedColumns[] = OrganizacionPeer::RAZON_SOCIAL; @@ -190,6 +206,10 @@ public function setCuit($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->cuit !== $v || $v === '') { $this->cuit = $v; $this->modifiedColumns[] = OrganizacionPeer::CUIT; @@ -200,6 +220,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v || $v === '') { $this->direccion = $v; $this->modifiedColumns[] = OrganizacionPeer::DIRECCION; @@ -210,6 +234,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v || $v === '') { $this->ciudad = $v; $this->modifiedColumns[] = OrganizacionPeer::CIUDAD; @@ -220,6 +248,10 @@ public function setCodigoPostal($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->codigo_postal !== $v || $v === '') { $this->codigo_postal = $v; $this->modifiedColumns[] = OrganizacionPeer::CODIGO_POSTAL; @@ -230,6 +262,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v || $v === '') { $this->telefono = $v; $this->modifiedColumns[] = OrganizacionPeer::TELEFONO; @@ -240,6 +276,10 @@ public function setFkProvinciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_provincia_id !== $v || $v === 0) { $this->fk_provincia_id = $v; $this->modifiedColumns[] = OrganizacionPeer::FK_PROVINCIA_ID; @@ -254,6 +294,10 @@ public function setFkTipoivaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipoiva_id !== $v || $v === 0) { $this->fk_tipoiva_id = $v; $this->modifiedColumns[] = OrganizacionPeer::FK_TIPOIVA_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacionPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -227,14 +227,14 @@ public static function doCountJoinTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(OrganizacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(OrganizacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -255,14 +255,14 @@ public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(OrganizacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(OrganizacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -384,7 +384,7 @@ } else { $criteria->addSelectColumn(OrganizacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -427,25 +427,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = OrganizacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = TipoivaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -454,21 +454,21 @@ $temp_obj2->addOrganizacion($obj1); break; } } - + if ($newObject) { $obj2->initOrganizacions(); $obj2->addOrganizacion($obj1); } - + $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -477,7 +477,7 @@ $temp_obj3->addOrganizacion($obj1); break; } } - + if ($newObject) { $obj3->initOrganizacions(); $obj3->addOrganizacion($obj1); @@ -493,14 +493,14 @@ public static function doCountJoinAllExceptTipoiva(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(OrganizacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(OrganizacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -521,14 +521,14 @@ public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(OrganizacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(OrganizacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -565,22 +565,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = OrganizacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -590,7 +590,7 @@ break; } } - + if ($newObject) { $obj2->initOrganizacions(); $obj2->addOrganizacion($obj1); @@ -622,22 +622,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = OrganizacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = TipoivaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -647,7 +647,7 @@ break; } } - + if ($newObject) { $obj2->initOrganizacions(); $obj2->addOrganizacion($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BasePais.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -73,6 +73,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = PaisPeer::ID; @@ -83,6 +87,10 @@ public function setNombreLargo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre_largo !== $v || $v === '') { $this->nombre_largo = $v; $this->modifiedColumns[] = PaisPeer::NOMBRE_LARGO; @@ -93,6 +101,10 @@ public function setNombreCorto($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre_corto !== $v || $v === '') { $this->nombre_corto = $v; $this->modifiedColumns[] = PaisPeer::NOMBRE_CORTO; @@ -103,6 +115,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v || $v === 0) { $this->orden = $v; $this->modifiedColumns[] = PaisPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -123,6 +123,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = PeriodoPeer::ID; @@ -133,6 +137,10 @@ public function setFkCiclolectivoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_ciclolectivo_id !== $v) { $this->fk_ciclolectivo_id = $v; $this->modifiedColumns[] = PeriodoPeer::FK_CICLOLECTIVO_ID; @@ -181,6 +189,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = PeriodoPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BasePeriodoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePeriodoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BasePeriodoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -197,14 +197,14 @@ public static function doCountJoinCiclolectivo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(PeriodoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(PeriodoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -279,7 +279,7 @@ } else { $criteria->addSelectColumn(PeriodoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -315,25 +315,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = PeriodoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = CiclolectivoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -342,7 +342,7 @@ $temp_obj2->addPeriodo($obj1); break; } } - + if ($newObject) { $obj2->initPeriodos(); $obj2->addPeriodo($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -87,6 +87,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = PermisoPeer::ID; @@ -97,6 +101,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = PermisoPeer::NOMBRE; @@ -107,6 +115,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = PermisoPeer::DESCRIPCION; @@ -117,6 +129,10 @@ public function setFkModuloId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_modulo_id !== $v || $v === 0) { $this->fk_modulo_id = $v; $this->modifiedColumns[] = PermisoPeer::FK_MODULO_ID; @@ -131,6 +147,10 @@ public function setCredencial($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->credencial !== $v) { $this->credencial = $v; $this->modifiedColumns[] = PermisoPeer::CREDENCIAL; Modified: prosistem/alba/trunk/alba/lib/model/om/BasePermisoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePermisoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BasePermisoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -197,14 +197,14 @@ public static function doCountJoinModulo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(PermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(PermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -279,7 +279,7 @@ } else { $criteria->addSelectColumn(PermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -315,25 +315,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = PermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = ModuloPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -342,7 +342,7 @@ $temp_obj2->addPermiso($obj1); break; } } - + if ($newObject) { $obj2->initPermisos(); $obj2->addPermiso($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -61,6 +61,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = PreferenciaPeer::ID; @@ -71,6 +75,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = PreferenciaPeer::NOMBRE; @@ -81,6 +89,10 @@ public function setValorPorDefecto($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->valor_por_defecto !== $v) { $this->valor_por_defecto = $v; $this->modifiedColumns[] = PreferenciaPeer::VALOR_POR_DEFECTO; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -111,6 +111,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ProvinciaPeer::ID; @@ -121,6 +125,10 @@ public function setNombreCorto($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre_corto !== $v || $v === '') { $this->nombre_corto = $v; $this->modifiedColumns[] = ProvinciaPeer::NOMBRE_CORTO; @@ -131,6 +139,10 @@ public function setNombreLargo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre_largo !== $v || $v === '') { $this->nombre_largo = $v; $this->modifiedColumns[] = ProvinciaPeer::NOMBRE_LARGO; @@ -141,6 +153,10 @@ public function setFkPaisId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_pais_id !== $v || $v === 0) { $this->fk_pais_id = $v; $this->modifiedColumns[] = ProvinciaPeer::FK_PAIS_ID; @@ -155,6 +171,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v || $v === 0) { $this->orden = $v; $this->modifiedColumns[] = ProvinciaPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseProvinciaPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseProvinciaPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseProvinciaPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -197,14 +197,14 @@ public static function doCountJoinPais(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ProvinciaPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ProvinciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -279,7 +279,7 @@ } else { $criteria->addSelectColumn(ProvinciaPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -315,25 +315,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = PaisPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -342,7 +342,7 @@ $temp_obj2->addProvincia($obj1); break; } } - + if ($newObject) { $obj2->initProvincias(); $obj2->addProvincia($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocente.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -9,17 +9,13 @@ - protected $id; + protected $fk_actividad_id; - protected $fk_actividad_id = 0; + protected $fk_docente_id; - - protected $fk_docente_id = 0; - - protected $aDocente; @@ -32,13 +28,6 @@ protected $alreadyInValidation = false; - public function getId() - { - - return $this->id; - } - - public function getFkActividadId() { @@ -53,20 +42,14 @@ } - public function setId($v) + public function setFkActividadId($v) { - if ($this->id !== $v) { - $this->id = $v; - $this->modifiedColumns[] = RelActividadDocentePeer::ID; + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; } - } - - public function setFkActividadId($v) - { - - if ($this->fk_actividad_id !== $v || $v === 0) { + if ($this->fk_actividad_id !== $v) { $this->fk_actividad_id = $v; $this->modifiedColumns[] = RelActividadDocentePeer::FK_ACTIVIDAD_ID; } @@ -80,7 +63,11 @@ public function setFkDocenteId($v) { - if ($this->fk_docente_id !== $v || $v === 0) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->fk_docente_id !== $v) { $this->fk_docente_id = $v; $this->modifiedColumns[] = RelActividadDocentePeer::FK_DOCENTE_ID; } @@ -95,17 +82,15 @@ { try { - $this->id = $rs->getInt($startcol + 0); + $this->fk_actividad_id = $rs->getInt($startcol + 0); - $this->fk_actividad_id = $rs->getInt($startcol + 1); + $this->fk_docente_id = $rs->getInt($startcol + 1); - $this->fk_docente_id = $rs->getInt($startcol + 2); - $this->resetModified(); $this->setNew(false); - return $startcol + 3; + return $startcol + 2; } catch (Exception $e) { throw new PropelException("Error populating RelActividadDocente object", $e); } @@ -182,7 +167,6 @@ if ($this->isNew()) { $pk = RelActividadDocentePeer::doInsert($this, $con); $affectedRows += 1; - $this->setId($pk); $this->setNew(false); } else { $affectedRows += RelActividadDocentePeer::doUpdate($this, $con); @@ -263,12 +247,9 @@ { switch($pos) { case 0: - return $this->getId(); - break; - case 1: return $this->getFkActividadId(); break; - case 2: + case 1: return $this->getFkDocenteId(); break; default: @@ -281,9 +262,8 @@ { $keys = RelActividadDocentePeer::getFieldNames($keyType); $result = array( - $keys[0] => $this->getId(), - $keys[1] => $this->getFkActividadId(), - $keys[2] => $this->getFkDocenteId(), + $keys[0] => $this->getFkActividadId(), + $keys[1] => $this->getFkDocenteId(), ); return $result; } @@ -300,12 +280,9 @@ { switch($pos) { case 0: - $this->setId($value); - break; - case 1: $this->setFkActividadId($value); break; - case 2: + case 1: $this->setFkDocenteId($value); break; } } @@ -315,9 +292,8 @@ { $keys = RelActividadDocentePeer::getFieldNames($keyType); - if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]); - if (array_key_exists($keys[1], $arr)) $this->setFkActividadId($arr[$keys[1]]); - if (array_key_exists($keys[2], $arr)) $this->setFkDocenteId($arr[$keys[2]]); + if (array_key_exists($keys[0], $arr)) $this->setFkActividadId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setFkDocenteId($arr[$keys[1]]); } @@ -325,7 +301,6 @@ { $criteria = new Criteria(RelActividadDocentePeer::DATABASE_NAME); - if ($this->isColumnModified(RelActividadDocentePeer::ID)) $criteria->add(RelActividadDocentePeer::ID, $this->id); if ($this->isColumnModified(RelActividadDocentePeer::FK_ACTIVIDAD_ID)) $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->fk_actividad_id); if ($this->isColumnModified(RelActividadDocentePeer::FK_DOCENTE_ID)) $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); @@ -337,7 +312,8 @@ { $criteria = new Criteria(RelActividadDocentePeer::DATABASE_NAME); - $criteria->add(RelActividadDocentePeer::ID, $this->id); + $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $this->fk_actividad_id); + $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $this->fk_docente_id); return $criteria; } @@ -345,27 +321,34 @@ public function getPrimaryKey() { - return $this->getId(); + $pks = array(); + + $pks[0] = $this->getFkActividadId(); + + $pks[1] = $this->getFkDocenteId(); + + return $pks; } - public function setPrimaryKey($key) + public function setPrimaryKey($keys) { - $this->setId($key); + + $this->setFkActividadId($keys[0]); + + $this->setFkDocenteId($keys[1]); + } public function copyInto($copyObj, $deepCopy = false) { - $copyObj->setFkActividadId($this->fk_actividad_id); - $copyObj->setFkDocenteId($this->fk_docente_id); - - $copyObj->setNew(true); - $copyObj->setId(NULL); + $copyObj->setFkActividadId(NULL); + $copyObj->setFkDocenteId(NULL); } @@ -392,7 +375,7 @@ if ($v === null) { - $this->setFkDocenteId('0'); + $this->setFkDocenteId(NULL); } else { $this->setFkDocenteId($v->getId()); } @@ -422,7 +405,7 @@ if ($v === null) { - $this->setFkActividadId('0'); + $this->setFkActividadId(NULL); } else { $this->setFkActividadId($v->getId()); } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelActividadDocentePeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -13,16 +13,13 @@ const CLASS_DEFAULT = 'lib.model.RelActividadDocente'; - const NUM_COLUMNS = 3; + const NUM_COLUMNS = 2; const NUM_LAZY_LOAD_COLUMNS = 0; - const ID = 'rel_actividad_docente.ID'; - - const FK_ACTIVIDAD_ID = 'rel_actividad_docente.FK_ACTIVIDAD_ID'; @@ -34,18 +31,18 @@ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'FkActividadId', 'FkDocenteId', ), - BasePeer::TYPE_COLNAME => array (RelActividadDocentePeer::ID, RelActividadDocentePeer::FK_ACTIVIDAD_ID, RelActividadDocentePeer::FK_DOCENTE_ID, ), - BasePeer::TYPE_FIELDNAME => array ('id', 'fk_actividad_id', 'fk_docente_id', ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('FkActividadId', 'FkDocenteId', ), + BasePeer::TYPE_COLNAME => array (RelActividadDocentePeer::FK_ACTIVIDAD_ID, RelActividadDocentePeer::FK_DOCENTE_ID, ), + BasePeer::TYPE_FIELDNAME => array ('fk_actividad_id', 'fk_docente_id', ), + BasePeer::TYPE_NUM => array (0, 1, ) ); private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'FkActividadId' => 1, 'FkDocenteId' => 2, ), - BasePeer::TYPE_COLNAME => array (RelActividadDocentePeer::ID => 0, RelActividadDocentePeer::FK_ACTIVIDAD_ID => 1, RelActividadDocentePeer::FK_DOCENTE_ID => 2, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'fk_actividad_id' => 1, 'fk_docente_id' => 2, ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('FkActividadId' => 0, 'FkDocenteId' => 1, ), + BasePeer::TYPE_COLNAME => array (RelActividadDocentePeer::FK_ACTIVIDAD_ID => 0, RelActividadDocentePeer::FK_DOCENTE_ID => 1, ), + BasePeer::TYPE_FIELDNAME => array ('fk_actividad_id' => 0, 'fk_docente_id' => 1, ), + BasePeer::TYPE_NUM => array (0, 1, ) ); @@ -99,16 +96,14 @@ public static function addSelectColumns(Criteria $criteria) { - $criteria->addSelectColumn(RelActividadDocentePeer::ID); - $criteria->addSelectColumn(RelActividadDocentePeer::FK_ACTIVIDAD_ID); $criteria->addSelectColumn(RelActividadDocentePeer::FK_DOCENTE_ID); } - const COUNT = 'COUNT(rel_actividad_docente.ID)'; - const COUNT_DISTINCT = 'COUNT(DISTINCT rel_actividad_docente.ID)'; + const COUNT = 'COUNT(rel_actividad_docente.FK_ACTIVIDAD_ID)'; + const COUNT_DISTINCT = 'COUNT(DISTINCT rel_actividad_docente.FK_ACTIVIDAD_ID)'; public static function doCount(Criteria $criteria, $distinct = false, $con = null) @@ -187,14 +182,14 @@ public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -215,14 +210,14 @@ public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -344,7 +339,7 @@ } else { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -387,25 +382,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelActividadDocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -414,21 +409,21 @@ $temp_obj2->addRelActividadDocente($obj1); break; } } - + if ($newObject) { $obj2->initRelActividadDocentes(); $obj2->addRelActividadDocente($obj1); } - + $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -437,7 +432,7 @@ $temp_obj3->addRelActividadDocente($obj1); break; } } - + if ($newObject) { $obj3->initRelActividadDocentes(); $obj3->addRelActividadDocente($obj1); @@ -453,14 +448,14 @@ public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -481,14 +476,14 @@ public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -525,22 +520,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -550,7 +545,7 @@ break; } } - + if ($newObject) { $obj2->initRelActividadDocentes(); $obj2->addRelActividadDocente($obj1); @@ -582,22 +577,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -607,7 +602,7 @@ break; } } - + if ($newObject) { $obj2->initRelActividadDocentes(); $obj2->addRelActividadDocente($obj1); @@ -641,7 +636,6 @@ $criteria = clone $values; } else { $criteria = $values->buildCriteria(); } - $criteria->remove(RelActividadDocentePeer::ID); $criteria->setDbName(self::DATABASE_NAME); @@ -668,9 +662,12 @@ if ($values instanceof Criteria) { $criteria = clone $values; - $comparison = $criteria->getComparison(RelActividadDocentePeer::ID); - $selectCriteria->add(RelActividadDocentePeer::ID, $criteria->remove(RelActividadDocentePeer::ID), $comparison); + $comparison = $criteria->getComparison(RelActividadDocentePeer::FK_ACTIVIDAD_ID); + $selectCriteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $criteria->remove(RelActividadDocentePeer::FK_ACTIVIDAD_ID), $comparison); + $comparison = $criteria->getComparison(RelActividadDocentePeer::FK_DOCENTE_ID); + $selectCriteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $criteria->remove(RelActividadDocentePeer::FK_DOCENTE_ID), $comparison); + } else { $criteria = $values->buildCriteria(); $selectCriteria = $values->buildPkeyCriteria(); } $criteria->setDbName(self::DATABASE_NAME); @@ -708,7 +705,20 @@ $criteria = $values->buildPkeyCriteria(); } else { $criteria = new Criteria(self::DATABASE_NAME); - $criteria->add(RelActividadDocentePeer::ID, (array) $values, Criteria::IN); + if(count($values) == count($values, COUNT_RECURSIVE)) + { + $values = array($values); + } + $vals = array(); + foreach($values as $value) + { + + $vals[0][] = $value[0]; + $vals[1][] = $value[1]; + } + + $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $vals[0], Criteria::IN); + $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $vals[1], Criteria::IN); } $criteria->setDbName(self::DATABASE_NAME); @@ -762,40 +772,17 @@ } - public static function retrieveByPK($pk, $con = null) - { + public static function retrieveByPK( $fk_actividad_id, $fk_docente_id, $con = null) { if ($con === null) { $con = Propel::getConnection(self::DATABASE_NAME); } - - $criteria = new Criteria(RelActividadDocentePeer::DATABASE_NAME); - - $criteria->add(RelActividadDocentePeer::ID, $pk); - - + $criteria = new Criteria(); + $criteria->add(RelActividadDocentePeer::FK_ACTIVIDAD_ID, $fk_actividad_id); + $criteria->add(RelActividadDocentePeer::FK_DOCENTE_ID, $fk_docente_id); $v = RelActividadDocentePeer::doSelect($criteria, $con); - return !empty($v) > 0 ? $v[0] : null; + return !empty($v) ? $v[0] : null; } - - - public static function retrieveByPKs($pks, $con = null) - { - if ($con === null) { - $con = Propel::getConnection(self::DATABASE_NAME); - } - - $objs = null; - if (empty($pks)) { - $objs = array(); - } else { - $criteria = new Criteria(); - $criteria->add(RelActividadDocentePeer::ID, $pks, Criteria::IN); - $objs = RelActividadDocentePeer::doSelect($criteria, $con); - } - return $objs; - } - } if (Propel::isInit()) { try { Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivision.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelAlumnoDivisionPeer::ID; @@ -66,6 +70,10 @@ public function setFkDivisionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_division_id !== $v || $v === 0) { $this->fk_division_id = $v; $this->modifiedColumns[] = RelAlumnoDivisionPeer::FK_DIVISION_ID; @@ -80,6 +88,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v || $v === 0) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = RelAlumnoDivisionPeer::FK_ALUMNO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAlumnoDivisionPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -187,14 +187,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -215,14 +215,14 @@ public static function doCountJoinDivision(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -344,7 +344,7 @@ } else { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -387,25 +387,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelAlumnoDivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -414,21 +414,21 @@ $temp_obj2->addRelAlumnoDivision($obj1); break; } } - + if ($newObject) { $obj2->initRelAlumnoDivisions(); $obj2->addRelAlumnoDivision($obj1); } - + $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -437,7 +437,7 @@ $temp_obj3->addRelAlumnoDivision($obj1); break; } } - + if ($newObject) { $obj3->initRelAlumnoDivisions(); $obj3->addRelAlumnoDivision($obj1); @@ -453,14 +453,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -481,14 +481,14 @@ public static function doCountJoinAllExceptDivision(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAlumnoDivisionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -525,22 +525,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelAlumnoDivisionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -550,7 +550,7 @@ break; } } - + if ($newObject) { $obj2->initRelAlumnoDivisions(); $obj2->addRelAlumnoDivision($obj1); @@ -582,22 +582,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelAlumnoDivisionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -607,7 +607,7 @@ break; } } - + if ($newObject) { $obj2->initRelAlumnoDivisions(); $obj2->addRelAlumnoDivision($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividad.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -67,6 +67,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelAnioActividadPeer::ID; @@ -77,6 +81,10 @@ public function setFkAnioId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_anio_id !== $v || $v === 0) { $this->fk_anio_id = $v; $this->modifiedColumns[] = RelAnioActividadPeer::FK_ANIO_ID; @@ -91,6 +99,10 @@ public function setFkActividadId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_actividad_id !== $v || $v === 0) { $this->fk_actividad_id = $v; $this->modifiedColumns[] = RelAnioActividadPeer::FK_ACTIVIDAD_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelAnioActividadPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -192,14 +192,14 @@ public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -220,14 +220,14 @@ public static function doCountJoinAnio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -349,7 +349,7 @@ } else { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -392,25 +392,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelAnioActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -419,21 +419,21 @@ $temp_obj2->addRelAnioActividad($obj1); break; } } - + if ($newObject) { $obj2->initRelAnioActividads(); $obj2->addRelAnioActividad($obj1); } - + $omClass = AnioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -442,7 +442,7 @@ $temp_obj3->addRelAnioActividad($obj1); break; } } - + if ($newObject) { $obj3->initRelAnioActividads(); $obj3->addRelAnioActividad($obj1); @@ -458,14 +458,14 @@ public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -486,14 +486,14 @@ public static function doCountJoinAllExceptAnio(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelAnioActividadPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -530,22 +530,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelAnioActividadPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AnioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -555,7 +555,7 @@ break; } } - + if ($newObject) { $obj2->initRelAnioActividads(); $obj2->addRelAnioActividad($obj1); @@ -587,22 +587,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelAnioActividadPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -612,7 +612,7 @@ break; } } - + if ($newObject) { $obj2->initRelAnioActividads(); $obj2->addRelAnioActividad($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumno.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -104,6 +104,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelCalendariovacunacionAlumnoPeer::ID; @@ -114,6 +118,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = RelCalendariovacunacionAlumnoPeer::FK_ALUMNO_ID; @@ -128,6 +136,10 @@ public function setFkCalendariovacunacionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_calendariovacunacion_id !== $v) { $this->fk_calendariovacunacion_id = $v; $this->modifiedColumns[] = RelCalendariovacunacionAlumnoPeer::FK_CALENDARIOVACUNACION_ID; @@ -142,6 +154,10 @@ public function setObservacion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->observacion !== $v) { $this->observacion = $v; $this->modifiedColumns[] = RelCalendariovacunacionAlumnoPeer::OBSERVACION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelCalendariovacunacionAlumnoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,14 +202,14 @@ public static function doCountJoinCalendariovacunacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -230,14 +230,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -359,7 +359,7 @@ } else { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -402,25 +402,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelCalendariovacunacionAlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = CalendariovacunacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -429,21 +429,21 @@ $temp_obj2->addRelCalendariovacunacionAlumno($obj1); break; } } - + if ($newObject) { $obj2->initRelCalendariovacunacionAlumnos(); $obj2->addRelCalendariovacunacionAlumno($obj1); } - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -452,7 +452,7 @@ $temp_obj3->addRelCalendariovacunacionAlumno($obj1); break; } } - + if ($newObject) { $obj3->initRelCalendariovacunacionAlumnos(); $obj3->addRelCalendariovacunacionAlumno($obj1); @@ -468,14 +468,14 @@ public static function doCountJoinAllExceptCalendariovacunacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -496,14 +496,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelCalendariovacunacionAlumnoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -540,22 +540,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelCalendariovacunacionAlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -565,7 +565,7 @@ break; } } - + if ($newObject) { $obj2->initRelCalendariovacunacionAlumnos(); $obj2->addRelCalendariovacunacionAlumno($obj1); @@ -597,22 +597,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelCalendariovacunacionAlumnoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = CalendariovacunacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -622,7 +622,7 @@ break; } } - + if ($newObject) { $obj2->initRelCalendariovacunacionAlumnos(); $obj2->addRelCalendariovacunacionAlumno($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocente.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -202,6 +202,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelDivisionActividadDocentePeer::ID; @@ -212,6 +216,10 @@ public function setFkDivisionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_division_id !== $v || $v === 0) { $this->fk_division_id = $v; $this->modifiedColumns[] = RelDivisionActividadDocentePeer::FK_DIVISION_ID; @@ -226,6 +234,10 @@ public function setFkActividadId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_actividad_id !== $v || $v === 0) { $this->fk_actividad_id = $v; $this->modifiedColumns[] = RelDivisionActividadDocentePeer::FK_ACTIVIDAD_ID; @@ -240,6 +252,10 @@ public function setFkDocenteId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_docente_id !== $v || $v === 0) { $this->fk_docente_id = $v; $this->modifiedColumns[] = RelDivisionActividadDocentePeer::FK_DOCENTE_ID; @@ -254,6 +270,10 @@ public function setFkEventoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_evento_id !== $v || $v === 0) { $this->fk_evento_id = $v; $this->modifiedColumns[] = RelDivisionActividadDocentePeer::FK_EVENTO_ID; @@ -268,6 +288,10 @@ public function setFkRepeticionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_repeticion_id !== $v || $v === 0) { $this->fk_repeticion_id = $v; $this->modifiedColumns[] = RelDivisionActividadDocentePeer::FK_REPETICION_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDivisionActividadDocentePeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -222,14 +222,14 @@ public static function doCountJoinDivision(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -250,14 +250,14 @@ public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -278,14 +278,14 @@ public static function doCountJoinActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -306,14 +306,14 @@ public static function doCountJoinRepeticion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -334,14 +334,14 @@ public static function doCountJoinEvento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -604,7 +604,7 @@ } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -668,25 +668,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDivisionActividadDocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -695,21 +695,21 @@ $temp_obj2->addRelDivisionActividadDocente($obj1); break; } } - + if ($newObject) { $obj2->initRelDivisionActividadDocentes(); $obj2->addRelDivisionActividadDocente($obj1); } - + $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -718,21 +718,21 @@ $temp_obj3->addRelDivisionActividadDocente($obj1); break; } } - + if ($newObject) { $obj3->initRelDivisionActividadDocentes(); $obj3->addRelDivisionActividadDocente($obj1); } - + $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -741,21 +741,21 @@ $temp_obj4->addRelDivisionActividadDocente($obj1); break; } } - + if ($newObject) { $obj4->initRelDivisionActividadDocentes(); $obj4->addRelDivisionActividadDocente($obj1); } - + $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -764,21 +764,21 @@ $temp_obj5->addRelDivisionActividadDocente($obj1); break; } } - + if ($newObject) { $obj5->initRelDivisionActividadDocentes(); $obj5->addRelDivisionActividadDocente($obj1); } - + $omClass = EventoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj6 = new $cls(); $obj6->hydrate($rs, $startcol6); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -787,7 +787,7 @@ $temp_obj6->addRelDivisionActividadDocente($obj1); break; } } - + if ($newObject) { $obj6->initRelDivisionActividadDocentes(); $obj6->addRelDivisionActividadDocente($obj1); @@ -803,14 +803,14 @@ public static function doCountJoinAllExceptDivision(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -837,14 +837,14 @@ public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -871,14 +871,14 @@ public static function doCountJoinAllExceptActividad(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -905,14 +905,14 @@ public static function doCountJoinAllExceptRepeticion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -939,14 +939,14 @@ public static function doCountJoinAllExceptEvento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDivisionActividadDocentePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -1004,22 +1004,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDivisionActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1029,7 +1029,7 @@ break; } } - + if ($newObject) { $obj2->initRelDivisionActividadDocentes(); $obj2->addRelDivisionActividadDocente($obj1); @@ -1037,11 +1037,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1051,7 +1051,7 @@ break; } } - + if ($newObject) { $obj3->initRelDivisionActividadDocentes(); $obj3->addRelDivisionActividadDocente($obj1); @@ -1059,11 +1059,11 @@ $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1073,7 +1073,7 @@ break; } } - + if ($newObject) { $obj4->initRelDivisionActividadDocentes(); $obj4->addRelDivisionActividadDocente($obj1); @@ -1081,11 +1081,11 @@ $omClass = EventoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1095,7 +1095,7 @@ break; } } - + if ($newObject) { $obj5->initRelDivisionActividadDocentes(); $obj5->addRelDivisionActividadDocente($obj1); @@ -1142,22 +1142,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDivisionActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1167,7 +1167,7 @@ break; } } - + if ($newObject) { $obj2->initRelDivisionActividadDocentes(); $obj2->addRelDivisionActividadDocente($obj1); @@ -1175,11 +1175,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1189,7 +1189,7 @@ break; } } - + if ($newObject) { $obj3->initRelDivisionActividadDocentes(); $obj3->addRelDivisionActividadDocente($obj1); @@ -1197,11 +1197,11 @@ $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1211,7 +1211,7 @@ break; } } - + if ($newObject) { $obj4->initRelDivisionActividadDocentes(); $obj4->addRelDivisionActividadDocente($obj1); @@ -1219,11 +1219,11 @@ $omClass = EventoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1233,7 +1233,7 @@ break; } } - + if ($newObject) { $obj5->initRelDivisionActividadDocentes(); $obj5->addRelDivisionActividadDocente($obj1); @@ -1280,22 +1280,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDivisionActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1305,7 +1305,7 @@ break; } } - + if ($newObject) { $obj2->initRelDivisionActividadDocentes(); $obj2->addRelDivisionActividadDocente($obj1); @@ -1313,11 +1313,11 @@ $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1327,7 +1327,7 @@ break; } } - + if ($newObject) { $obj3->initRelDivisionActividadDocentes(); $obj3->addRelDivisionActividadDocente($obj1); @@ -1335,11 +1335,11 @@ $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1349,7 +1349,7 @@ break; } } - + if ($newObject) { $obj4->initRelDivisionActividadDocentes(); $obj4->addRelDivisionActividadDocente($obj1); @@ -1357,11 +1357,11 @@ $omClass = EventoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1371,7 +1371,7 @@ break; } } - + if ($newObject) { $obj5->initRelDivisionActividadDocentes(); $obj5->addRelDivisionActividadDocente($obj1); @@ -1418,22 +1418,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDivisionActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1443,7 +1443,7 @@ break; } } - + if ($newObject) { $obj2->initRelDivisionActividadDocentes(); $obj2->addRelDivisionActividadDocente($obj1); @@ -1451,11 +1451,11 @@ $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1465,7 +1465,7 @@ break; } } - + if ($newObject) { $obj3->initRelDivisionActividadDocentes(); $obj3->addRelDivisionActividadDocente($obj1); @@ -1473,11 +1473,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1487,7 +1487,7 @@ break; } } - + if ($newObject) { $obj4->initRelDivisionActividadDocentes(); $obj4->addRelDivisionActividadDocente($obj1); @@ -1495,11 +1495,11 @@ $omClass = EventoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1509,7 +1509,7 @@ break; } } - + if ($newObject) { $obj5->initRelDivisionActividadDocentes(); $obj5->addRelDivisionActividadDocente($obj1); @@ -1556,22 +1556,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDivisionActividadDocentePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DivisionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1581,7 +1581,7 @@ break; } } - + if ($newObject) { $obj2->initRelDivisionActividadDocentes(); $obj2->addRelDivisionActividadDocente($obj1); @@ -1589,11 +1589,11 @@ $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1603,7 +1603,7 @@ break; } } - + if ($newObject) { $obj3->initRelDivisionActividadDocentes(); $obj3->addRelDivisionActividadDocente($obj1); @@ -1611,11 +1611,11 @@ $omClass = ActividadPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1625,7 +1625,7 @@ break; } } - + if ($newObject) { $obj4->initRelDivisionActividadDocentes(); $obj4->addRelDivisionActividadDocente($obj1); @@ -1633,11 +1633,11 @@ $omClass = RepeticionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1647,7 +1647,7 @@ break; } } - + if ($newObject) { $obj5->initRelDivisionActividadDocentes(); $obj5->addRelDivisionActividadDocente($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimiento.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -45,6 +45,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = RelDocenteEstablecimientoPeer::FK_ESTABLECIMIENTO_ID; @@ -59,6 +63,10 @@ public function setFkDocenteId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_docente_id !== $v || $v === 0) { $this->fk_docente_id = $v; $this->modifiedColumns[] = RelDocenteEstablecimientoPeer::FK_DOCENTE_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelDocenteEstablecimientoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -182,14 +182,14 @@ public static function doCountJoinDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -210,14 +210,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -339,7 +339,7 @@ } else { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -382,25 +382,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDocenteEstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -409,21 +409,21 @@ $temp_obj2->addRelDocenteEstablecimiento($obj1); break; } } - + if ($newObject) { $obj2->initRelDocenteEstablecimientos(); $obj2->addRelDocenteEstablecimiento($obj1); } - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -432,7 +432,7 @@ $temp_obj3->addRelDocenteEstablecimiento($obj1); break; } } - + if ($newObject) { $obj3->initRelDocenteEstablecimientos(); $obj3->addRelDocenteEstablecimiento($obj1); @@ -448,14 +448,14 @@ public static function doCountJoinAllExceptDocente(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -476,14 +476,14 @@ public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelDocenteEstablecimientoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -520,22 +520,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDocenteEstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -545,7 +545,7 @@ break; } } - + if ($newObject) { $obj2->initRelDocenteEstablecimientos(); $obj2->addRelDocenteEstablecimiento($obj1); @@ -577,22 +577,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelDocenteEstablecimientoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = DocentePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -602,7 +602,7 @@ break; } } - + if ($newObject) { $obj2->initRelDocenteEstablecimientos(); $obj2->addRelDocenteEstablecimiento($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacion.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacion.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelEstablecimientoLocacionPeer::ID; @@ -66,6 +70,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = RelEstablecimientoLocacionPeer::FK_ESTABLECIMIENTO_ID; @@ -80,6 +88,10 @@ public function setFkLocacionId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_locacion_id !== $v || $v === 0) { $this->fk_locacion_id = $v; $this->modifiedColumns[] = RelEstablecimientoLocacionPeer::FK_LOCACION_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacionPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelEstablecimientoLocacionPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -187,14 +187,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -215,14 +215,14 @@ public static function doCountJoinLocacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -344,7 +344,7 @@ } else { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -387,25 +387,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelEstablecimientoLocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -414,21 +414,21 @@ $temp_obj2->addRelEstablecimientoLocacion($obj1); break; } } - + if ($newObject) { $obj2->initRelEstablecimientoLocacions(); $obj2->addRelEstablecimientoLocacion($obj1); } - + $omClass = LocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -437,7 +437,7 @@ $temp_obj3->addRelEstablecimientoLocacion($obj1); break; } } - + if ($newObject) { $obj3->initRelEstablecimientoLocacions(); $obj3->addRelEstablecimientoLocacion($obj1); @@ -453,14 +453,14 @@ public static function doCountJoinAllExceptEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -481,14 +481,14 @@ public static function doCountJoinAllExceptLocacion(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelEstablecimientoLocacionPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -525,22 +525,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelEstablecimientoLocacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = LocacionPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -550,7 +550,7 @@ break; } } - + if ($newObject) { $obj2->initRelEstablecimientoLocacions(); $obj2->addRelEstablecimientoLocacion($obj1); @@ -582,22 +582,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelEstablecimientoLocacionPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -607,7 +607,7 @@ break; } } - + if ($newObject) { $obj2->initRelEstablecimientoLocacions(); $obj2->addRelEstablecimientoLocacion($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermiso.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermiso.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermiso.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelRolPermisoPeer::ID; @@ -66,6 +70,10 @@ public function setFkRolId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_rol_id !== $v || $v === 0) { $this->fk_rol_id = $v; $this->modifiedColumns[] = RelRolPermisoPeer::FK_ROL_ID; @@ -80,6 +88,10 @@ public function setFkPermisoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_permiso_id !== $v || $v === 0) { $this->fk_permiso_id = $v; $this->modifiedColumns[] = RelRolPermisoPeer::FK_PERMISO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermisoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermisoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelRolPermisoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -187,14 +187,14 @@ public static function doCountJoinRol(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -215,14 +215,14 @@ public static function doCountJoinPermiso(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -344,7 +344,7 @@ } else { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -387,25 +387,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolPermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = RolPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -414,21 +414,21 @@ $temp_obj2->addRelRolPermiso($obj1); break; } } - + if ($newObject) { $obj2->initRelRolPermisos(); $obj2->addRelRolPermiso($obj1); } - + $omClass = PermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -437,7 +437,7 @@ $temp_obj3->addRelRolPermiso($obj1); break; } } - + if ($newObject) { $obj3->initRelRolPermisos(); $obj3->addRelRolPermiso($obj1); @@ -453,14 +453,14 @@ public static function doCountJoinAllExceptRol(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -481,14 +481,14 @@ public static function doCountJoinAllExceptPermiso(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -525,22 +525,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolPermisoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = PermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -550,7 +550,7 @@ break; } } - + if ($newObject) { $obj2->initRelRolPermisos(); $obj2->addRelRolPermiso($obj1); @@ -582,22 +582,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolPermisoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = RolPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -607,7 +607,7 @@ break; } } - + if ($newObject) { $obj2->initRelRolPermisos(); $obj2->addRelRolPermiso($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -81,6 +81,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::ID; @@ -91,6 +95,10 @@ public function setFkRolresponsableId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_rolresponsable_id !== $v || $v === 0) { $this->fk_rolresponsable_id = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::FK_ROLRESPONSABLE_ID; @@ -105,6 +113,10 @@ public function setFkResponsableId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_responsable_id !== $v || $v === 0) { $this->fk_responsable_id = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::FK_RESPONSABLE_ID; @@ -119,6 +131,10 @@ public function setFkAlumnoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_alumno_id !== $v || $v === 0) { $this->fk_alumno_id = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::FK_ALUMNO_ID; @@ -133,6 +149,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsablePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsablePeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsablePeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -197,14 +197,14 @@ public static function doCountJoinRolResponsable(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -225,14 +225,14 @@ public static function doCountJoinResponsable(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -253,14 +253,14 @@ public static function doCountJoinAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -429,7 +429,7 @@ } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -479,25 +479,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolresponsableResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -506,21 +506,21 @@ $temp_obj2->addRelRolresponsableResponsable($obj1); break; } } - + if ($newObject) { $obj2->initRelRolresponsableResponsables(); $obj2->addRelRolresponsableResponsable($obj1); } - + $omClass = ResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -529,21 +529,21 @@ $temp_obj3->addRelRolresponsableResponsable($obj1); break; } } - + if ($newObject) { $obj3->initRelRolresponsableResponsables(); $obj3->addRelRolresponsableResponsable($obj1); } - + $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -552,7 +552,7 @@ $temp_obj4->addRelRolresponsableResponsable($obj1); break; } } - + if ($newObject) { $obj4->initRelRolresponsableResponsables(); $obj4->addRelRolresponsableResponsable($obj1); @@ -568,14 +568,14 @@ public static function doCountJoinAllExceptRolResponsable(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -598,14 +598,14 @@ public static function doCountJoinAllExceptResponsable(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -628,14 +628,14 @@ public static function doCountJoinAllExceptAlumno(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelRolresponsableResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -679,22 +679,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolresponsableResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -704,7 +704,7 @@ break; } } - + if ($newObject) { $obj2->initRelRolresponsableResponsables(); $obj2->addRelRolresponsableResponsable($obj1); @@ -712,11 +712,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -726,7 +726,7 @@ break; } } - + if ($newObject) { $obj3->initRelRolresponsableResponsables(); $obj3->addRelRolresponsableResponsable($obj1); @@ -763,22 +763,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolresponsableResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -788,7 +788,7 @@ break; } } - + if ($newObject) { $obj2->initRelRolresponsableResponsables(); $obj2->addRelRolresponsableResponsable($obj1); @@ -796,11 +796,11 @@ $omClass = AlumnoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -810,7 +810,7 @@ break; } } - + if ($newObject) { $obj3->initRelRolresponsableResponsables(); $obj3->addRelRolresponsableResponsable($obj1); @@ -847,22 +847,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelRolresponsableResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -872,7 +872,7 @@ break; } } - + if ($newObject) { $obj2->initRelRolresponsableResponsables(); $obj2->addRelRolresponsableResponsable($obj1); @@ -880,11 +880,11 @@ $omClass = ResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -894,7 +894,7 @@ break; } } - + if ($newObject) { $obj3->initRelRolresponsableResponsables(); $obj3->addRelRolresponsableResponsable($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermiso.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermiso.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermiso.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelUsuarioPermisoPeer::ID; @@ -66,6 +70,10 @@ public function setFkUsuarioId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_usuario_id !== $v || $v === 0) { $this->fk_usuario_id = $v; $this->modifiedColumns[] = RelUsuarioPermisoPeer::FK_USUARIO_ID; @@ -80,6 +88,10 @@ public function setFkPermisoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_permiso_id !== $v || $v === 0) { $this->fk_permiso_id = $v; $this->modifiedColumns[] = RelUsuarioPermisoPeer::FK_PERMISO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermisoPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermisoPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPermisoPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -187,14 +187,14 @@ public static function doCountJoinUsuario(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -215,14 +215,14 @@ public static function doCountJoinPermiso(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -344,7 +344,7 @@ } else { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -387,25 +387,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelUsuarioPermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = UsuarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -414,21 +414,21 @@ $temp_obj2->addRelUsuarioPermiso($obj1); break; } } - + if ($newObject) { $obj2->initRelUsuarioPermisos(); $obj2->addRelUsuarioPermiso($obj1); } - + $omClass = PermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -437,7 +437,7 @@ $temp_obj3->addRelUsuarioPermiso($obj1); break; } } - + if ($newObject) { $obj3->initRelUsuarioPermisos(); $obj3->addRelUsuarioPermiso($obj1); @@ -453,14 +453,14 @@ public static function doCountJoinAllExceptUsuario(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -481,14 +481,14 @@ public static function doCountJoinAllExceptPermiso(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(RelUsuarioPermisoPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -525,22 +525,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelUsuarioPermisoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = PermisoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -550,7 +550,7 @@ break; } } - + if ($newObject) { $obj2->initRelUsuarioPermisos(); $obj2->addRelUsuarioPermiso($obj1); @@ -582,22 +582,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = RelUsuarioPermisoPeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = UsuarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -607,7 +607,7 @@ break; } } - + if ($newObject) { $obj2->initRelUsuarioPermisos(); $obj2->addRelUsuarioPermiso($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPreferencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPreferencia.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelUsuarioPreferencia.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -50,6 +50,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RelUsuarioPreferenciaPeer::ID; @@ -60,6 +64,10 @@ public function setFkUsuarioId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_usuario_id !== $v || $v === 0) { $this->fk_usuario_id = $v; $this->modifiedColumns[] = RelUsuarioPreferenciaPeer::FK_USUARIO_ID; @@ -70,6 +78,10 @@ public function setFkPreferenciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_preferencia_id !== $v || $v === 0) { $this->fk_preferencia_id = $v; $this->modifiedColumns[] = RelUsuarioPreferenciaPeer::FK_PREFERENCIA_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -62,6 +62,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RepeticionPeer::ID; @@ -72,6 +76,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = RepeticionPeer::DESCRIPCION; @@ -82,6 +90,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v || $v === 0) { $this->orden = $v; $this->modifiedColumns[] = RepeticionPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -222,6 +222,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = ResponsablePeer::ID; @@ -232,6 +236,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = ResponsablePeer::NOMBRE; @@ -242,6 +250,10 @@ public function setApellido($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->apellido !== $v || $v === '') { $this->apellido = $v; $this->modifiedColumns[] = ResponsablePeer::APELLIDO; @@ -252,6 +264,10 @@ public function setDireccion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->direccion !== $v || $v === '') { $this->direccion = $v; $this->modifiedColumns[] = ResponsablePeer::DIRECCION; @@ -262,6 +278,10 @@ public function setCiudad($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->ciudad !== $v || $v === '') { $this->ciudad = $v; $this->modifiedColumns[] = ResponsablePeer::CIUDAD; @@ -272,6 +292,10 @@ public function setCodigoPostal($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->codigo_postal !== $v || $v === '') { $this->codigo_postal = $v; $this->modifiedColumns[] = ResponsablePeer::CODIGO_POSTAL; @@ -282,6 +306,10 @@ public function setFkProvinciaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_provincia_id !== $v || $v === 0) { $this->fk_provincia_id = $v; $this->modifiedColumns[] = ResponsablePeer::FK_PROVINCIA_ID; @@ -296,6 +324,10 @@ public function setTelefono($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono !== $v || $v === '') { $this->telefono = $v; $this->modifiedColumns[] = ResponsablePeer::TELEFONO; @@ -306,6 +338,10 @@ public function setTelefonoMovil($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->telefono_movil !== $v || $v === '') { $this->telefono_movil = $v; $this->modifiedColumns[] = ResponsablePeer::TELEFONO_MOVIL; @@ -316,6 +352,10 @@ public function setNroDocumento($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nro_documento !== $v || $v === '') { $this->nro_documento = $v; $this->modifiedColumns[] = ResponsablePeer::NRO_DOCUMENTO; @@ -326,6 +366,10 @@ public function setFkTipodocumentoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_tipodocumento_id !== $v || $v === 0) { $this->fk_tipodocumento_id = $v; $this->modifiedColumns[] = ResponsablePeer::FK_TIPODOCUMENTO_ID; @@ -340,6 +384,10 @@ public function setSexo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->sexo !== $v || $v === '') { $this->sexo = $v; $this->modifiedColumns[] = ResponsablePeer::SEXO; @@ -350,6 +398,10 @@ public function setEmail($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->email !== $v || $v === '') { $this->email = $v; $this->modifiedColumns[] = ResponsablePeer::EMAIL; @@ -360,6 +412,10 @@ public function setObservacion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->observacion !== $v || $v === '') { $this->observacion = $v; $this->modifiedColumns[] = ResponsablePeer::OBSERVACION; @@ -380,6 +436,10 @@ public function setFkCuentaId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_cuenta_id !== $v || $v === 0) { $this->fk_cuenta_id = $v; $this->modifiedColumns[] = ResponsablePeer::FK_CUENTA_ID; @@ -394,6 +454,10 @@ public function setFkRolresponsableId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_rolresponsable_id !== $v || $v === 1) { $this->fk_rolresponsable_id = $v; $this->modifiedColumns[] = ResponsablePeer::FK_ROLRESPONSABLE_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseResponsablePeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -257,14 +257,14 @@ public static function doCountJoinCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -285,14 +285,14 @@ public static function doCountJoinProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -313,14 +313,14 @@ public static function doCountJoinTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -341,14 +341,14 @@ public static function doCountJoinRolResponsable(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -564,7 +564,7 @@ } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -621,25 +621,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -648,21 +648,21 @@ $temp_obj2->addResponsable($obj1); break; } } - + if ($newObject) { $obj2->initResponsables(); $obj2->addResponsable($obj1); } - + $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -671,21 +671,21 @@ $temp_obj3->addResponsable($obj1); break; } } - + if ($newObject) { $obj3->initResponsables(); $obj3->addResponsable($obj1); } - + $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -694,21 +694,21 @@ $temp_obj4->addResponsable($obj1); break; } } - + if ($newObject) { $obj4->initResponsables(); $obj4->addResponsable($obj1); } - + $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj5 = new $cls(); $obj5->hydrate($rs, $startcol5); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -717,7 +717,7 @@ $temp_obj5->addResponsable($obj1); break; } } - + if ($newObject) { $obj5->initResponsables(); $obj5->addResponsable($obj1); @@ -733,14 +733,14 @@ public static function doCountJoinAllExceptCuenta(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -765,14 +765,14 @@ public static function doCountJoinAllExceptProvincia(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -797,14 +797,14 @@ public static function doCountJoinAllExceptTipodocumento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -829,14 +829,14 @@ public static function doCountJoinAllExceptRolResponsable(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(ResponsablePeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(ResponsablePeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -887,22 +887,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -912,7 +912,7 @@ break; } } - + if ($newObject) { $obj2->initResponsables(); $obj2->addResponsable($obj1); @@ -920,11 +920,11 @@ $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -934,7 +934,7 @@ break; } } - + if ($newObject) { $obj3->initResponsables(); $obj3->addResponsable($obj1); @@ -942,11 +942,11 @@ $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -956,7 +956,7 @@ break; } } - + if ($newObject) { $obj4->initResponsables(); $obj4->addResponsable($obj1); @@ -998,22 +998,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1023,7 +1023,7 @@ break; } } - + if ($newObject) { $obj2->initResponsables(); $obj2->addResponsable($obj1); @@ -1031,11 +1031,11 @@ $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1045,7 +1045,7 @@ break; } } - + if ($newObject) { $obj3->initResponsables(); $obj3->addResponsable($obj1); @@ -1053,11 +1053,11 @@ $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1067,7 +1067,7 @@ break; } } - + if ($newObject) { $obj4->initResponsables(); $obj4->addResponsable($obj1); @@ -1109,22 +1109,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1134,7 +1134,7 @@ break; } } - + if ($newObject) { $obj2->initResponsables(); $obj2->addResponsable($obj1); @@ -1142,11 +1142,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1156,7 +1156,7 @@ break; } } - + if ($newObject) { $obj3->initResponsables(); $obj3->addResponsable($obj1); @@ -1164,11 +1164,11 @@ $omClass = RolResponsablePeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1178,7 +1178,7 @@ break; } } - + if ($newObject) { $obj4->initResponsables(); $obj4->addResponsable($obj1); @@ -1220,22 +1220,22 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = ResponsablePeer::getOMClass(); $cls = Propel::import($omClass); $obj1 = new $cls(); - $obj1->hydrate($rs); + $obj1->hydrate($rs); $omClass = CuentaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1245,7 +1245,7 @@ break; } } - + if ($newObject) { $obj2->initResponsables(); $obj2->addResponsable($obj1); @@ -1253,11 +1253,11 @@ $omClass = ProvinciaPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj3 = new $cls(); $obj3->hydrate($rs, $startcol3); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1267,7 +1267,7 @@ break; } } - + if ($newObject) { $obj3->initResponsables(); $obj3->addResponsable($obj1); @@ -1275,11 +1275,11 @@ $omClass = TipodocumentoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj4 = new $cls(); $obj4->hydrate($rs, $startcol4); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -1289,7 +1289,7 @@ break; } } - + if ($newObject) { $obj4->initResponsables(); $obj4->addResponsable($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRol.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRol.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRol.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -67,6 +67,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RolPeer::ID; @@ -77,6 +81,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = RolPeer::NOMBRE; @@ -87,6 +95,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = RolPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -73,6 +73,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = RolResponsablePeer::ID; @@ -83,6 +87,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = RolResponsablePeer::NOMBRE; @@ -93,6 +101,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = RolResponsablePeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -89,6 +89,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TipoasistenciaPeer::ID; @@ -99,6 +103,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = TipoasistenciaPeer::NOMBRE; @@ -109,6 +117,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TipoasistenciaPeer::DESCRIPCION; @@ -129,6 +141,10 @@ public function setGrupo($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->grupo !== $v || $v === '') { $this->grupo = $v; $this->modifiedColumns[] = TipoasistenciaPeer::GRUPO; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -50,6 +50,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TipodocentePeer::ID; @@ -60,6 +64,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = TipodocentePeer::NOMBRE; @@ -70,6 +78,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TipodocentePeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -79,6 +79,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TipodocumentoPeer::ID; @@ -89,6 +93,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = TipodocumentoPeer::NOMBRE; @@ -99,6 +107,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TipodocumentoPeer::DESCRIPCION; @@ -109,6 +121,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v || $v === 0) { $this->orden = $v; $this->modifiedColumns[] = TipodocumentoPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TipoespacioPeer::ID; @@ -66,6 +70,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = TipoespacioPeer::NOMBRE; @@ -76,6 +84,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TipoespacioPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -73,6 +73,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TipoivaPeer::ID; @@ -83,6 +87,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = TipoivaPeer::NOMBRE; @@ -93,6 +101,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TipoivaPeer::DESCRIPCION; @@ -103,6 +115,10 @@ public function setOrden($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->orden !== $v || $v === 0) { $this->orden = $v; $this->modifiedColumns[] = TipoivaPeer::ORDEN; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -56,6 +56,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TipolocacionPeer::ID; @@ -66,6 +70,10 @@ public function setNombre($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->nombre !== $v || $v === '') { $this->nombre = $v; $this->modifiedColumns[] = TipolocacionPeer::NOMBRE; @@ -76,6 +84,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TipolocacionPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -117,6 +117,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = TurnosPeer::ID; @@ -127,6 +131,10 @@ public function setFkCiclolectivoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_ciclolectivo_id !== $v) { $this->fk_ciclolectivo_id = $v; $this->modifiedColumns[] = TurnosPeer::FK_CICLOLECTIVO_ID; @@ -175,6 +183,10 @@ public function setDescripcion($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->descripcion !== $v || $v === '') { $this->descripcion = $v; $this->modifiedColumns[] = TurnosPeer::DESCRIPCION; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTurnosPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTurnosPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTurnosPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -197,14 +197,14 @@ public static function doCountJoinCiclolectivo(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(TurnosPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(TurnosPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -279,7 +279,7 @@ } else { $criteria->addSelectColumn(TurnosPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -315,25 +315,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = TurnosPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = CiclolectivoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -342,7 +342,7 @@ $temp_obj2->addTurnos($obj1); break; } } - + if ($newObject) { $obj2->initTurnoss(); $obj2->addTurnos($obj1); Modified: prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -194,6 +194,10 @@ public function setId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->id !== $v) { $this->id = $v; $this->modifiedColumns[] = UsuarioPeer::ID; @@ -204,6 +208,10 @@ public function setUsuario($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->usuario !== $v || $v === '') { $this->usuario = $v; $this->modifiedColumns[] = UsuarioPeer::USUARIO; @@ -214,6 +222,10 @@ public function setClave($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->clave !== $v || $v === '') { $this->clave = $v; $this->modifiedColumns[] = UsuarioPeer::CLAVE; @@ -278,6 +290,10 @@ public function setSeguridadPregunta($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->seguridad_pregunta !== $v) { $this->seguridad_pregunta = $v; $this->modifiedColumns[] = UsuarioPeer::SEGURIDAD_PREGUNTA; @@ -288,6 +304,10 @@ public function setSeguridadRespuesta($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->seguridad_respuesta !== $v) { $this->seguridad_respuesta = $v; $this->modifiedColumns[] = UsuarioPeer::SEGURIDAD_RESPUESTA; @@ -298,6 +318,10 @@ public function setEmail($v) { + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + if ($this->email !== $v) { $this->email = $v; $this->modifiedColumns[] = UsuarioPeer::EMAIL; @@ -308,6 +332,10 @@ public function setFkEstablecimientoId($v) { + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + if ($this->fk_establecimiento_id !== $v || $v === 0) { $this->fk_establecimiento_id = $v; $this->modifiedColumns[] = UsuarioPeer::FK_ESTABLECIMIENTO_ID; Modified: prosistem/alba/trunk/alba/lib/model/om/BaseUsuarioPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseUsuarioPeer.php 2007-07-02 16:44:23 UTC (rev 4795) +++ prosistem/alba/trunk/alba/lib/model/om/BaseUsuarioPeer.php 2007-07-02 16:45:01 UTC (rev 4796) @@ -232,14 +232,14 @@ public static function doCountJoinEstablecimiento(Criteria $criteria, $distinct = false, $con = null) { $criteria = clone $criteria; - + $criteria->clearSelectColumns()->clearOrderByColumns(); if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { $criteria->addSelectColumn(UsuarioPeer::COUNT_DISTINCT); } else { $criteria->addSelectColumn(UsuarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -314,7 +314,7 @@ } else { $criteria->addSelectColumn(UsuarioPeer::COUNT); } - + foreach($criteria->getGroupByColumns() as $column) { $criteria->addSelectColumn($column); @@ -350,25 +350,25 @@ $rs = BasePeer::doSelect($c, $con); $results = array(); - + while($rs->next()) { $omClass = UsuarioPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj1 = new $cls(); $obj1->hydrate($rs); - + $omClass = EstablecimientoPeer::getOMClass(); - + $cls = Propel::import($omClass); $obj2 = new $cls(); $obj2->hydrate($rs, $startcol2); - + $newObject = true; for ($j=0, $resCount=count($results); $j < $resCount; $j++) { $temp_obj1 = $results[$j]; @@ -377,7 +377,7 @@ $temp_obj2->addUsuario($obj1); break; } } - + if ($newObject) { $obj2->initUsuarios(); $obj2->addUsuario($obj1);

1 0

SVN Alba r4795 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 02 Jul '07

02 Jul '07

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 #-----------------------------------------------------------------------------

1 0