Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323710
Change subject: Follow-up to e62eca0e9ee1 - fix for other "deferred" query
params
......................................................................
Follow-up to e62eca0e9ee1 - fix for other "deferred" query params
Change-Id: Iab809d7cd362cb4d75031176fb41890d430c2d8c
---
M CargoSQLQuery.php
M formats/CargoDeferredFormat.php
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/10/323710/2
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 0f2e0dc..cf9c45e 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -23,6 +23,7 @@
public $mTableSchemas;
public $mFieldDescriptions;
public $mFieldTables;
+ public $mOrigGroupByStr;
public $mGroupByStr;
public $mHavingStr;
public $mOrderByStr;
@@ -53,13 +54,14 @@
// clause can (and often does) include a call to {{PAGENAME}},
// which HTML-encodes certain characters, notably single quotes.
$sqlQuery->mOrigWhereStr = htmlspecialchars_decode( $whereStr,
ENT_QUOTES );
- $sqlQuery->mWhereStr = htmlspecialchars_decode( $whereStr,
ENT_QUOTES );
+ $sqlQuery->mWhereStr = $sqlQuery->mOrigWhereStr;
$sqlQuery->mJoinOnStr = $joinOnStr;
$sqlQuery->setCargoJoinConds( $joinOnStr );
$sqlQuery->setAliasedFieldNames();
$sqlQuery->mTableSchemas = CargoUtils::getTableSchemas(
$sqlQuery->mTableNames );
$sqlQuery->setOrderBy( $orderByStr );
- $sqlQuery->mGroupByStr = $groupByStr;
+ $sqlQuery->mOrigGroupByStr = $groupByStr;
+ $sqlQuery->mGroupByStr = $sqlQuery->mOrigGroupByStr;
$sqlQuery->mHavingStr = $havingStr;
$sqlQuery->setDescriptionsForFields();
$sqlQuery->handleVirtualFields();
diff --git a/formats/CargoDeferredFormat.php b/formats/CargoDeferredFormat.php
index a21c4bf..0208f8c 100644
--- a/formats/CargoDeferredFormat.php
+++ b/formats/CargoDeferredFormat.php
@@ -38,10 +38,10 @@
$queryParams['fields'] = $sqlQuery->mFieldsStr;
}
if ( $sqlQuery->mWhereStr != '' ) {
- $queryParams['where'] = $sqlQuery->mWhereStr;
+ $queryParams['where'] =
$sqlQuery->mOrigWhereStr;
}
if ( $sqlQuery->mGroupByStr != '' ) {
- $queryParams['group by'] =
$sqlQuery->mGroupByStr;
+ $queryParams['group by'] =
$sqlQuery->mOrigGroupByStr;
}
if ( $sqlQuery->mHavingStr != '' ) {
$queryParams['having'] = $sqlQuery->mHavingStr;
@@ -57,8 +57,8 @@
$queryParams['tables'][] =
$sqlQuery->mTablesStr;
$queryParams['join on'][] =
$sqlQuery->mJoinOnStr;
$queryParams['fields'][] =
$sqlQuery->mFieldsStr;
- $queryParams['where'][] = $sqlQuery->mWhereStr;
- $queryParams['group by'][] =
$sqlQuery->mGroupByStr;
+ $queryParams['where'][] =
$sqlQuery->mOrigWhereStr;
+ $queryParams['group by'][] =
$sqlQuery->mOrigGroupByStr;
$queryParams['order by'][] =
$sqlQuery->mOrderByStr;
$queryParams['limit'][] =
$sqlQuery->mQueryLimit;
}
--
To view, visit https://gerrit.wikimedia.org/r/323710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab809d7cd362cb4d75031176fb41890d430c2d8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
