Author: david
Date: Tue Nov 17 13:06:29 2009
New Revision: 3905
Log:
More updates to function (ISDF) schema.
Modified:
trunk/config/schema.yml
trunk/data/sql/lib.model.schema.sql
trunk/lib/model/map/FunctionI18nMapBuilder.php
trunk/lib/model/map/FunctionMapBuilder.php
trunk/lib/model/om/BaseFunction.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseTerm.php
Modified: trunk/config/schema.yml
==============================================================================
--- trunk/config/schema.yml Tue Nov 17 09:35:57 2009 (r3904)
+++ trunk/config/schema.yml Tue Nov 17 13:06:29 2009 (r3905)
@@ -90,23 +90,24 @@
function:
id: { type: integer, required: true, primaryKey: true, foreignTable:
object, foreignReference: id, onDelete: cascade, inheritanceKey: true }
- type_id: { type: integer, foreignTable: term, foreignReference: id,
onDelete: setnull }
- description_detail_id: { type: integer, foreignTable: term,
foreignReference: id, onDelete: setnull }
+ type_id: { type: integer, foreignTable: term, foreignReference: id }
parent_id: { type: integer, foreignTable: function, foreignReference: id }
description_status_id: { type: integer, foreignTable: term,
foreignReference: id }
- description_level_id: { type: integer, foreignTable: term,
foreignReference: id }
+ description_detail_id: { type: integer, foreignTable: term,
foreignReference: id }
lft: integer
rgt: integer
function_i18n:
- authorized_form_of_name: { type: varchar(255), required: true }
+ authorized_form_of_name: { type: varchar(255) }
classification: varchar(255)
dates: varchar(255)
description: longvarchar
history: longvarchar
legislation: longvarchar
description_identifier: varchar(255)
+ institution_identifier: longvarchar
revision_history: longvarchar
+ rules: longvarchar
sources: longvarchar
historical_event:
Modified: trunk/data/sql/lib.model.schema.sql
==============================================================================
--- trunk/data/sql/lib.model.schema.sql Tue Nov 17 09:35:57 2009 (r3904)
+++ trunk/data/sql/lib.model.schema.sql Tue Nov 17 13:06:29 2009 (r3905)
@@ -312,10 +312,9 @@
(
`id` INTEGER NOT NULL,
`type_id` INTEGER,
- `description_detail_id` INTEGER,
`parent_id` INTEGER,
`description_status_id` INTEGER,
- `description_level_id` INTEGER,
+ `description_detail_id` INTEGER,
`lft` INTEGER,
`rgt` INTEGER,
`source_culture` VARCHAR(7) NOT NULL,
@@ -327,24 +326,18 @@
INDEX `q_function_FI_2` (`type_id`),
CONSTRAINT `q_function_FK_2`
FOREIGN KEY (`type_id`)
- REFERENCES `q_term` (`id`)
- ON DELETE SET NULL,
- INDEX `q_function_FI_3` (`description_detail_id`),
+ REFERENCES `q_term` (`id`),
+ INDEX `q_function_FI_3` (`parent_id`),
CONSTRAINT `q_function_FK_3`
- FOREIGN KEY (`description_detail_id`)
- REFERENCES `q_term` (`id`)
- ON DELETE SET NULL,
- INDEX `q_function_FI_4` (`parent_id`),
- CONSTRAINT `q_function_FK_4`
FOREIGN KEY (`parent_id`)
REFERENCES `q_function` (`id`),
- INDEX `q_function_FI_5` (`description_status_id`),
- CONSTRAINT `q_function_FK_5`
+ INDEX `q_function_FI_4` (`description_status_id`),
+ CONSTRAINT `q_function_FK_4`
FOREIGN KEY (`description_status_id`)
REFERENCES `q_term` (`id`),
- INDEX `q_function_FI_6` (`description_level_id`),
- CONSTRAINT `q_function_FK_6`
- FOREIGN KEY (`description_level_id`)
+ INDEX `q_function_FI_5` (`description_detail_id`),
+ CONSTRAINT `q_function_FK_5`
+ FOREIGN KEY (`description_detail_id`)
REFERENCES `q_term` (`id`)
)Type=InnoDB;
@@ -357,14 +350,16 @@
CREATE TABLE `q_function_i18n`
(
- `authorized_form_of_name` VARCHAR(255) NOT NULL,
+ `authorized_form_of_name` VARCHAR(255),
`classification` VARCHAR(255),
`dates` VARCHAR(255),
`description` TEXT,
`history` TEXT,
`legislation` TEXT,
`description_identifier` VARCHAR(255),
+ `institution_identifier` TEXT,
`revision_history` TEXT,
+ `rules` TEXT,
`sources` TEXT,
`id` INTEGER NOT NULL,
`culture` VARCHAR(7) NOT NULL,
Modified: trunk/lib/model/map/FunctionI18nMapBuilder.php
==============================================================================
--- trunk/lib/model/map/FunctionI18nMapBuilder.php Tue Nov 17 09:35:57
2009 (r3904)
+++ trunk/lib/model/map/FunctionI18nMapBuilder.php Tue Nov 17 13:06:29
2009 (r3905)
@@ -33,7 +33,7 @@
$tMap->setUseIdGenerator(false);
- $tMap->addColumn('AUTHORIZED_FORM_OF_NAME',
'authorizedFormOfName', 'VARCHAR', true, 255);
+ $tMap->addColumn('AUTHORIZED_FORM_OF_NAME',
'authorizedFormOfName', 'VARCHAR', false, 255);
$tMap->addColumn('CLASSIFICATION', 'classification', 'VARCHAR',
false, 255);
@@ -47,8 +47,12 @@
$tMap->addColumn('DESCRIPTION_IDENTIFIER',
'descriptionIdentifier', 'VARCHAR', false, 255);
+ $tMap->addColumn('INSTITUTION_IDENTIFIER',
'institutionIdentifier', 'LONGVARCHAR', false, null);
+
$tMap->addColumn('REVISION_HISTORY', 'revisionHistory',
'LONGVARCHAR', false, null);
+ $tMap->addColumn('RULES', 'rules', 'LONGVARCHAR', false, null);
+
$tMap->addColumn('SOURCES', 'sources', 'LONGVARCHAR', false,
null);
$tMap->addForeignPrimaryKey('ID', 'id', 'INTEGER' ,
'q_function', 'ID', true, null);
Modified: trunk/lib/model/map/FunctionMapBuilder.php
==============================================================================
--- trunk/lib/model/map/FunctionMapBuilder.php Tue Nov 17 09:35:57 2009
(r3904)
+++ trunk/lib/model/map/FunctionMapBuilder.php Tue Nov 17 13:06:29 2009
(r3905)
@@ -37,13 +37,11 @@
$tMap->addForeignKey('TYPE_ID', 'typeId', 'INTEGER', 'q_term',
'ID', false, null);
- $tMap->addForeignKey('DESCRIPTION_DETAIL_ID',
'descriptionDetailId', 'INTEGER', 'q_term', 'ID', false, null);
-
$tMap->addForeignKey('PARENT_ID', 'parentId', 'INTEGER',
'q_function', 'ID', false, null);
$tMap->addForeignKey('DESCRIPTION_STATUS_ID',
'descriptionStatusId', 'INTEGER', 'q_term', 'ID', false, null);
- $tMap->addForeignKey('DESCRIPTION_LEVEL_ID',
'descriptionLevelId', 'INTEGER', 'q_term', 'ID', false, null);
+ $tMap->addForeignKey('DESCRIPTION_DETAIL_ID',
'descriptionDetailId', 'INTEGER', 'q_term', 'ID', false, null);
$tMap->addColumn('LFT', 'lft', 'INTEGER', false, null);
Modified: trunk/lib/model/om/BaseFunction.php
==============================================================================
--- trunk/lib/model/om/BaseFunction.php Tue Nov 17 09:35:57 2009 (r3904)
+++ trunk/lib/model/om/BaseFunction.php Tue Nov 17 13:06:29 2009 (r3905)
@@ -9,10 +9,9 @@
ID = 'q_function.ID',
TYPE_ID = 'q_function.TYPE_ID',
- DESCRIPTION_DETAIL_ID = 'q_function.DESCRIPTION_DETAIL_ID',
PARENT_ID = 'q_function.PARENT_ID',
DESCRIPTION_STATUS_ID = 'q_function.DESCRIPTION_STATUS_ID',
- DESCRIPTION_LEVEL_ID = 'q_function.DESCRIPTION_LEVEL_ID',
+ DESCRIPTION_DETAIL_ID = 'q_function.DESCRIPTION_DETAIL_ID',
LFT = 'q_function.LFT',
RGT = 'q_function.RGT',
SOURCE_CULTURE = 'q_function.SOURCE_CULTURE';
@@ -25,10 +24,9 @@
$criteria->addSelectColumn(QubitFunction::ID);
$criteria->addSelectColumn(QubitFunction::TYPE_ID);
- $criteria->addSelectColumn(QubitFunction::DESCRIPTION_DETAIL_ID);
$criteria->addSelectColumn(QubitFunction::PARENT_ID);
$criteria->addSelectColumn(QubitFunction::DESCRIPTION_STATUS_ID);
- $criteria->addSelectColumn(QubitFunction::DESCRIPTION_LEVEL_ID);
+ $criteria->addSelectColumn(QubitFunction::DESCRIPTION_DETAIL_ID);
$criteria->addSelectColumn(QubitFunction::LFT);
$criteria->addSelectColumn(QubitFunction::RGT);
$criteria->addSelectColumn(QubitFunction::SOURCE_CULTURE);
@@ -255,13 +253,6 @@
return $criteria;
}
- public static function addJoindescriptionDetailCriteria(Criteria $criteria)
- {
- $criteria->addJoin(QubitFunction::DESCRIPTION_DETAIL_ID, QubitTerm::ID);
-
- return $criteria;
- }
-
public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitFunction::PARENT_ID, QubitFunction::ID);
@@ -276,9 +267,9 @@
return $criteria;
}
- public static function addJoindescriptionLevelCriteria(Criteria $criteria)
+ public static function addJoindescriptionDetailCriteria(Criteria $criteria)
{
- $criteria->addJoin(QubitFunction::DESCRIPTION_LEVEL_ID, QubitTerm::ID);
+ $criteria->addJoin(QubitFunction::DESCRIPTION_DETAIL_ID, QubitTerm::ID);
return $criteria;
}
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Tue Nov 17 09:35:57 2009
(r3904)
+++ trunk/lib/model/om/BaseFunctionI18n.php Tue Nov 17 13:06:29 2009
(r3905)
@@ -14,7 +14,9 @@
HISTORY = 'q_function_i18n.HISTORY',
LEGISLATION = 'q_function_i18n.LEGISLATION',
DESCRIPTION_IDENTIFIER = 'q_function_i18n.DESCRIPTION_IDENTIFIER',
+ INSTITUTION_IDENTIFIER = 'q_function_i18n.INSTITUTION_IDENTIFIER',
REVISION_HISTORY = 'q_function_i18n.REVISION_HISTORY',
+ RULES = 'q_function_i18n.RULES',
SOURCES = 'q_function_i18n.SOURCES',
ID = 'q_function_i18n.ID',
CULTURE = 'q_function_i18n.CULTURE',
@@ -29,7 +31,9 @@
$criteria->addSelectColumn(QubitFunctionI18n::HISTORY);
$criteria->addSelectColumn(QubitFunctionI18n::LEGISLATION);
$criteria->addSelectColumn(QubitFunctionI18n::DESCRIPTION_IDENTIFIER);
+ $criteria->addSelectColumn(QubitFunctionI18n::INSTITUTION_IDENTIFIER);
$criteria->addSelectColumn(QubitFunctionI18n::REVISION_HISTORY);
+ $criteria->addSelectColumn(QubitFunctionI18n::RULES);
$criteria->addSelectColumn(QubitFunctionI18n::SOURCES);
$criteria->addSelectColumn(QubitFunctionI18n::ID);
$criteria->addSelectColumn(QubitFunctionI18n::CULTURE);
@@ -48,8 +52,8 @@
public static function getFromRow(array $row)
{
$keys = array();
- $keys['id'] = $row[9];
- $keys['culture'] = $row[10];
+ $keys['id'] = $row[11];
+ $keys['culture'] = $row[12];
$key = serialize($keys);
if (!isset(self::$functionI18ns[$key]))
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Tue Nov 17 09:35:57 2009 (r3904)
+++ trunk/lib/model/om/BaseTerm.php Tue Nov 17 13:06:29 2009 (r3905)
@@ -154,17 +154,12 @@
return true;
}
- if ('functionsRelatedBydescriptionDetailId' == $name)
- {
- return true;
- }
-
if ('functionsRelatedBydescriptionStatusId' == $name)
{
return true;
}
- if ('functionsRelatedBydescriptionLevelId' == $name)
+ if ('functionsRelatedBydescriptionDetailId' == $name)
{
return true;
}
@@ -486,23 +481,6 @@
return $this->refFkValues['functionsRelatedBytypeId'];
}
- if ('functionsRelatedBydescriptionDetailId' == $name)
- {
- if (!isset($this->refFkValues['functionsRelatedBydescriptionDetailId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['functionsRelatedBydescriptionDetailId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['functionsRelatedBydescriptionDetailId'] =
self::getfunctionsRelatedBydescriptionDetailIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['functionsRelatedBydescriptionDetailId'];
- }
-
if ('functionsRelatedBydescriptionStatusId' == $name)
{
if (!isset($this->refFkValues['functionsRelatedBydescriptionStatusId']))
@@ -520,21 +498,21 @@
return $this->refFkValues['functionsRelatedBydescriptionStatusId'];
}
- if ('functionsRelatedBydescriptionLevelId' == $name)
+ if ('functionsRelatedBydescriptionDetailId' == $name)
{
- if (!isset($this->refFkValues['functionsRelatedBydescriptionLevelId']))
+ if (!isset($this->refFkValues['functionsRelatedBydescriptionDetailId']))
{
if (!isset($this->id))
{
- $this->refFkValues['functionsRelatedBydescriptionLevelId'] =
QubitQuery::create();
+ $this->refFkValues['functionsRelatedBydescriptionDetailId'] =
QubitQuery::create();
}
else
{
- $this->refFkValues['functionsRelatedBydescriptionLevelId'] =
self::getfunctionsRelatedBydescriptionLevelIdById($this->id, array('self' =>
$this) + $options);
+ $this->refFkValues['functionsRelatedBydescriptionDetailId'] =
self::getfunctionsRelatedBydescriptionDetailIdById($this->id, array('self' =>
$this) + $options);
}
}
- return $this->refFkValues['functionsRelatedBydescriptionLevelId'];
+ return $this->refFkValues['functionsRelatedBydescriptionDetailId'];
}
if ('historicalEventsRelatedBytypeId' == $name)
@@ -1307,26 +1285,6 @@
return self::addfunctionsRelatedBytypeIdCriteriaById($criteria, $this->id);
}
- public static function
addfunctionsRelatedBydescriptionDetailIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitFunction::DESCRIPTION_DETAIL_ID, $id);
-
- return $criteria;
- }
-
- public static function getfunctionsRelatedBydescriptionDetailIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addfunctionsRelatedBydescriptionDetailIdCriteriaById($criteria, $id);
-
- return QubitFunction::get($criteria, $options);
- }
-
- public function addfunctionsRelatedBydescriptionDetailIdCriteria(Criteria
$criteria)
- {
- return
self::addfunctionsRelatedBydescriptionDetailIdCriteriaById($criteria,
$this->id);
- }
-
public static function
addfunctionsRelatedBydescriptionStatusIdCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitFunction::DESCRIPTION_STATUS_ID, $id);
@@ -1347,24 +1305,24 @@
return
self::addfunctionsRelatedBydescriptionStatusIdCriteriaById($criteria,
$this->id);
}
- public static function
addfunctionsRelatedBydescriptionLevelIdCriteriaById(Criteria $criteria, $id)
+ public static function
addfunctionsRelatedBydescriptionDetailIdCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitFunction::DESCRIPTION_LEVEL_ID, $id);
+ $criteria->add(QubitFunction::DESCRIPTION_DETAIL_ID, $id);
return $criteria;
}
- public static function getfunctionsRelatedBydescriptionLevelIdById($id,
array $options = array())
+ public static function getfunctionsRelatedBydescriptionDetailIdById($id,
array $options = array())
{
$criteria = new Criteria;
- self::addfunctionsRelatedBydescriptionLevelIdCriteriaById($criteria, $id);
+ self::addfunctionsRelatedBydescriptionDetailIdCriteriaById($criteria, $id);
return QubitFunction::get($criteria, $options);
}
- public function addfunctionsRelatedBydescriptionLevelIdCriteria(Criteria
$criteria)
+ public function addfunctionsRelatedBydescriptionDetailIdCriteria(Criteria
$criteria)
{
- return
self::addfunctionsRelatedBydescriptionLevelIdCriteriaById($criteria, $this->id);
+ return
self::addfunctionsRelatedBydescriptionDetailIdCriteriaById($criteria,
$this->id);
}
public static function
addhistoricalEventsRelatedBytypeIdCriteriaById(Criteria $criteria, $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.com/group/qubit-commits?hl=.
