[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added quoting of field names for drilldown

2017-11-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392049 )

Change subject: Added quoting of field names for drilldown
..


Added quoting of field names for drilldown

Change-Id: I1ba85ab7bdd988feb16f256b988ef604d7ae574b
---
M drilldown/CargoAppliedFilter.php
M drilldown/CargoFilter.php
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/drilldown/CargoAppliedFilter.php b/drilldown/CargoAppliedFilter.php
index 1849506..353ed55 100644
--- a/drilldown/CargoAppliedFilter.php
+++ b/drilldown/CargoAppliedFilter.php
@@ -59,7 +59,7 @@
$fieldTableName = $this->filter->tableName . '__' . 
$this->filter->name;
$value_field = CargoUtils::escapedFieldName( $cdb, 
$fieldTableName, '_value' );
} else {
-   $value_field = $this->filter->name;
+   $value_field = $cdb->addIdentifierQuotes( 
$this->filter->name );
}
$sql = "(";
if ( $this->search_terms != null ) {
@@ -193,7 +193,7 @@
}
 
$cdb = CargoUtils::getDB();
-   $res = $cdb->select( $tableName, "DISTINCT " . $value_field );
+   $res = $cdb->select( $tableName, "DISTINCT " . 
$cdb->addIdentifierQuotes( $value_field ) );
while ( $row = $cdb->fetchRow( $res ) ) {
$possible_values[] = $row[$value_field];
}
diff --git a/drilldown/CargoFilter.php b/drilldown/CargoFilter.php
index 760dc89..1612930 100644
--- a/drilldown/CargoFilter.php
+++ b/drilldown/CargoFilter.php
@@ -232,7 +232,7 @@
$fieldName = CargoUtils::escapedFieldName( $cdb, 
$fieldTableName, '_value' );
$joinConds[$fieldTableName] = 
CargoUtils::joinOfMainAndFieldTable( $cdb, $this->tableName, $fieldTableName );
} else {
-   $fieldName = $this->name;
+   $fieldName = $cdb->addIdentifierQuotes( $this->name );
}
 
if ( $this->searchableFiles ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/392049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ba85ab7bdd988feb16f256b988ef604d7ae574b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Added quoting of field names for drilldown

2017-11-17 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392049 )

Change subject: Added quoting of field names for drilldown
..

Added quoting of field names for drilldown

Change-Id: I1ba85ab7bdd988feb16f256b988ef604d7ae574b
---
M drilldown/CargoAppliedFilter.php
M drilldown/CargoFilter.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/49/392049/2

diff --git a/drilldown/CargoAppliedFilter.php b/drilldown/CargoAppliedFilter.php
index 1849506..353ed55 100644
--- a/drilldown/CargoAppliedFilter.php
+++ b/drilldown/CargoAppliedFilter.php
@@ -59,7 +59,7 @@
$fieldTableName = $this->filter->tableName . '__' . 
$this->filter->name;
$value_field = CargoUtils::escapedFieldName( $cdb, 
$fieldTableName, '_value' );
} else {
-   $value_field = $this->filter->name;
+   $value_field = $cdb->addIdentifierQuotes( 
$this->filter->name );
}
$sql = "(";
if ( $this->search_terms != null ) {
@@ -193,7 +193,7 @@
}
 
$cdb = CargoUtils::getDB();
-   $res = $cdb->select( $tableName, "DISTINCT " . $value_field );
+   $res = $cdb->select( $tableName, "DISTINCT " . 
$cdb->addIdentifierQuotes( $value_field ) );
while ( $row = $cdb->fetchRow( $res ) ) {
$possible_values[] = $row[$value_field];
}
diff --git a/drilldown/CargoFilter.php b/drilldown/CargoFilter.php
index 760dc89..1612930 100644
--- a/drilldown/CargoFilter.php
+++ b/drilldown/CargoFilter.php
@@ -232,7 +232,7 @@
$fieldName = CargoUtils::escapedFieldName( $cdb, 
$fieldTableName, '_value' );
$joinConds[$fieldTableName] = 
CargoUtils::joinOfMainAndFieldTable( $cdb, $this->tableName, $fieldTableName );
} else {
-   $fieldName = $this->name;
+   $fieldName = $cdb->addIdentifierQuotes( $this->name );
}
 
if ( $this->searchableFiles ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/392049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ba85ab7bdd988feb16f256b988ef604d7ae574b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits