Ejegg has submitted this change and it was merged.
Change subject: support cross-database references
......................................................................
support cross-database references
Automatically generated aliases would include illegal "."
Change-Id: Ie7479b2fc888c12f7089955457bc83ba7fac5c38
---
M CRM/Report/Form.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index e044a2b..e52dc9f 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -387,6 +387,7 @@
else {
$this->_columns[$tableName]['alias'] = $table['alias'] . '_civireport';
}
+ $this->_columns[$tableName]['alias'] = str_replace('.', '_',
$this->_columns[$tableName]['alias']);
$this->_aliases[$tableName] = $this->_columns[$tableName]['alias'];
@@ -448,6 +449,7 @@
$alias = isset($field['alias']) ? $field['alias'] :
(isset($this->_columns[$tableName]['alias']) ?
$this->_columns[$tableName]['alias'] : $tableName
);
+ $alias = str_replace('.', '_', $alias);
$this->_columns[$tableName][$fieldGrp][$fieldName]['alias'] =
$alias;
// set name = fieldName, unless already set
@@ -1654,6 +1656,7 @@
if (CRM_Utils_Array::value('statistics', $field)) {
foreach ($field['statistics'] as $stat => $label) {
$alias = "{$tableName}_{$fieldName}_{$stat}";
+ $alias = str_replace('.', '_', $alias);
switch (strtolower($stat)) {
case 'max':
case 'sum':
@@ -1684,6 +1687,7 @@
}
else {
$alias = "{$tableName}_{$fieldName}";
+ $alias = str_replace('.', '_', $alias);
$select[] = "{$field['dbAlias']} as $alias";
$this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] =
CRM_Utils_Array::value('title', $field);
$this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] =
CRM_Utils_Array::value('type', $field);
--
To view, visit https://gerrit.wikimedia.org/r/171979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7479b2fc888c12f7089955457bc83ba7fac5c38
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
