Author: david
Date: Fri Jun 10 11:40:15 2011
New Revision: 9155
Log:
Add dates to other_name. Refs issue 1998.
Modified:
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/OtherNameI18nTableMap.php
trunk/lib/model/map/OtherNameTableMap.php
trunk/lib/model/om/BaseOtherName.php
trunk/lib/model/om/BaseOtherNameI18n.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Fri Jun 10 00:02:49 2011 (r9154)
+++ trunk/config/schema.yml Fri Jun 10 11:40:15 2011 (r9155)
@@ -227,10 +227,13 @@
type_id: { type: integer, foreignTable: term, foreignReference: id,
onDelete: setnull }
created_at:
updated_at:
+ start_date: bu_date
+ end_date: bu_date
other_name_i18n:
name: varchar(255)
note: varchar(255)
+ dates: longvarchar
physical_object:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Fri Jun 10 00:02:49 2011 (r9154)
+++ trunk/data/sql/lib.model.schema.sql Fri Jun 10 11:40:15 2011 (r9155)
@@ -717,6 +717,8 @@
`type_id` INTEGER,
`created_at` DATETIME NOT NULL,
`updated_at` DATETIME NOT NULL,
+ `start_date` DATE,
+ `end_date` DATE,
`source_culture` VARCHAR(7) NOT NULL,
`id` INTEGER NOT NULL AUTO_INCREMENT,
`serial_number` INTEGER default 0 NOT NULL,
@@ -744,6 +746,7 @@
(
`name` VARCHAR(255),
`note` VARCHAR(255),
+ `dates` TEXT,
`id` INTEGER NOT NULL,
`culture` VARCHAR(7) NOT NULL,
PRIMARY KEY (`id`,`culture`),
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Fri Jun 10 00:02:49 2011
(r9154)
+++ trunk/lib/model/map/ObjectTableMap.php Fri Jun 10 11:40:15 2011
(r9155)
@@ -50,6 +50,8 @@
public function buildRelations()
{
$this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_id', ), 'CASCADE', null);
+ $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('actor', 'actor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('digitalObject', 'digitalObject',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('event', 'event', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
@@ -72,8 +74,6 @@
$this->addRelation('status', 'status', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('term', 'term', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
- $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
} // ObjectTableMap
Modified: trunk/lib/model/map/OtherNameI18nTableMap.php
==============================================================================
--- trunk/lib/model/map/OtherNameI18nTableMap.php Fri Jun 10 00:02:49
2011 (r9154)
+++ trunk/lib/model/map/OtherNameI18nTableMap.php Fri Jun 10 11:40:15
2011 (r9155)
@@ -38,6 +38,7 @@
// columns
$this->addColumn('NAME', 'name', 'VARCHAR', false, 255, null);
$this->addColumn('NOTE', 'note', 'VARCHAR', false, 255, null);
+ $this->addColumn('DATES', 'dates', 'LONGVARCHAR', false, null,
null);
$this->addForeignPrimaryKey('ID', 'id', 'INTEGER' ,
'other_name', 'ID', true, null, null);
$this->addPrimaryKey('CULTURE', 'culture', 'VARCHAR', true, 7,
null);
// validators
Modified: trunk/lib/model/map/OtherNameTableMap.php
==============================================================================
--- trunk/lib/model/map/OtherNameTableMap.php Fri Jun 10 00:02:49 2011
(r9154)
+++ trunk/lib/model/map/OtherNameTableMap.php Fri Jun 10 11:40:15 2011
(r9155)
@@ -40,6 +40,8 @@
$this->addForeignKey('TYPE_ID', 'typeId', 'INTEGER', 'term',
'ID', false, null, null);
$this->addColumn('CREATED_AT', 'createdAt', 'TIMESTAMP', true,
null, null);
$this->addColumn('UPDATED_AT', 'updatedAt', 'TIMESTAMP', true,
null, null);
+ $this->addColumn('START_DATE', 'startDate', 'DATE', false,
null, null);
+ $this->addColumn('END_DATE', 'endDate', 'DATE', false, null,
null);
$this->addColumn('SOURCE_CULTURE', 'sourceCulture', 'VARCHAR',
true, 7, null);
$this->addPrimaryKey('ID', 'id', 'INTEGER', true, null, null);
$this->addColumn('SERIAL_NUMBER', 'serialNumber', 'INTEGER',
true, null, 0);
Modified: trunk/lib/model/om/BaseOtherName.php
==============================================================================
--- trunk/lib/model/om/BaseOtherName.php Fri Jun 10 00:02:49 2011
(r9154)
+++ trunk/lib/model/om/BaseOtherName.php Fri Jun 10 11:40:15 2011
(r9155)
@@ -11,6 +11,8 @@
TYPE_ID = 'other_name.TYPE_ID',
CREATED_AT = 'other_name.CREATED_AT',
UPDATED_AT = 'other_name.UPDATED_AT',
+ START_DATE = 'other_name.START_DATE',
+ END_DATE = 'other_name.END_DATE',
SOURCE_CULTURE = 'other_name.SOURCE_CULTURE',
ID = 'other_name.ID',
SERIAL_NUMBER = 'other_name.SERIAL_NUMBER';
@@ -21,6 +23,8 @@
$criteria->addSelectColumn(QubitOtherName::TYPE_ID);
$criteria->addSelectColumn(QubitOtherName::CREATED_AT);
$criteria->addSelectColumn(QubitOtherName::UPDATED_AT);
+ $criteria->addSelectColumn(QubitOtherName::START_DATE);
+ $criteria->addSelectColumn(QubitOtherName::END_DATE);
$criteria->addSelectColumn(QubitOtherName::SOURCE_CULTURE);
$criteria->addSelectColumn(QubitOtherName::ID);
$criteria->addSelectColumn(QubitOtherName::SERIAL_NUMBER);
@@ -38,7 +42,7 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[5];
+ $keys['id'] = $row[7];
$key = serialize($keys);
if (!isset(self::$otherNames[$key]))
Modified: trunk/lib/model/om/BaseOtherNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseOtherNameI18n.php Fri Jun 10 00:02:49 2011
(r9154)
+++ trunk/lib/model/om/BaseOtherNameI18n.php Fri Jun 10 11:40:15 2011
(r9155)
@@ -9,6 +9,7 @@
NAME = 'other_name_i18n.NAME',
NOTE = 'other_name_i18n.NOTE',
+ DATES = 'other_name_i18n.DATES',
ID = 'other_name_i18n.ID',
CULTURE = 'other_name_i18n.CULTURE';
@@ -16,6 +17,7 @@
{
$criteria->addSelectColumn(QubitOtherNameI18n::NAME);
$criteria->addSelectColumn(QubitOtherNameI18n::NOTE);
+ $criteria->addSelectColumn(QubitOtherNameI18n::DATES);
$criteria->addSelectColumn(QubitOtherNameI18n::ID);
$criteria->addSelectColumn(QubitOtherNameI18n::CULTURE);
@@ -32,8 +34,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[2];
- $keys['culture'] = $row[3];
+ $keys['id'] = $row[3];
+ $keys['culture'] = $row[4];
$key = serialize($keys);
if (!isset(self::$otherNameI18ns[$key]))
--
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.com/group/qubit-commits?hl=en.
