Author: jablko
Date: Thu Sep 17 14:16:40 2009
New Revision: 3379
Log:
Drop redundant columns
Modified:
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/lib/model/map/ActorMapBuilder.php
trunk/lib/model/map/DigitalObjectMapBuilder.php
trunk/lib/model/map/EventMapBuilder.php
trunk/lib/model/map/InformationObjectMapBuilder.php
trunk/lib/model/map/ObjectMapBuilder.php
trunk/lib/model/map/ObjectTermRelationMapBuilder.php
trunk/lib/model/map/PhysicalObjectMapBuilder.php
trunk/lib/model/map/PlaceMapRelationMapBuilder.php
trunk/lib/model/map/RelationMapBuilder.php
trunk/lib/model/map/RightsActorRelationMapBuilder.php
trunk/lib/model/map/StaticPageMapBuilder.php
trunk/lib/model/map/TermMapBuilder.php
trunk/lib/model/om/BaseActor.php
trunk/lib/model/om/BaseDigitalObject.php
trunk/lib/model/om/BaseEvent.php
trunk/lib/model/om/BaseInformationObject.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseObjectTermRelation.php
trunk/lib/model/om/BasePhysicalObject.php
trunk/lib/model/om/BasePlaceMapRelation.php
trunk/lib/model/om/BaseRelation.php
trunk/lib/model/om/BaseRightsActorRelation.php
trunk/lib/model/om/BaseStaticPage.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseUser.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/config/schema.yml Thu Sep 17 14:16:40 2009 (r3379)
@@ -9,8 +9,6 @@
parent_id: { type: integer, foreignTable: actor, foreignReference: id }
lft: integer
rgt: integer
- created_at:
- updated_at:
actor_i18n:
authorized_form_of_name: { type: varchar(255), required: true }
@@ -74,8 +72,6 @@
parent_id: { type: integer, foreignTable: digital_object,
foreignReference: id }
lft: { type: integer, required: true, nestedSetLeftKey: true }
rgt: { type: integer, required: true, nestedSetRightKey: true }
- created_at:
- updated_at:
event:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
@@ -86,8 +82,6 @@
type_id: { type: integer, required: true, foreignTable: term,
foreignReference: id, onDelete: cascade }
information_object_id: { type: integer, foreignTable: information_object,
foreignReference: id, onDelete: cascade }
actor_id:
- created_at:
- updated_at:
event_i18n:
name: varchar(255)
@@ -134,8 +128,6 @@
description_identifier: varchar(255)
lft: { type: integer, required: true, nestedSetLeftKey: true }
rgt: { type: integer, required: true, nestedSetRightKey: true }
- created_at:
- updated_at:
information_object_i18n:
title: varchar(255)
@@ -197,6 +189,8 @@
object:
class_name: varchar(255)
+ created_at:
+ updated_at:
object_term_relation:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
@@ -204,8 +198,6 @@
term_id: { type: integer, required: true, foreignTable: term,
foreignReference: id, onDelete: cascade }
start_date: bu_date
end_date: bu_date
- created_at:
- updated_at:
permission:
module: varchar(255)
@@ -224,8 +216,6 @@
parent_id: { type: integer, foreignTable: physical_object,
foreignReference: id }
lft: { type: integer, required: true, nestedSetLeftKey: true }
rgt: { type: integer, required: true, nestedSetRightKey: true }
- created_at:
- updated_at:
physical_object_i18n:
name: varchar(255)
@@ -253,8 +243,6 @@
map_icon_image_id: { type: integer, foreignTable: digital_object,
foreignReference: id }
map_icon_description: longvarchar
type_id: { type: integer, foreignTable: term, foreignReference: id }
- created_at:
- updated_at:
property:
object_id: { type: integer, required: true, foreignTable: object,
foreignReference: id, onDelete: cascade }
@@ -279,8 +267,6 @@
type_id: { type: integer, foreignTable: term, foreignReference: id }
start_date: bu_date
end_date: bu_date
- created_at:
- updated_at:
repository:
id: { type: integer, required: true, primaryKey: true, foreignTable:
actor, foreignReference: id, onDelete: cascade, inheritanceKey: true }
@@ -315,8 +301,6 @@
rights_id: { type: integer, required: true, foreignTable: rights,
foreignReference: id, onDelete: cascade }
actor_id: { type: integer, required: true, foreignTable: actor,
foreignReference: id, onDelete: cascade }
type_id: { type: integer, foreignTable: term, foreignReference: id }
- created_at:
- updated_at:
rights_term_relation:
rights_id: { type: integer, required: true, foreignTable: rights,
foreignReference: id, onDelete: cascade }
@@ -345,8 +329,6 @@
static_page:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
permalink: { type: varchar(255), unique: true }
- created_at:
- updated_at:
static_page_i18n:
title: varchar(255)
@@ -386,8 +368,6 @@
parent_id: { type: integer, foreignTable: term, foreignReference: id }
lft: { type: integer, required: true, nestedSetLeftKey: true }
rgt: { type: integer, required: true, nestedSetRightKey: true }
- created_at:
- updated_at:
term_i18n:
name: varchar(255)
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/data/sql/lib.model.schema.sql Thu Sep 17 14:16:40 2009 (r3379)
@@ -21,8 +21,6 @@
`parent_id` INTEGER,
`lft` INTEGER,
`rgt` INTEGER,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_actor_FK_1`
@@ -207,8 +205,6 @@
`parent_id` INTEGER,
`lft` INTEGER NOT NULL,
`rgt` INTEGER NOT NULL,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_digital_object_FK_1`
FOREIGN KEY (`id`)
@@ -256,8 +252,6 @@
`type_id` INTEGER NOT NULL,
`information_object_id` INTEGER,
`actor_id` INTEGER,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_event_FK_1`
@@ -410,8 +404,6 @@
`description_identifier` VARCHAR(255),
`lft` INTEGER NOT NULL,
`rgt` INTEGER NOT NULL,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `q_information_object_U_1` (`oai_local_identifier`),
@@ -639,6 +631,8 @@
CREATE TABLE `q_object`
(
`class_name` VARCHAR(255),
+ `created_at` DATETIME NOT NULL,
+ `updated_at` DATETIME NOT NULL,
`id` INTEGER NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`)
)Type=InnoDB;
@@ -657,8 +651,6 @@
`term_id` INTEGER NOT NULL,
`start_date` DATE,
`end_date` DATE,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_object_term_relation_FK_1`
FOREIGN KEY (`id`)
@@ -738,8 +730,6 @@
`parent_id` INTEGER,
`lft` INTEGER NOT NULL,
`rgt` INTEGER NOT NULL,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_physical_object_FK_1`
@@ -846,8 +836,6 @@
`map_icon_image_id` INTEGER,
`map_icon_description` TEXT,
`type_id` INTEGER,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_place_map_relation_FK_1`
FOREIGN KEY (`id`)
@@ -958,8 +946,6 @@
`type_id` INTEGER,
`start_date` DATE,
`end_date` DATE,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_relation_FK_1`
FOREIGN KEY (`id`)
@@ -1082,8 +1068,6 @@
`rights_id` INTEGER NOT NULL,
`actor_id` INTEGER NOT NULL,
`type_id` INTEGER,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_rights_actor_relation_FK_1`
FOREIGN KEY (`id`)
@@ -1225,8 +1209,6 @@
(
`id` INTEGER NOT NULL,
`permalink` VARCHAR(255),
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_static_page_FK_1`
@@ -1370,8 +1352,6 @@
`parent_id` INTEGER,
`lft` INTEGER NOT NULL,
`rgt` INTEGER NOT NULL,
- `created_at` DATETIME NOT NULL,
- `updated_at` DATETIME NOT NULL,
`source_culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`),
CONSTRAINT `q_term_FK_1`
Modified: trunk/lib/model/map/ActorMapBuilder.php
==============================================================================
--- trunk/lib/model/map/ActorMapBuilder.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/map/ActorMapBuilder.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -51,10 +51,6 @@
$tMap->addColumn('RGT', 'rgt', 'INTEGER', false, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
$tMap->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7);
}
Modified: trunk/lib/model/map/DigitalObjectMapBuilder.php
==============================================================================
--- trunk/lib/model/map/DigitalObjectMapBuilder.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/map/DigitalObjectMapBuilder.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -61,9 +61,5 @@
$tMap->addColumn('RGT', 'rgt', 'INTEGER', true, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
}
}
\ No newline at end of file
Modified: trunk/lib/model/map/EventMapBuilder.php
==============================================================================
--- trunk/lib/model/map/EventMapBuilder.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/map/EventMapBuilder.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -49,10 +49,6 @@
$tMap->addForeignKey('ACTOR_ID', 'actorId', 'INTEGER',
'q_actor', 'ID', false, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
$tMap->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7);
}
Modified: trunk/lib/model/map/InformationObjectMapBuilder.php
==============================================================================
--- trunk/lib/model/map/InformationObjectMapBuilder.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/map/InformationObjectMapBuilder.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -57,10 +57,6 @@
$tMap->addColumn('RGT', 'rgt', 'INTEGER', true, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
$tMap->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7);
}
Modified: trunk/lib/model/map/ObjectMapBuilder.php
==============================================================================
--- trunk/lib/model/map/ObjectMapBuilder.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/map/ObjectMapBuilder.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -35,6 +35,10 @@
$tMap->addColumn('CLASS_NAME', 'className', 'VARCHAR', false,
255);
+ $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
+
+ $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
+
$tMap->addPrimaryKey('ID', 'id', 'INTEGER', true, null);
}
Modified: trunk/lib/model/map/ObjectTermRelationMapBuilder.php
==============================================================================
--- trunk/lib/model/map/ObjectTermRelationMapBuilder.php Thu Sep 17
14:09:52 2009 (r3378)
+++ trunk/lib/model/map/ObjectTermRelationMapBuilder.php Thu Sep 17
14:16:40 2009 (r3379)
@@ -43,9 +43,5 @@
$tMap->addColumn('END_DATE', 'endDate', 'DATE', false, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
}
}
\ No newline at end of file
Modified: trunk/lib/model/map/PhysicalObjectMapBuilder.php
==============================================================================
--- trunk/lib/model/map/PhysicalObjectMapBuilder.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/map/PhysicalObjectMapBuilder.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -43,10 +43,6 @@
$tMap->addColumn('RGT', 'rgt', 'INTEGER', true, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
$tMap->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7);
}
Modified: trunk/lib/model/map/PlaceMapRelationMapBuilder.php
==============================================================================
--- trunk/lib/model/map/PlaceMapRelationMapBuilder.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/map/PlaceMapRelationMapBuilder.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -45,9 +45,5 @@
$tMap->addForeignKey('TYPE_ID', 'typeId', 'INTEGER', 'q_term',
'ID', false, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
}
}
\ No newline at end of file
Modified: trunk/lib/model/map/RelationMapBuilder.php
==============================================================================
--- trunk/lib/model/map/RelationMapBuilder.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/map/RelationMapBuilder.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -45,9 +45,5 @@
$tMap->addColumn('END_DATE', 'endDate', 'DATE', false, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
}
}
\ No newline at end of file
Modified: trunk/lib/model/map/RightsActorRelationMapBuilder.php
==============================================================================
--- trunk/lib/model/map/RightsActorRelationMapBuilder.php Thu Sep 17
14:09:52 2009 (r3378)
+++ trunk/lib/model/map/RightsActorRelationMapBuilder.php Thu Sep 17
14:16:40 2009 (r3379)
@@ -41,9 +41,5 @@
$tMap->addForeignKey('TYPE_ID', 'typeId', 'INTEGER', 'q_term',
'ID', false, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
}
}
\ No newline at end of file
Modified: trunk/lib/model/map/StaticPageMapBuilder.php
==============================================================================
--- trunk/lib/model/map/StaticPageMapBuilder.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/map/StaticPageMapBuilder.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -37,10 +37,6 @@
$tMap->addColumn('PERMALINK', 'permalink', 'VARCHAR', false,
255);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
$tMap->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7);
}
Modified: trunk/lib/model/map/TermMapBuilder.php
==============================================================================
--- trunk/lib/model/map/TermMapBuilder.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/map/TermMapBuilder.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -45,10 +45,6 @@
$tMap->addColumn('RGT', 'rgt', 'INTEGER', true, null);
- $tMap->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null);
-
- $tMap->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null);
-
$tMap->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7);
}
Modified: trunk/lib/model/om/BaseActor.php
==============================================================================
--- trunk/lib/model/om/BaseActor.php Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/lib/model/om/BaseActor.php Thu Sep 17 14:16:40 2009 (r3379)
@@ -16,8 +16,6 @@
PARENT_ID = 'q_actor.PARENT_ID',
LFT = 'q_actor.LFT',
RGT = 'q_actor.RGT',
- CREATED_AT = 'q_actor.CREATED_AT',
- UPDATED_AT = 'q_actor.UPDATED_AT',
SOURCE_CULTURE = 'q_actor.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -35,8 +33,6 @@
$criteria->addSelectColumn(QubitActor::PARENT_ID);
$criteria->addSelectColumn(QubitActor::LFT);
$criteria->addSelectColumn(QubitActor::RGT);
- $criteria->addSelectColumn(QubitActor::CREATED_AT);
- $criteria->addSelectColumn(QubitActor::UPDATED_AT);
$criteria->addSelectColumn(QubitActor::SOURCE_CULTURE);
return $criteria;
Modified: trunk/lib/model/om/BaseDigitalObject.php
==============================================================================
--- trunk/lib/model/om/BaseDigitalObject.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/om/BaseDigitalObject.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -20,9 +20,7 @@
CHECKSUM_TYPE_ID = 'q_digital_object.CHECKSUM_TYPE_ID',
PARENT_ID = 'q_digital_object.PARENT_ID',
LFT = 'q_digital_object.LFT',
- RGT = 'q_digital_object.RGT',
- CREATED_AT = 'q_digital_object.CREATED_AT',
- UPDATED_AT = 'q_digital_object.UPDATED_AT';
+ RGT = 'q_digital_object.RGT';
public static function addSelectColumns(Criteria $criteria)
{
@@ -44,8 +42,6 @@
$criteria->addSelectColumn(QubitDigitalObject::PARENT_ID);
$criteria->addSelectColumn(QubitDigitalObject::LFT);
$criteria->addSelectColumn(QubitDigitalObject::RGT);
- $criteria->addSelectColumn(QubitDigitalObject::CREATED_AT);
- $criteria->addSelectColumn(QubitDigitalObject::UPDATED_AT);
return $criteria;
}
Modified: trunk/lib/model/om/BaseEvent.php
==============================================================================
--- trunk/lib/model/om/BaseEvent.php Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/lib/model/om/BaseEvent.php Thu Sep 17 14:16:40 2009 (r3379)
@@ -15,8 +15,6 @@
TYPE_ID = 'q_event.TYPE_ID',
INFORMATION_OBJECT_ID = 'q_event.INFORMATION_OBJECT_ID',
ACTOR_ID = 'q_event.ACTOR_ID',
- CREATED_AT = 'q_event.CREATED_AT',
- UPDATED_AT = 'q_event.UPDATED_AT',
SOURCE_CULTURE = 'q_event.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -33,8 +31,6 @@
$criteria->addSelectColumn(QubitEvent::TYPE_ID);
$criteria->addSelectColumn(QubitEvent::INFORMATION_OBJECT_ID);
$criteria->addSelectColumn(QubitEvent::ACTOR_ID);
- $criteria->addSelectColumn(QubitEvent::CREATED_AT);
- $criteria->addSelectColumn(QubitEvent::UPDATED_AT);
$criteria->addSelectColumn(QubitEvent::SOURCE_CULTURE);
return $criteria;
Modified: trunk/lib/model/om/BaseInformationObject.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObject.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/om/BaseInformationObject.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -19,8 +19,6 @@
DESCRIPTION_IDENTIFIER = 'q_information_object.DESCRIPTION_IDENTIFIER',
LFT = 'q_information_object.LFT',
RGT = 'q_information_object.RGT',
- CREATED_AT = 'q_information_object.CREATED_AT',
- UPDATED_AT = 'q_information_object.UPDATED_AT',
SOURCE_CULTURE = 'q_information_object.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -41,8 +39,6 @@
$criteria->addSelectColumn(QubitInformationObject::DESCRIPTION_IDENTIFIER);
$criteria->addSelectColumn(QubitInformationObject::LFT);
$criteria->addSelectColumn(QubitInformationObject::RGT);
- $criteria->addSelectColumn(QubitInformationObject::CREATED_AT);
- $criteria->addSelectColumn(QubitInformationObject::UPDATED_AT);
$criteria->addSelectColumn(QubitInformationObject::SOURCE_CULTURE);
return $criteria;
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/lib/model/om/BaseObject.php Thu Sep 17 14:16:40 2009 (r3379)
@@ -8,11 +8,15 @@
TABLE_NAME = 'q_object',
CLASS_NAME = 'q_object.CLASS_NAME',
+ CREATED_AT = 'q_object.CREATED_AT',
+ UPDATED_AT = 'q_object.UPDATED_AT',
ID = 'q_object.ID';
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(QubitObject::CLASS_NAME);
+ $criteria->addSelectColumn(QubitObject::CREATED_AT);
+ $criteria->addSelectColumn(QubitObject::UPDATED_AT);
$criteria->addSelectColumn(QubitObject::ID);
return $criteria;
@@ -26,7 +30,7 @@
public static function getFromRow(array $row)
{
- if (!isset(self::$objects[$id = (int) $row[1]]))
+ if (!isset(self::$objects[$id = (int) $row[3]]))
{
$object = new $row[0];
$object->new = false;
@@ -150,11 +154,6 @@
}
}
- if ('aclPermissions' == $name)
- {
- return true;
- }
-
if ('notes' == $name)
{
return true;
@@ -190,6 +189,11 @@
return true;
}
+ if ('aclPermissions' == $name)
+ {
+ return true;
+ }
+
throw new sfException;
}
@@ -231,23 +235,6 @@
}
}
- if ('aclPermissions' == $name)
- {
- if (!isset($this->refFkValues['aclPermissions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['aclPermissions'];
- }
-
if ('notes' == $name)
{
if (!isset($this->refFkValues['notes']))
@@ -367,6 +354,23 @@
return $this->refFkValues['statuss'];
}
+ if ('aclPermissions' == $name)
+ {
+ if (!isset($this->refFkValues['aclPermissions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['aclPermissions'];
+ }
+
throw new sfException;
}
@@ -639,26 +643,6 @@
$this->setid($key);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::OBJECT_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::OBJECT_ID, $id);
@@ -799,6 +783,26 @@
return self::addstatussCriteriaById($criteria, $this->id);
}
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::OBJECT_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
public function __call($name, $args)
{
if ('get' == substr($name, 0, 3) || 'set' == substr($name, 0, 3))
Modified: trunk/lib/model/om/BaseObjectTermRelation.php
==============================================================================
--- trunk/lib/model/om/BaseObjectTermRelation.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/om/BaseObjectTermRelation.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -11,9 +11,7 @@
OBJECT_ID = 'q_object_term_relation.OBJECT_ID',
TERM_ID = 'q_object_term_relation.TERM_ID',
START_DATE = 'q_object_term_relation.START_DATE',
- END_DATE = 'q_object_term_relation.END_DATE',
- CREATED_AT = 'q_object_term_relation.CREATED_AT',
- UPDATED_AT = 'q_object_term_relation.UPDATED_AT';
+ END_DATE = 'q_object_term_relation.END_DATE';
public static function addSelectColumns(Criteria $criteria)
{
@@ -26,8 +24,6 @@
$criteria->addSelectColumn(QubitObjectTermRelation::TERM_ID);
$criteria->addSelectColumn(QubitObjectTermRelation::START_DATE);
$criteria->addSelectColumn(QubitObjectTermRelation::END_DATE);
- $criteria->addSelectColumn(QubitObjectTermRelation::CREATED_AT);
- $criteria->addSelectColumn(QubitObjectTermRelation::UPDATED_AT);
return $criteria;
}
Modified: trunk/lib/model/om/BasePhysicalObject.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObject.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/om/BasePhysicalObject.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -12,8 +12,6 @@
PARENT_ID = 'q_physical_object.PARENT_ID',
LFT = 'q_physical_object.LFT',
RGT = 'q_physical_object.RGT',
- CREATED_AT = 'q_physical_object.CREATED_AT',
- UPDATED_AT = 'q_physical_object.UPDATED_AT',
SOURCE_CULTURE = 'q_physical_object.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -27,8 +25,6 @@
$criteria->addSelectColumn(QubitPhysicalObject::PARENT_ID);
$criteria->addSelectColumn(QubitPhysicalObject::LFT);
$criteria->addSelectColumn(QubitPhysicalObject::RGT);
- $criteria->addSelectColumn(QubitPhysicalObject::CREATED_AT);
- $criteria->addSelectColumn(QubitPhysicalObject::UPDATED_AT);
$criteria->addSelectColumn(QubitPhysicalObject::SOURCE_CULTURE);
return $criteria;
Modified: trunk/lib/model/om/BasePlaceMapRelation.php
==============================================================================
--- trunk/lib/model/om/BasePlaceMapRelation.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/om/BasePlaceMapRelation.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -12,9 +12,7 @@
MAP_ID = 'q_place_map_relation.MAP_ID',
MAP_ICON_IMAGE_ID = 'q_place_map_relation.MAP_ICON_IMAGE_ID',
MAP_ICON_DESCRIPTION = 'q_place_map_relation.MAP_ICON_DESCRIPTION',
- TYPE_ID = 'q_place_map_relation.TYPE_ID',
- CREATED_AT = 'q_place_map_relation.CREATED_AT',
- UPDATED_AT = 'q_place_map_relation.UPDATED_AT';
+ TYPE_ID = 'q_place_map_relation.TYPE_ID';
public static function addSelectColumns(Criteria $criteria)
{
@@ -28,8 +26,6 @@
$criteria->addSelectColumn(QubitPlaceMapRelation::MAP_ICON_IMAGE_ID);
$criteria->addSelectColumn(QubitPlaceMapRelation::MAP_ICON_DESCRIPTION);
$criteria->addSelectColumn(QubitPlaceMapRelation::TYPE_ID);
- $criteria->addSelectColumn(QubitPlaceMapRelation::CREATED_AT);
- $criteria->addSelectColumn(QubitPlaceMapRelation::UPDATED_AT);
return $criteria;
}
Modified: trunk/lib/model/om/BaseRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRelation.php Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/lib/model/om/BaseRelation.php Thu Sep 17 14:16:40 2009 (r3379)
@@ -12,9 +12,7 @@
OBJECT_ID = 'q_relation.OBJECT_ID',
TYPE_ID = 'q_relation.TYPE_ID',
START_DATE = 'q_relation.START_DATE',
- END_DATE = 'q_relation.END_DATE',
- CREATED_AT = 'q_relation.CREATED_AT',
- UPDATED_AT = 'q_relation.UPDATED_AT';
+ END_DATE = 'q_relation.END_DATE';
public static function addSelectColumns(Criteria $criteria)
{
@@ -28,8 +26,6 @@
$criteria->addSelectColumn(QubitRelation::TYPE_ID);
$criteria->addSelectColumn(QubitRelation::START_DATE);
$criteria->addSelectColumn(QubitRelation::END_DATE);
- $criteria->addSelectColumn(QubitRelation::CREATED_AT);
- $criteria->addSelectColumn(QubitRelation::UPDATED_AT);
return $criteria;
}
Modified: trunk/lib/model/om/BaseRightsActorRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRightsActorRelation.php Thu Sep 17 14:09:52
2009 (r3378)
+++ trunk/lib/model/om/BaseRightsActorRelation.php Thu Sep 17 14:16:40
2009 (r3379)
@@ -10,9 +10,7 @@
ID = 'q_rights_actor_relation.ID',
RIGHTS_ID = 'q_rights_actor_relation.RIGHTS_ID',
ACTOR_ID = 'q_rights_actor_relation.ACTOR_ID',
- TYPE_ID = 'q_rights_actor_relation.TYPE_ID',
- CREATED_AT = 'q_rights_actor_relation.CREATED_AT',
- UPDATED_AT = 'q_rights_actor_relation.UPDATED_AT';
+ TYPE_ID = 'q_rights_actor_relation.TYPE_ID';
public static function addSelectColumns(Criteria $criteria)
{
@@ -24,8 +22,6 @@
$criteria->addSelectColumn(QubitRightsActorRelation::RIGHTS_ID);
$criteria->addSelectColumn(QubitRightsActorRelation::ACTOR_ID);
$criteria->addSelectColumn(QubitRightsActorRelation::TYPE_ID);
- $criteria->addSelectColumn(QubitRightsActorRelation::CREATED_AT);
- $criteria->addSelectColumn(QubitRightsActorRelation::UPDATED_AT);
return $criteria;
}
Modified: trunk/lib/model/om/BaseStaticPage.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPage.php Thu Sep 17 14:09:52 2009
(r3378)
+++ trunk/lib/model/om/BaseStaticPage.php Thu Sep 17 14:16:40 2009
(r3379)
@@ -9,8 +9,6 @@
ID = 'q_static_page.ID',
PERMALINK = 'q_static_page.PERMALINK',
- CREATED_AT = 'q_static_page.CREATED_AT',
- UPDATED_AT = 'q_static_page.UPDATED_AT',
SOURCE_CULTURE = 'q_static_page.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -21,8 +19,6 @@
$criteria->addSelectColumn(QubitStaticPage::ID);
$criteria->addSelectColumn(QubitStaticPage::PERMALINK);
- $criteria->addSelectColumn(QubitStaticPage::CREATED_AT);
- $criteria->addSelectColumn(QubitStaticPage::UPDATED_AT);
$criteria->addSelectColumn(QubitStaticPage::SOURCE_CULTURE);
return $criteria;
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/lib/model/om/BaseTerm.php Thu Sep 17 14:16:40 2009 (r3379)
@@ -13,8 +13,6 @@
PARENT_ID = 'q_term.PARENT_ID',
LFT = 'q_term.LFT',
RGT = 'q_term.RGT',
- CREATED_AT = 'q_term.CREATED_AT',
- UPDATED_AT = 'q_term.UPDATED_AT',
SOURCE_CULTURE = 'q_term.SOURCE_CULTURE';
public static function addSelectColumns(Criteria $criteria)
@@ -29,8 +27,6 @@
$criteria->addSelectColumn(QubitTerm::PARENT_ID);
$criteria->addSelectColumn(QubitTerm::LFT);
$criteria->addSelectColumn(QubitTerm::RGT);
- $criteria->addSelectColumn(QubitTerm::CREATED_AT);
- $criteria->addSelectColumn(QubitTerm::UPDATED_AT);
$criteria->addSelectColumn(QubitTerm::SOURCE_CULTURE);
return $criteria;
Modified: trunk/lib/model/om/BaseUser.php
==============================================================================
--- trunk/lib/model/om/BaseUser.php Thu Sep 17 14:09:52 2009 (r3378)
+++ trunk/lib/model/om/BaseUser.php Thu Sep 17 14:16:40 2009 (r3379)
@@ -82,32 +82,32 @@
{
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
return true;
}
- if ('aclUserGroups' == $name)
+ if ('permissionScopes' == $name)
{
return true;
}
- if ('notes' == $name)
+ if ('systemEvents' == $name)
{
return true;
}
- if ('permissionScopes' == $name)
+ if ('userRoleRelations' == $name)
{
return true;
}
- if ('systemEvents' == $name)
+ if ('aclPermissions' == $name)
{
return true;
}
- if ('userRoleRelations' == $name)
+ if ('aclUserGroups' == $name)
{
return true;
}
@@ -133,151 +133,111 @@
{
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
- if (!isset($this->refFkValues['aclPermissions']))
+ if (!isset($this->refFkValues['notes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ $this->refFkValues['notes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclPermissions'];
+ return $this->refFkValues['notes'];
}
- if ('aclUserGroups' == $name)
+ if ('permissionScopes' == $name)
{
- if (!isset($this->refFkValues['aclUserGroups']))
+ if (!isset($this->refFkValues['permissionScopes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclUserGroups'] = QubitQuery::create();
+ $this->refFkValues['permissionScopes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['permissionScopes'] =
self::getpermissionScopesById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclUserGroups'];
+ return $this->refFkValues['permissionScopes'];
}
- if ('notes' == $name)
+ if ('systemEvents' == $name)
{
- if (!isset($this->refFkValues['notes']))
+ if (!isset($this->refFkValues['systemEvents']))
{
if (!isset($this->id))
{
- $this->refFkValues['notes'] = QubitQuery::create();
+ $this->refFkValues['systemEvents'] = QubitQuery::create();
}
else
{
- $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
+ $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['notes'];
+ return $this->refFkValues['systemEvents'];
}
- if ('permissionScopes' == $name)
+ if ('userRoleRelations' == $name)
{
- if (!isset($this->refFkValues['permissionScopes']))
+ if (!isset($this->refFkValues['userRoleRelations']))
{
if (!isset($this->id))
{
- $this->refFkValues['permissionScopes'] = QubitQuery::create();
+ $this->refFkValues['userRoleRelations'] = QubitQuery::create();
}
else
{
- $this->refFkValues['permissionScopes'] =
self::getpermissionScopesById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['userRoleRelations'] =
self::getuserRoleRelationsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['permissionScopes'];
+ return $this->refFkValues['userRoleRelations'];
}
- if ('systemEvents' == $name)
+ if ('aclPermissions' == $name)
{
- if (!isset($this->refFkValues['systemEvents']))
+ if (!isset($this->refFkValues['aclPermissions']))
{
if (!isset($this->id))
{
- $this->refFkValues['systemEvents'] = QubitQuery::create();
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
}
else
{
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['systemEvents'];
+ return $this->refFkValues['aclPermissions'];
}
- if ('userRoleRelations' == $name)
+ if ('aclUserGroups' == $name)
{
- if (!isset($this->refFkValues['userRoleRelations']))
+ if (!isset($this->refFkValues['aclUserGroups']))
{
if (!isset($this->id))
{
- $this->refFkValues['userRoleRelations'] = QubitQuery::create();
+ $this->refFkValues['aclUserGroups'] = QubitQuery::create();
}
else
{
- $this->refFkValues['userRoleRelations'] =
self::getuserRoleRelationsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['userRoleRelations'];
+ return $this->refFkValues['aclUserGroups'];
}
throw new sfException;
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::USER_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
- public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclUserGroup::USER_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclUserGroupsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclUserGroupsCriteriaById($criteria, $id);
-
- return QubitAclUserGroup::get($criteria, $options);
- }
-
- public function addaclUserGroupsCriteria(Criteria $criteria)
- {
- return self::addaclUserGroupsCriteriaById($criteria, $this->id);
- }
-
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::USER_ID, $id);
@@ -357,4 +317,44 @@
{
return self::adduserRoleRelationsCriteriaById($criteria, $this->id);
}
+
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::USER_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
+ public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclUserGroup::USER_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclUserGroupsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclUserGroupsCriteriaById($criteria, $id);
+
+ return QubitAclUserGroup::get($criteria, $options);
+ }
+
+ public function addaclUserGroupsCriteria(Criteria $criteria)
+ {
+ return self::addaclUserGroupsCriteriaById($criteria, $this->id);
+ }
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
