Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1767: dataimporter.functions.escapeSql() does not escape backslash character 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@908357 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2010-02-10 05:38:56 +00:00
parent 90135ac5ad
commit 249be10000
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/dataimporthandler/CHANGES.txt
View File

@ -61,6 +61,8 @@ Bug Fixes
* SOLR-1766: DIH with threads enabled doesn't respond to the abort command (Michael Henson via noble) * SOLR-1766: DIH with threads enabled doesn't respond to the abort command (Michael Henson via noble)
* SOLR-1767: dataimporter.functions.escapeSql() does not escape backslash character (Sean Timm via noble)
Other Changes Other Changes
---------------------- ----------------------

5
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
View File

@ -72,7 +72,10 @@ public class EvaluatorBag {
throw new DataImportHandlerException(SEVERE, "'escapeSql' must have at least one parameter "); throw new DataImportHandlerException(SEVERE, "'escapeSql' must have at least one parameter ");
} }
String s = l.get(0).toString(); String s = l.get(0).toString();
return s.replaceAll("'", "''").replaceAll("\"", "\"\""); // escape single quote with two single quotes, double quote
// with two doule quotes, and backslash with double backslash.
// See: http://dev.mysql.com/doc/refman/4.1/en/mysql-real-escape-string.html
return s.replaceAll("'", "''").replaceAll("\"", "\"\"").replaceAll("\\\\", "\\\\\\\\");
} }
}; };
} }

1
contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
View File

@ -49,6 +49,7 @@ public class TestEvaluatorBag {
sqlTests = new HashMap<String, String>(); sqlTests = new HashMap<String, String>();
sqlTests.put("foo\"", "foo\"\""); sqlTests.put("foo\"", "foo\"\"");
sqlTests.put("foo\\", "foo\\\\");
sqlTests.put("foo'", "foo''"); sqlTests.put("foo'", "foo''");
sqlTests.put("foo''", "foo''''"); sqlTests.put("foo''", "foo''''");
sqlTests.put("'foo\"", "''foo\"\""); sqlTests.put("'foo\"", "''foo\"\"");