SVN Alba r4877 - in prosistem/alba/trunk/alba: config data/sql lib/model/om
Author: ftoledo Date: 2007-07-30 12:43:27 -0300 (Mon, 30 Jul 2007) New Revision: 4877 Modified: prosistem/alba/trunk/alba/config/schema.yml prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php prosistem/alba/trunk/alba/lib/model/om/BaseAnio.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/BaseConceptobaja.php prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.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/BaseDocente.php prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.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/BaseHorarioescolartipo.php prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.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/BasePais.php prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php prosistem/alba/trunk/alba/lib/model/om/BasePermiso.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/BaseRelRolresponsableResponsable.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/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/BaseUsuario.php Log: sacando default: del schema.yml para que no genere null's Modified: prosistem/alba/trunk/alba/config/schema.yml =================================================================== --- prosistem/alba/trunk/alba/config/schema.yml 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/config/schema.yml 2007-07-30 15:43:27 UTC (rev 4877) @@ -14,7 +14,6 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 @@ -22,17 +21,14 @@ type: VARCHAR size: 128 required: true - default: ciudad: type: VARCHAR size: 128 required: true - default: codigo_postal: type: VARCHAR size: 20 required: false - default: fk_provincia_id: type: INTEGER required: true @@ -73,7 +69,6 @@ type: VARCHAR size: 128 required: true - default: titulo: type: VARCHAR size: 128 @@ -96,7 +91,6 @@ type: VARCHAR size: 128 required: true - default: m2: type: FLOAT capacidad: @@ -131,12 +125,10 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 required: false - default: tipolocacion: _attributes: idMethod: native @@ -149,12 +141,10 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 required: false - default: distritoescolar: _attributes: idMethod: native @@ -167,7 +157,6 @@ type: VARCHAR size: 128 required: true - default: direccion: type: VARCHAR size: 128 @@ -189,7 +178,6 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 @@ -223,7 +211,6 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 @@ -239,7 +226,6 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 @@ -247,32 +233,26 @@ type: VARCHAR size: 128 required: true - default: cuit: type: VARCHAR size: 20 required: true - default: direccion: type: VARCHAR size: 128 required: true - default: ciudad: type: VARCHAR size: 128 required: true - default: codigo_postal: type: VARCHAR size: 20 required: true - default: telefono: type: VARCHAR size: 20 required: false - default: fk_provincia_id: type: INTEGER required: true @@ -297,12 +277,10 @@ type: VARCHAR size: 128 required: true - default: nombre_corto: type: VARCHAR size: 32 required: true - default: orden: type: INTEGER required: false @@ -319,7 +297,6 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 @@ -344,7 +321,6 @@ type: VARCHAR size: 128 required: true - default: valor_por_defecto: type: VARCHAR size: 128 @@ -441,11 +417,9 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 - default: activo: type: BOOLEAN required: true @@ -462,12 +436,10 @@ type: VARCHAR size: 32 required: true - default: clave: type: VARCHAR size: 48 required: true - default: correo_publico: type: BOOLEAN required: false @@ -513,12 +485,10 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 required: false - default: orden: type: INTEGER required: false @@ -535,12 +505,10 @@ type: VARCHAR size: 32 required: true - default: nombre_largo: type: VARCHAR size: 128 required: true - default: fk_pais_id: type: INTEGER required: true @@ -563,37 +531,30 @@ type: VARCHAR size: 128 required: true - default: razon_social: type: VARCHAR size: 128 required: true - default: cuit: type: VARCHAR size: 20 required: true - default: direccion: type: VARCHAR size: 128 required: true - default: ciudad: type: VARCHAR size: 128 required: true - default: codigo_postal: type: VARCHAR size: 20 required: true - default: telefono: type: VARCHAR size: 20 required: false - default: fk_provincia_id: type: INTEGER required: true @@ -618,12 +579,10 @@ type: VARCHAR size: 128 required: true - default: apellido: type: VARCHAR size: 128 required: true - default: fecha_nacimiento: type: TIMESTAMP required: true @@ -631,17 +590,14 @@ type: VARCHAR size: 128 required: true - default: ciudad: type: VARCHAR size: 128 required: true - default: codigo_postal: type: VARCHAR size: 20 required: true - default: fk_provincia_id: type: INTEGER required: true @@ -652,12 +608,10 @@ type: VARCHAR size: 20 required: false - default: lugar_nacimiento: type: VARCHAR size: 128 required: false - default: fk_tipodocumento_id: type: integer size: 11 @@ -669,17 +623,14 @@ type: varchar size: 16 required: true - default: sexo: type: CHAR size: 1 required: true -# default: email: type: VARCHAR size: 128 required: true - default: distancia_escuela: type: INTEGER required: false @@ -735,27 +686,22 @@ type: VARCHAR size: 128 required: true - default: apellido: type: VARCHAR size: 128 required: true - default: direccion: type: VARCHAR size: 128 required: false - default: ciudad: type: VARCHAR size: 128 required: false - default: codigo_postal: type: VARCHAR size: 20 required: false - default: fk_provincia_id: type: INTEGER required: true @@ -766,17 +712,14 @@ type: VARCHAR size: 20 required: false - default: telefono_movil: type: VARCHAR size: 20 required: false - default: nro_documento: type: VARCHAR size: 20 required: true - default: fk_tipodocumento_id: type: INTEGER required: true @@ -787,17 +730,14 @@ type: CHAR size: 1 required: true -# default: email: type: VARCHAR size: 128 required: false - default: observacion: type: VARCHAR size: 255 required: false - default: autorizacion_retiro: type: boolean required: true @@ -839,7 +779,6 @@ type: varchar size: 255 required: true - default: actual: type: boolean required: true @@ -869,7 +808,6 @@ type: varchar size: 255 required: true - default: periodo: _attributes: idMethod: native @@ -895,7 +833,6 @@ type: varchar size: 255 required: true - default: conceptobaja: _attributes: idMethod: native @@ -913,7 +850,6 @@ type: varchar size: 255 required: false - default: tipodocente: _attributes: idMethod: native @@ -931,7 +867,6 @@ type: varchar size: 255 required: false - default: cargobaja: _attributes: idMethod: native @@ -949,7 +884,6 @@ type: varchar size: 255 required: false - default: calendariovacunacion: _attributes: idMethod: native @@ -975,7 +909,6 @@ type: varchar size: 255 required: false - default: rel_calendariovacunacion_alumno: _attributes: idMethod: native @@ -1314,7 +1247,6 @@ nombre: type: varchar size: 255 - default: required: true observacion: type: blob @@ -1342,7 +1274,6 @@ type: varchar size: 255 required: true - default: division: _attributes: idMethod: native @@ -1363,7 +1294,6 @@ type: varchar size: 255 required: true - default: fk_turnos_id: type: integer size: 11 @@ -1388,7 +1318,6 @@ type: varchar size: 255 required: true - default: orden: type: integer size: 11 @@ -1414,7 +1343,6 @@ type: varchar size: 128 required: true - default: descripcion: type: varchar size: 255 @@ -1520,12 +1448,10 @@ type: VARCHAR size: 128 required: true - default: nombre: type: VARCHAR size: 128 required: true - default: sexo: type: CHAR size: 1 @@ -1545,42 +1471,34 @@ type: varchar size: 16 required: true - default: direccion: type: varchar size: 128 required: false - default: ciudad: type: varchar size: 128 required: false - default: codigo_postal: type: varchar size: 20 required: false - default: email: type: varchar size: 255 required: false - default: telefono: type: varchar size: 20 required: false - default: telefono_movil: type: varchar size: 20 required: false - default: titulo: type: varchar size: 128 required: true - default: libreta_sanitaria: type: boolean required: false @@ -1629,12 +1547,10 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 required: false - default: orden: type: integer size: 11 @@ -1760,7 +1676,6 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 @@ -1782,7 +1697,6 @@ type: VARCHAR size: 255 required: false - default: valor: type: DECIMAL size: 4,2 @@ -1792,7 +1706,6 @@ type: VARCHAR size: 30 required: false - default: defecto: type: BOOLEAN required: true @@ -1809,11 +1722,9 @@ type: VARCHAR size: 128 required: true - default: descripcion: type: VARCHAR size: 255 - default: activo: type: BOOLEAN required: true @@ -1852,7 +1763,6 @@ type: VARCHAR size: 16 required: false - default: recurrencia_dias: type: INTEGER required: true @@ -1894,4 +1804,3 @@ descripcion: type: VARCHAR size: 255 - default: Modified: prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/data/sql/lib.model.schema.sql 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ CREATE TABLE `locacion` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), - `direccion` VARCHAR(128) default 'null' NOT NULL, - `ciudad` VARCHAR(128) default 'null' NOT NULL, - `codigo_postal` VARCHAR(20) default 'null', + `direccion` VARCHAR(128) NOT NULL, + `ciudad` VARCHAR(128) NOT NULL, + `codigo_postal` VARCHAR(20), `fk_provincia_id` INTEGER default 0 NOT NULL, `fk_tipolocacion_id` INTEGER default 0 NOT NULL, `telefono` VARCHAR(20), @@ -46,7 +46,7 @@ CREATE TABLE `modulo` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `titulo` VARCHAR(128), `descripcion` VARCHAR(255), `activo` INTEGER default 1 NOT NULL, @@ -63,7 +63,7 @@ CREATE TABLE `espacio` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `m2` FLOAT, `capacidad` VARCHAR(255), `descripcion` VARCHAR(255), @@ -91,8 +91,8 @@ CREATE TABLE `tipoespacio` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -106,8 +106,8 @@ CREATE TABLE `tipolocacion` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -121,7 +121,7 @@ CREATE TABLE `distritoescolar` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `direccion` VARCHAR(128), `telefono` VARCHAR(20), `ciudad` VARCHAR(128), @@ -138,7 +138,7 @@ CREATE TABLE `establecimiento` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), `fk_distritoescolar_id` INTEGER default 0 NOT NULL, `fk_organizacion_id` INTEGER default 0 NOT NULL, @@ -168,7 +168,7 @@ CREATE TABLE `niveltipo` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -183,14 +183,14 @@ CREATE TABLE `organizacion` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), - `razon_social` VARCHAR(128) default 'null' NOT NULL, - `cuit` VARCHAR(20) default 'null' NOT NULL, - `direccion` VARCHAR(128) default 'null' NOT NULL, - `ciudad` VARCHAR(128) default 'null' NOT NULL, - `codigo_postal` VARCHAR(20) default 'null' NOT NULL, - `telefono` VARCHAR(20) default 'null', + `razon_social` VARCHAR(128) NOT NULL, + `cuit` VARCHAR(20) NOT NULL, + `direccion` VARCHAR(128) NOT NULL, + `ciudad` VARCHAR(128) NOT NULL, + `codigo_postal` VARCHAR(20) NOT NULL, + `telefono` VARCHAR(20), `fk_provincia_id` INTEGER default 0 NOT NULL, `fk_tipoiva_id` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`), @@ -214,8 +214,8 @@ CREATE TABLE `pais` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre_largo` VARCHAR(128) default 'null' NOT NULL, - `nombre_corto` VARCHAR(32) default 'null' NOT NULL, + `nombre_largo` VARCHAR(128) NOT NULL, + `nombre_corto` VARCHAR(32) NOT NULL, `orden` INTEGER default 0, PRIMARY KEY (`id`) )Type=InnoDB; @@ -230,7 +230,7 @@ CREATE TABLE `permiso` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), `fk_modulo_id` INTEGER default 0 NOT NULL, `credencial` VARCHAR(32), @@ -251,7 +251,7 @@ CREATE TABLE `preferencia` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `valor_por_defecto` VARCHAR(128), `activo` INTEGER default 1 NOT NULL, PRIMARY KEY (`id`) @@ -352,8 +352,8 @@ CREATE TABLE `rol` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), `activo` INTEGER default 1 NOT NULL, PRIMARY KEY (`id`) )Type=InnoDB; @@ -368,8 +368,8 @@ CREATE TABLE `usuario` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `usuario` VARCHAR(32) default 'null' NOT NULL, - `clave` VARCHAR(48) default 'null' NOT NULL, + `usuario` VARCHAR(32) NOT NULL, + `clave` VARCHAR(48) NOT NULL, `correo_publico` INTEGER default 1, `activo` INTEGER default 1 NOT NULL, `fecha_creado` DATETIME NOT NULL, @@ -396,8 +396,8 @@ CREATE TABLE `tipoiva` ( `id` INTEGER NOT NULL, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), `orden` INTEGER default 0, PRIMARY KEY (`id`) )Type=InnoDB; @@ -412,8 +412,8 @@ CREATE TABLE `provincia` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre_corto` VARCHAR(32) default 'null' NOT NULL, - `nombre_largo` VARCHAR(128) default 'null' NOT NULL, + `nombre_corto` VARCHAR(32) NOT NULL, + `nombre_largo` VARCHAR(128) NOT NULL, `fk_pais_id` INTEGER default 0 NOT NULL, `orden` INTEGER default 0, PRIMARY KEY (`id`), @@ -433,13 +433,13 @@ CREATE TABLE `cuenta` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `razon_social` VARCHAR(128) default 'null' NOT NULL, - `cuit` VARCHAR(20) default 'null' NOT NULL, - `direccion` VARCHAR(128) default 'null' NOT NULL, - `ciudad` VARCHAR(128) default 'null' NOT NULL, - `codigo_postal` VARCHAR(20) default 'null' NOT NULL, - `telefono` VARCHAR(20) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `razon_social` VARCHAR(128) NOT NULL, + `cuit` VARCHAR(20) NOT NULL, + `direccion` VARCHAR(128) NOT NULL, + `ciudad` VARCHAR(128) NOT NULL, + `codigo_postal` VARCHAR(20) NOT NULL, + `telefono` VARCHAR(20), `fk_provincia_id` INTEGER default 0 NOT NULL, `fk_tipoiva_id` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`), @@ -463,19 +463,19 @@ CREATE TABLE `alumno` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `apellido` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, + `apellido` VARCHAR(128) NOT NULL, `fecha_nacimiento` DATETIME NOT NULL, - `direccion` VARCHAR(128) default 'null' NOT NULL, - `ciudad` VARCHAR(128) default 'null' NOT NULL, - `codigo_postal` VARCHAR(20) default 'null' NOT NULL, + `direccion` VARCHAR(128) NOT NULL, + `ciudad` VARCHAR(128) NOT NULL, + `codigo_postal` VARCHAR(20) NOT NULL, `fk_provincia_id` INTEGER default 0 NOT NULL, - `telefono` VARCHAR(20) default 'null', - `lugar_nacimiento` VARCHAR(128) default 'null', + `telefono` VARCHAR(20), + `lugar_nacimiento` VARCHAR(128), `fk_tipodocumento_id` INTEGER(11) default 0 NOT NULL, - `nro_documento` VARCHAR(16) default 'null' NOT NULL, + `nro_documento` VARCHAR(16) NOT NULL, `sexo` CHAR(1) NOT NULL, - `email` VARCHAR(128) default 'null' NOT NULL, + `email` VARCHAR(128) NOT NULL, `distancia_escuela` INTEGER default 0, `hermanos_escuela` INTEGER default 0 NOT NULL, `hijo_maestro_escuela` INTEGER default 0 NOT NULL, @@ -522,19 +522,19 @@ CREATE TABLE `responsable` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `apellido` VARCHAR(128) default 'null' NOT NULL, - `direccion` VARCHAR(128) default 'null', - `ciudad` VARCHAR(128) default 'null', - `codigo_postal` VARCHAR(20) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `apellido` VARCHAR(128) NOT NULL, + `direccion` VARCHAR(128), + `ciudad` VARCHAR(128), + `codigo_postal` VARCHAR(20), `fk_provincia_id` INTEGER default 0 NOT NULL, - `telefono` VARCHAR(20) default 'null', - `telefono_movil` VARCHAR(20) default 'null', - `nro_documento` VARCHAR(20) default 'null' NOT NULL, + `telefono` VARCHAR(20), + `telefono_movil` VARCHAR(20), + `nro_documento` VARCHAR(20) NOT NULL, `fk_tipodocumento_id` INTEGER default 0 NOT NULL, `sexo` CHAR(1) NOT NULL, - `email` VARCHAR(128) default 'null', - `observacion` VARCHAR(255) default 'null', + `email` VARCHAR(128), + `observacion` VARCHAR(255), `autorizacion_retiro` INTEGER default 0 NOT NULL, `fk_cuenta_id` INTEGER default 0 NOT NULL, `fk_rolresponsable_id` INTEGER default 1 NOT NULL, @@ -570,7 +570,7 @@ `fk_establecimiento_id` INTEGER(11) NOT NULL, `fecha_inicio` DATETIME NOT NULL, `fecha_fin` DATETIME NOT NULL, - `descripcion` VARCHAR(255) default 'null' NOT NULL, + `descripcion` VARCHAR(255) NOT NULL, `actual` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`), INDEX `ciclolectivo_FI_1` (`fk_establecimiento_id`), @@ -592,7 +592,7 @@ `fk_ciclolectivo_id` INTEGER(11) NOT NULL, `hora_inicio` TIME NOT NULL, `hora_fin` TIME NOT NULL, - `descripcion` VARCHAR(255) default 'null' NOT NULL, + `descripcion` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), INDEX `turnos_FI_1` (`fk_ciclolectivo_id`), CONSTRAINT `turnos_FK_1` @@ -613,7 +613,7 @@ `fk_ciclolectivo_id` INTEGER(11) NOT NULL, `fecha_inicio` DATETIME NOT NULL, `fecha_fin` DATETIME NOT NULL, - `descripcion` VARCHAR(255) default 'null' NOT NULL, + `descripcion` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), INDEX `periodo_FI_1` (`fk_ciclolectivo_id`), CONSTRAINT `periodo_FK_1` @@ -632,7 +632,7 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `nombre` VARCHAR(128) NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -647,7 +647,7 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `nombre` VARCHAR(128) NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -662,7 +662,7 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `nombre` VARCHAR(128) NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -679,7 +679,7 @@ `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), `periodo` VARCHAR(128), - `observacion` VARCHAR(255) default 'null', + `observacion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -947,7 +947,7 @@ `fk_alumno_id` INTEGER(11) default 0 NOT NULL, `fk_actividad_id` INTEGER(11) default 0 NOT NULL, `fk_periodo_id` INTEGER(11) default 0 NOT NULL, - `nombre` VARCHAR(255) default 'null' NOT NULL, + `nombre` VARCHAR(255) NOT NULL, `observacion` LONGBLOB NOT NULL, `fecha` DATETIME NOT NULL, PRIMARY KEY (`id`), @@ -980,7 +980,7 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `fk_establecimiento_id` INTEGER(11) default 0 NOT NULL, - `descripcion` VARCHAR(255) default 'null' NOT NULL, + `descripcion` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), INDEX `anio_FI_1` (`fk_establecimiento_id`), CONSTRAINT `anio_FK_1` @@ -999,7 +999,7 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `fk_anio_id` INTEGER(11) default 0 NOT NULL, - `descripcion` VARCHAR(255) default 'null' NOT NULL, + `descripcion` VARCHAR(255) NOT NULL, `fk_turnos_id` INTEGER(11) default 0 NOT NULL, `orden` INTEGER default 0, PRIMARY KEY (`id`), @@ -1023,7 +1023,7 @@ CREATE TABLE `repeticion` ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, - `descripcion` VARCHAR(255) default 'null' NOT NULL, + `descripcion` VARCHAR(255) NOT NULL, `orden` INTEGER(11) default 0 NOT NULL, PRIMARY KEY (`id`) )Type=InnoDB; @@ -1039,7 +1039,7 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `fk_establecimiento_id` INTEGER(11) default 0 NOT NULL, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), PRIMARY KEY (`id`), INDEX `actividad_FI_1` (`fk_establecimiento_id`), @@ -1109,11 +1109,6 @@ `fk_actividad_id` INTEGER(11) default 0 NOT NULL, `fk_docente_id` INTEGER(11) default 0, `fk_evento_id` INTEGER(11) default 0, - `fk_repeticion_id` INTEGER(11) default 0, - `fecha_inicio` DATETIME NOT NULL, - `fecha_fin` DATETIME NOT NULL, - `hora_inicio` TIME NOT NULL, - `hora_fin` TIME NOT NULL, PRIMARY KEY (`id`), INDEX `rel_division_actividad_docente_FI_1` (`fk_division_id`), CONSTRAINT `rel_division_actividad_docente_FK_1` @@ -1130,11 +1125,8 @@ INDEX `rel_division_actividad_docente_FI_4` (`fk_evento_id`), CONSTRAINT `rel_division_actividad_docente_FK_4` FOREIGN KEY (`fk_evento_id`) - REFERENCES `evento` (`id`), - INDEX `rel_division_actividad_docente_FI_5` (`fk_repeticion_id`), - CONSTRAINT `rel_division_actividad_docente_FK_5` - FOREIGN KEY (`fk_repeticion_id`) - REFERENCES `repeticion` (`id`) + REFERENCES `evento` (`id`) + ON DELETE CASCADE )Type=InnoDB; #----------------------------------------------------------------------------- @@ -1147,19 +1139,19 @@ CREATE TABLE `docente` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `apellido` VARCHAR(128) default 'null' NOT NULL, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `apellido` VARCHAR(128) NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `sexo` CHAR(1) NOT NULL, `fecha_nacimiento` DATETIME NOT NULL, `fk_tipodocumento_id` INTEGER(11) default 0 NOT NULL, - `nro_documento` VARCHAR(16) default 'null' NOT NULL, - `direccion` VARCHAR(128) default 'null', - `ciudad` VARCHAR(128) default 'null', - `codigo_postal` VARCHAR(20) default 'null', - `email` VARCHAR(255) default 'null', - `telefono` VARCHAR(20) default 'null', - `telefono_movil` VARCHAR(20) default 'null', - `titulo` VARCHAR(128) default 'null' NOT NULL, + `nro_documento` VARCHAR(16) NOT NULL, + `direccion` VARCHAR(128), + `ciudad` VARCHAR(128), + `codigo_postal` VARCHAR(20), + `email` VARCHAR(255), + `telefono` VARCHAR(20), + `telefono_movil` VARCHAR(20), + `titulo` VARCHAR(128) NOT NULL, `libreta_sanitaria` INTEGER default 0, `psicofisico` INTEGER default 0, `activo` INTEGER default 1, @@ -1208,8 +1200,8 @@ CREATE TABLE `tipodocumento` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), `orden` INTEGER(11) default 0, PRIMARY KEY (`id`) )Type=InnoDB; @@ -1254,6 +1246,7 @@ CONSTRAINT `docente_horario_FK_2` FOREIGN KEY (`fk_evento_id`) REFERENCES `evento` (`id`) + ON DELETE CASCADE )Type=InnoDB; #----------------------------------------------------------------------------- @@ -1298,7 +1291,8 @@ INDEX `horarioescolar_FI_1` (`fk_evento_id`), CONSTRAINT `horarioescolar_FK_1` FOREIGN KEY (`fk_evento_id`) - REFERENCES `evento` (`id`), + REFERENCES `evento` (`id`) + ON DELETE CASCADE, INDEX `horarioescolar_FI_2` (`fk_establecimiento_id`), CONSTRAINT `horarioescolar_FK_2` FOREIGN KEY (`fk_establecimiento_id`) @@ -1323,7 +1317,7 @@ CREATE TABLE `horarioescolartipo` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, + `nombre` VARCHAR(128) NOT NULL, `descripcion` VARCHAR(255), PRIMARY KEY (`id`) )Type=InnoDB; @@ -1339,9 +1333,9 @@ ( `id` INTEGER(11) NOT NULL AUTO_INCREMENT, `nombre` VARCHAR(10) NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `descripcion` VARCHAR(255), `valor` DECIMAL(4,2) default 1 NOT NULL, - `grupo` VARCHAR(30) default 'null', + `grupo` VARCHAR(30), `defecto` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`) )Type=InnoDB; @@ -1356,8 +1350,8 @@ CREATE TABLE `rol_responsable` ( `id` INTEGER NOT NULL AUTO_INCREMENT, - `nombre` VARCHAR(128) default 'null' NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `nombre` VARCHAR(128) NOT NULL, + `descripcion` VARCHAR(255), `activo` INTEGER default 1 NOT NULL, PRIMARY KEY (`id`) )Type=InnoDB; @@ -1378,7 +1372,7 @@ `tipo` INTEGER default 0 NOT NULL, `frecuencia` INTEGER default 0 NOT NULL, `frecuencia_intervalo` INTEGER default 0 NOT NULL, - `recurrencia_fin` VARCHAR(16) default 'null', + `recurrencia_fin` VARCHAR(16), `recurrencia_dias` INTEGER default 0 NOT NULL, `estado` INTEGER default 0 NOT NULL, PRIMARY KEY (`id`) @@ -1397,7 +1391,7 @@ `fk_rolresponsable_id` INTEGER(11) default 0 NOT NULL, `fk_responsable_id` INTEGER(11) default 0 NOT NULL, `fk_alumno_id` INTEGER(11) default 0 NOT NULL, - `descripcion` VARCHAR(255) default 'null', + `descripcion` VARCHAR(255), PRIMARY KEY (`id`), INDEX `rel_rolresponsable_responsable_FI_1` (`fk_rolresponsable_id`), CONSTRAINT `rel_rolresponsable_responsable_FK_1` Modified: prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseActividad.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -130,7 +130,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = ActividadPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAlumno.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $apellido = 'null'; + protected $apellido; @@ -25,15 +25,15 @@ - protected $direccion = 'null'; + protected $direccion; - protected $ciudad = 'null'; + protected $ciudad; - protected $codigo_postal = 'null'; + protected $codigo_postal; @@ -41,11 +41,11 @@ - protected $telefono = 'null'; + protected $telefono; - protected $lugar_nacimiento = 'null'; + protected $lugar_nacimiento; @@ -53,7 +53,7 @@ - protected $nro_documento = 'null'; + protected $nro_documento; @@ -61,7 +61,7 @@ - protected $email = 'null'; + protected $email; @@ -369,7 +369,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = AlumnoPeer::NOMBRE; } @@ -383,7 +383,7 @@ $v = (string) $v; } - if ($this->apellido !== $v || $v === 'null') { + if ($this->apellido !== $v) { $this->apellido = $v; $this->modifiedColumns[] = AlumnoPeer::APELLIDO; } @@ -414,7 +414,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === 'null') { + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = AlumnoPeer::DIRECCION; } @@ -428,7 +428,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === 'null') { + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = AlumnoPeer::CIUDAD; } @@ -442,7 +442,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === 'null') { + if ($this->codigo_postal !== $v) { $this->codigo_postal = $v; $this->modifiedColumns[] = AlumnoPeer::CODIGO_POSTAL; } @@ -474,7 +474,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === 'null') { + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = AlumnoPeer::TELEFONO; } @@ -488,7 +488,7 @@ $v = (string) $v; } - if ($this->lugar_nacimiento !== $v || $v === 'null') { + if ($this->lugar_nacimiento !== $v) { $this->lugar_nacimiento = $v; $this->modifiedColumns[] = AlumnoPeer::LUGAR_NACIMIENTO; } @@ -520,7 +520,7 @@ $v = (string) $v; } - if ($this->nro_documento !== $v || $v === 'null') { + if ($this->nro_documento !== $v) { $this->nro_documento = $v; $this->modifiedColumns[] = AlumnoPeer::NRO_DOCUMENTO; } @@ -548,7 +548,7 @@ $v = (string) $v; } - if ($this->email !== $v || $v === 'null') { + if ($this->email !== $v) { $this->email = $v; $this->modifiedColumns[] = AlumnoPeer::EMAIL; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseAnio.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $aEstablecimiento; @@ -101,7 +101,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = AnioPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCalendariovacunacion.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -25,7 +25,7 @@ - protected $observacion = 'null'; + protected $observacion; protected $collRelCalendariovacunacionAlumnos; @@ -138,7 +138,7 @@ $v = (string) $v; } - if ($this->observacion !== $v || $v === 'null') { + if ($this->observacion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCargobaja.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $alreadyInSave = false; @@ -82,7 +82,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCiclolectivo.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -25,7 +25,7 @@ - protected $descripcion = 'null'; + protected $descripcion; @@ -204,7 +204,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = CiclolectivoPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseConceptobaja.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $collAlumnos; @@ -88,7 +88,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseCuenta.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,31 +13,31 @@ - protected $nombre = 'null'; + protected $nombre; - protected $razon_social = 'null'; + protected $razon_social; - protected $cuit = 'null'; + protected $cuit; - protected $direccion = 'null'; + protected $direccion; - protected $ciudad = 'null'; + protected $ciudad; - protected $codigo_postal = 'null'; + protected $codigo_postal; - protected $telefono = 'null'; + protected $telefono; @@ -163,7 +163,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = CuentaPeer::NOMBRE; } @@ -177,7 +177,7 @@ $v = (string) $v; } - if ($this->razon_social !== $v || $v === 'null') { + if ($this->razon_social !== $v) { $this->razon_social = $v; $this->modifiedColumns[] = CuentaPeer::RAZON_SOCIAL; } @@ -191,7 +191,7 @@ $v = (string) $v; } - if ($this->cuit !== $v || $v === 'null') { + if ($this->cuit !== $v) { $this->cuit = $v; $this->modifiedColumns[] = CuentaPeer::CUIT; } @@ -205,7 +205,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === 'null') { + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = CuentaPeer::DIRECCION; } @@ -219,7 +219,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === 'null') { + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = CuentaPeer::CIUDAD; } @@ -233,7 +233,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === 'null') { + if ($this->codigo_postal !== $v) { $this->codigo_postal = $v; $this->modifiedColumns[] = CuentaPeer::CODIGO_POSTAL; } @@ -247,7 +247,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === 'null') { + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = CuentaPeer::TELEFONO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDistritoescolar.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -96,7 +96,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = DistritoescolarPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDivision.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $descripcion = 'null'; + protected $descripcion; @@ -126,7 +126,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = DivisionPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseDocente.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $apellido = 'null'; + protected $apellido; - protected $nombre = 'null'; + protected $nombre; @@ -33,35 +33,35 @@ - protected $nro_documento = 'null'; + protected $nro_documento; - protected $direccion = 'null'; + protected $direccion; - protected $ciudad = 'null'; + protected $ciudad; - protected $codigo_postal = 'null'; + protected $codigo_postal; - protected $email = 'null'; + protected $email; - protected $telefono = 'null'; + protected $telefono; - protected $telefono_movil = 'null'; + protected $telefono_movil; - protected $titulo = 'null'; + protected $titulo; @@ -278,7 +278,7 @@ $v = (string) $v; } - if ($this->apellido !== $v || $v === 'null') { + if ($this->apellido !== $v) { $this->apellido = $v; $this->modifiedColumns[] = DocentePeer::APELLIDO; } @@ -292,7 +292,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = DocentePeer::NOMBRE; } @@ -355,7 +355,7 @@ $v = (string) $v; } - if ($this->nro_documento !== $v || $v === 'null') { + if ($this->nro_documento !== $v) { $this->nro_documento = $v; $this->modifiedColumns[] = DocentePeer::NRO_DOCUMENTO; } @@ -369,7 +369,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === 'null') { + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = DocentePeer::DIRECCION; } @@ -383,7 +383,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === 'null') { + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = DocentePeer::CIUDAD; } @@ -397,7 +397,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === 'null') { + if ($this->codigo_postal !== $v) { $this->codigo_postal = $v; $this->modifiedColumns[] = DocentePeer::CODIGO_POSTAL; } @@ -411,7 +411,7 @@ $v = (string) $v; } - if ($this->email !== $v || $v === 'null') { + if ($this->email !== $v) { $this->email = $v; $this->modifiedColumns[] = DocentePeer::EMAIL; } @@ -425,7 +425,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === 'null') { + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = DocentePeer::TELEFONO; } @@ -439,7 +439,7 @@ $v = (string) $v; } - if ($this->telefono_movil !== $v || $v === 'null') { + if ($this->telefono_movil !== $v) { $this->telefono_movil = $v; $this->modifiedColumns[] = DocentePeer::TELEFONO_MOVIL; } @@ -453,7 +453,7 @@ $v = (string) $v; } - if ($this->titulo !== $v || $v === 'null') { + if ($this->titulo !== $v) { $this->titulo = $v; $this->modifiedColumns[] = DocentePeer::TITULO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEspacio.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -129,7 +129,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = EspacioPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEstablecimiento.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -170,7 +170,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = EstablecimientoPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseEvento.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -37,7 +37,7 @@ - protected $recurrencia_fin = 'null'; + protected $recurrencia_fin; @@ -283,7 +283,7 @@ $v = (string) $v; } - if ($this->recurrencia_fin !== $v || $v === 'null') { + if ($this->recurrencia_fin !== $v) { $this->recurrencia_fin = $v; $this->modifiedColumns[] = EventoPeer::RECURRENCIA_FIN; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseExamen.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -29,7 +29,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -222,7 +222,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = ExamenPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseHorarioescolartipo.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = HorarioescolartipoPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseLocacion.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -21,15 +21,15 @@ - protected $direccion = 'null'; + protected $direccion; - protected $ciudad = 'null'; + protected $ciudad; - protected $codigo_postal = 'null'; + protected $codigo_postal; @@ -196,7 +196,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = LocacionPeer::NOMBRE; } @@ -224,7 +224,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === 'null') { + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = LocacionPeer::DIRECCION; } @@ -238,7 +238,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === 'null') { + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = LocacionPeer::CIUDAD; } @@ -252,7 +252,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === 'null') { + if ($this->codigo_postal !== $v) { $this->codigo_postal = $v; $this->modifiedColumns[] = LocacionPeer::CODIGO_POSTAL; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseModulo.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -96,7 +96,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = ModuloPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseNiveltipo.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = NiveltipoPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseOrganizacion.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -21,27 +21,27 @@ - protected $razon_social = 'null'; + protected $razon_social; - protected $cuit = 'null'; + protected $cuit; - protected $direccion = 'null'; + protected $direccion; - protected $ciudad = 'null'; + protected $ciudad; - protected $codigo_postal = 'null'; + protected $codigo_postal; - protected $telefono = 'null'; + protected $telefono; @@ -168,7 +168,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = OrganizacionPeer::NOMBRE; } @@ -196,7 +196,7 @@ $v = (string) $v; } - if ($this->razon_social !== $v || $v === 'null') { + if ($this->razon_social !== $v) { $this->razon_social = $v; $this->modifiedColumns[] = OrganizacionPeer::RAZON_SOCIAL; } @@ -210,7 +210,7 @@ $v = (string) $v; } - if ($this->cuit !== $v || $v === 'null') { + if ($this->cuit !== $v) { $this->cuit = $v; $this->modifiedColumns[] = OrganizacionPeer::CUIT; } @@ -224,7 +224,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === 'null') { + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = OrganizacionPeer::DIRECCION; } @@ -238,7 +238,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === 'null') { + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = OrganizacionPeer::CIUDAD; } @@ -252,7 +252,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === 'null') { + if ($this->codigo_postal !== $v) { $this->codigo_postal = $v; $this->modifiedColumns[] = OrganizacionPeer::CODIGO_POSTAL; } @@ -266,7 +266,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === 'null') { + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = OrganizacionPeer::TELEFONO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BasePais.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BasePais.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre_largo = 'null'; + protected $nombre_largo; - protected $nombre_corto = 'null'; + protected $nombre_corto; @@ -91,7 +91,7 @@ $v = (string) $v; } - if ($this->nombre_largo !== $v || $v === 'null') { + if ($this->nombre_largo !== $v) { $this->nombre_largo = $v; $this->modifiedColumns[] = PaisPeer::NOMBRE_LARGO; } @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->nombre_corto !== $v || $v === 'null') { + if ($this->nombre_corto !== $v) { $this->nombre_corto = $v; $this->modifiedColumns[] = PaisPeer::NOMBRE_CORTO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BasePeriodo.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -25,7 +25,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $aCiclolectivo; @@ -193,7 +193,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = PeriodoPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BasePermiso.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = PermisoPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BasePreferencia.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $nombre = 'null'; + protected $nombre; @@ -79,7 +79,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = PreferenciaPeer::NOMBRE; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseProvincia.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre_corto = 'null'; + protected $nombre_corto; - protected $nombre_largo = 'null'; + protected $nombre_largo; @@ -129,7 +129,7 @@ $v = (string) $v; } - if ($this->nombre_corto !== $v || $v === 'null') { + if ($this->nombre_corto !== $v) { $this->nombre_corto = $v; $this->modifiedColumns[] = ProvinciaPeer::NOMBRE_CORTO; } @@ -143,7 +143,7 @@ $v = (string) $v; } - if ($this->nombre_largo !== $v || $v === 'null') { + if ($this->nombre_largo !== $v) { $this->nombre_largo = $v; $this->modifiedColumns[] = ProvinciaPeer::NOMBRE_LARGO; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRelRolresponsableResponsable.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -25,7 +25,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $aRolResponsable; @@ -153,7 +153,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = RelRolresponsableResponsablePeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRepeticion.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,7 +13,7 @@ - protected $descripcion = 'null'; + protected $descripcion; @@ -68,7 +68,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = RepeticionPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseResponsable.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,23 +13,23 @@ - protected $nombre = 'null'; + protected $nombre; - protected $apellido = 'null'; + protected $apellido; - protected $direccion = 'null'; + protected $direccion; - protected $ciudad = 'null'; + protected $ciudad; - protected $codigo_postal = 'null'; + protected $codigo_postal; @@ -37,15 +37,15 @@ - protected $telefono = 'null'; + protected $telefono; - protected $telefono_movil = 'null'; + protected $telefono_movil; - protected $nro_documento = 'null'; + protected $nro_documento; @@ -57,11 +57,11 @@ - protected $email = 'null'; + protected $email; - protected $observacion = 'null'; + protected $observacion; @@ -240,7 +240,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = ResponsablePeer::NOMBRE; } @@ -254,7 +254,7 @@ $v = (string) $v; } - if ($this->apellido !== $v || $v === 'null') { + if ($this->apellido !== $v) { $this->apellido = $v; $this->modifiedColumns[] = ResponsablePeer::APELLIDO; } @@ -268,7 +268,7 @@ $v = (string) $v; } - if ($this->direccion !== $v || $v === 'null') { + if ($this->direccion !== $v) { $this->direccion = $v; $this->modifiedColumns[] = ResponsablePeer::DIRECCION; } @@ -282,7 +282,7 @@ $v = (string) $v; } - if ($this->ciudad !== $v || $v === 'null') { + if ($this->ciudad !== $v) { $this->ciudad = $v; $this->modifiedColumns[] = ResponsablePeer::CIUDAD; } @@ -296,7 +296,7 @@ $v = (string) $v; } - if ($this->codigo_postal !== $v || $v === 'null') { + if ($this->codigo_postal !== $v) { $this->codigo_postal = $v; $this->modifiedColumns[] = ResponsablePeer::CODIGO_POSTAL; } @@ -328,7 +328,7 @@ $v = (string) $v; } - if ($this->telefono !== $v || $v === 'null') { + if ($this->telefono !== $v) { $this->telefono = $v; $this->modifiedColumns[] = ResponsablePeer::TELEFONO; } @@ -342,7 +342,7 @@ $v = (string) $v; } - if ($this->telefono_movil !== $v || $v === 'null') { + if ($this->telefono_movil !== $v) { $this->telefono_movil = $v; $this->modifiedColumns[] = ResponsablePeer::TELEFONO_MOVIL; } @@ -356,7 +356,7 @@ $v = (string) $v; } - if ($this->nro_documento !== $v || $v === 'null') { + if ($this->nro_documento !== $v) { $this->nro_documento = $v; $this->modifiedColumns[] = ResponsablePeer::NRO_DOCUMENTO; } @@ -402,7 +402,7 @@ $v = (string) $v; } - if ($this->email !== $v || $v === 'null') { + if ($this->email !== $v) { $this->email = $v; $this->modifiedColumns[] = ResponsablePeer::EMAIL; } @@ -416,7 +416,7 @@ $v = (string) $v; } - if ($this->observacion !== $v || $v === 'null') { + if ($this->observacion !== $v) { $this->observacion = $v; $this->modifiedColumns[] = ResponsablePeer::OBSERVACION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseRol.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseRol.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRol.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $descripcion = 'null'; + protected $descripcion; @@ -85,7 +85,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = RolPeer::NOMBRE; } @@ -99,7 +99,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseRolResponsable.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $descripcion = 'null'; + protected $descripcion; @@ -91,7 +91,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = RolResponsablePeer::NOMBRE; } @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoasistencia.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $descripcion = 'null'; + protected $descripcion; @@ -25,7 +25,7 @@ - protected $grupo = 'null'; + protected $grupo; @@ -121,7 +121,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = TipoasistenciaPeer::DESCRIPCION; } @@ -145,7 +145,7 @@ $v = (string) $v; } - if ($this->grupo !== $v || $v === 'null') { + if ($this->grupo !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocente.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -17,7 +17,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $alreadyInSave = false; @@ -82,7 +82,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipodocumento.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $descripcion = 'null'; + protected $descripcion; @@ -97,7 +97,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = TipodocumentoPeer::NOMBRE; } @@ -111,7 +111,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = TipodocumentoPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoespacio.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $descripcion = 'null'; + protected $descripcion; protected $collEspacios; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = TipoespacioPeer::NOMBRE; } @@ -88,7 +88,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipoiva.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $descripcion = 'null'; + protected $descripcion; @@ -91,7 +91,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = TipoivaPeer::NOMBRE; } @@ -105,7 +105,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = TipoivaPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTipolocacion.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $nombre = 'null'; + protected $nombre; - protected $descripcion = 'null'; + protected $descripcion; protected $collLocacions; @@ -74,7 +74,7 @@ $v = (string) $v; } - if ($this->nombre !== $v || $v === 'null') { + if ($this->nombre !== $v) { $this->nombre = $v; $this->modifiedColumns[] = TipolocacionPeer::NOMBRE; } @@ -88,7 +88,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $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-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseTurnos.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -25,7 +25,7 @@ - protected $descripcion = 'null'; + protected $descripcion; protected $aCiclolectivo; @@ -187,7 +187,7 @@ $v = (string) $v; } - if ($this->descripcion !== $v || $v === 'null') { + if ($this->descripcion !== $v) { $this->descripcion = $v; $this->modifiedColumns[] = TurnosPeer::DESCRIPCION; } Modified: prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2007-07-30 14:58:43 UTC (rev 4876) +++ prosistem/alba/trunk/alba/lib/model/om/BaseUsuario.php 2007-07-30 15:43:27 UTC (rev 4877) @@ -13,11 +13,11 @@ - protected $usuario = 'null'; + protected $usuario; - protected $clave = 'null'; + protected $clave; @@ -212,7 +212,7 @@ $v = (string) $v; } - if ($this->usuario !== $v || $v === 'null') { + if ($this->usuario !== $v) { $this->usuario = $v; $this->modifiedColumns[] = UsuarioPeer::USUARIO; } @@ -226,7 +226,7 @@ $v = (string) $v; } - if ($this->clave !== $v || $v === 'null') { + if ($this->clave !== $v) { $this->clave = $v; $this->modifiedColumns[] = UsuarioPeer::CLAVE; }
participants (1)
-
commits＠pressenter.com.ar