Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354132 )
Change subject: Fix for rECRG1cfcf93952c2 to handle numbers in table and field
names
......................................................................
Fix for rECRG1cfcf93952c2 to handle numbers in table and field names
Change-Id: I06f072a15623238e9a4015cfdb3700e5341c1ae4
---
M CargoSQLQuery.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 59df73c..de5aac2 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -440,10 +440,10 @@
$fieldName = null;
$description = new CargoFieldDescription();
- // We use \p{L} instead of \w here in order to handle
- // accented and other non-ASCII characters in table
- // and field names.
- $fieldPattern = '/^([-_\p{L}$]+)([.]([-_\p{L}$]+))?$/u';
+ // We use "\p{L}0-9" instead of \w here in order to
+ // handle accented and other non-ASCII characters in
+ // table and field names.
+ $fieldPattern =
'/^([-_\p{L}0-9$]+)([.]([-_\p{L}0-9$]+))?$/u';
$fieldPatternFound = preg_match( $fieldPattern,
$origFieldName, $fieldPatternMatches );
$stringPatternFound = false;
$hasFunctionCall = false;
--
To view, visit https://gerrit.wikimedia.org/r/354132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06f072a15623238e9a4015cfdb3700e5341c1ae4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: 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
