Revision: 46079
Author: tparscal
Date: 2009-01-23 18:19:01 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
Changed saveChange to insertChange to better reflect underlying operation.
Modified Paths:
--------------
trunk/extensions/DataCenter/Controllers/Assets.php
trunk/extensions/DataCenter/Controllers/Facilities.php
trunk/extensions/DataCenter/Controllers/Models.php
trunk/extensions/DataCenter/DataCenter.db.php
Modified: trunk/extensions/DataCenter/Controllers/Assets.php
===================================================================
--- trunk/extensions/DataCenter/Controllers/Assets.php 2009-01-23 18:03:12 UTC
(rev 46078)
+++ trunk/extensions/DataCenter/Controllers/Assets.php 2009-01-23 18:19:01 UTC
(rev 46079)
@@ -50,7 +50,7 @@
$asset = DataCenterDBAsset::newFromType( $type, $data['row'] );
$asset->save();
$asset->saveMetaValues( $data['meta'] );
- $asset->saveChange( $data['change'] );
+ $asset->insertChange( $data['change'] );
return true;
}
}
\ No newline at end of file
Modified: trunk/extensions/DataCenter/Controllers/Facilities.php
===================================================================
--- trunk/extensions/DataCenter/Controllers/Facilities.php 2009-01-23
18:03:12 UTC (rev 46078)
+++ trunk/extensions/DataCenter/Controllers/Facilities.php 2009-01-23
18:19:01 UTC (rev 46079)
@@ -58,7 +58,7 @@
if ( isset( $component ) ) {
$component->save();
$component->saveMetaValues( $data['meta'] );
- $component->saveChange( $data['change'] );
+ $component->insertChange( $data['change'] );
return true;
}
return false;
Modified: trunk/extensions/DataCenter/Controllers/Models.php
===================================================================
--- trunk/extensions/DataCenter/Controllers/Models.php 2009-01-23 18:03:12 UTC
(rev 46078)
+++ trunk/extensions/DataCenter/Controllers/Models.php 2009-01-23 18:19:01 UTC
(rev 46079)
@@ -51,7 +51,7 @@
$model = DataCenterDBModel::newFromType( $type, $data['row'] );
$model->save();
$model->saveMetaValues( $data['meta'] );
- $model->saveChange( $data['change'] );
+ $model->insertChange( $data['change'] );
return true;
}
Modified: trunk/extensions/DataCenter/DataCenter.db.php
===================================================================
--- trunk/extensions/DataCenter/DataCenter.db.php 2009-01-23 18:03:12 UTC
(rev 46078)
+++ trunk/extensions/DataCenter/DataCenter.db.php 2009-01-23 18:19:01 UTC
(rev 46079)
@@ -1020,6 +1020,7 @@
public static function getChanges(
array $options = array()
) {
+ $dbr = wfGetDB( DB_SLAVE );
return self::getRows(
'DataCenterDBChange',
'meta',
@@ -1027,19 +1028,22 @@
array_merge_recursive(
$options,
array(
- 'tables' => array( 'user' ),
+ 'tables' => array( $dbr->tablePrefix()
. 'user' ),
'fields' => array(
- 'user_name as ' .
+ 'user_name as' .
self::getColumnName(
'meta', 'change',
'username'
)
),
- 'conditions' => array(
- self::getColumnName(
- 'meta', 'change', 'user'
- ) .
- ' = user_id'
- ),
+ 'joins' => array(
+ 'user' => array(
+ 'LEFT JOIN',
+ 'user_id = ' .
+ self::getColumnName(
+ 'meta',
'change', 'user'
+ )
+ )
+ )
)
)
);
@@ -1655,14 +1659,14 @@
}
}
- public function saveChange(
+ public function insertChange(
$values
) {
if ( !is_array( $values ) ) {
return;
}
$change = DataCenterDBChange::newFromComponent( $this, $values
);
- $change->save();
+ $change->insert();
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
