s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1864 from OpenRefine/issue/1802

Browse Source 
fix issue #1802 -- escape single quote in SQL export
This commit is contained in:
Antonin Delpeuch 2018-11-27 19:34:50 +09:00 committed by GitHub
commit d5ef0dfbc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java
View File

@ -121,7 +121,7 @@ public class SqlInsertBuilder {
handleNullField(allowNullChkBox, defaultValue, nullValueNull, val.getColumnName(), rowValue, true); handleNullField(allowNullChkBox, defaultValue, nullValueNull, val.getColumnName(), rowValue, true);
}else { }else {
rowValue.append("'" + val.getText() + "'"); rowValue.append("'" + val.getText().replace("'","''") + "'");
} }

38
main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java
View File

@ -359,6 +359,32 @@ public class SqlExporterTests extends RefineTest {
Assert.assertEquals(countNull, noOfCols); Assert.assertEquals(countNull, noOfCols);
} }
@Test
public void testExportSqlWithSingleQuote(){
int noOfCols = 4;
int noOfRows = 1;
createGridWithSingleQuote(noOfRows, noOfCols);
String tableName = "sql_table_test";
JSONObject optionsJson = createOptionsFromProject(tableName, null, null, null, false);
optionsJson.put("includeStructure", true);
optionsJson.put("includeDropStatement", true);
optionsJson.put("convertNulltoEmptyString", true);
when(options.getProperty("options")).thenReturn(optionsJson.toString());
try {
SUT.export(project, options, engine, writer);
} catch (IOException e) {
Assert.fail();
}
String result = writer.toString();
logger.info("\nresult:={} ", result);
Assert.assertTrue(result.contains("INSERT INTO sql_table_test (column0,column1,column2,column3) VALUES \n" +
"( 'It''s row0cell0','It''s row0cell1','It''s row0cell2','It''s row0cell3' )"));
}
//helper methods //helper methods
@ -399,6 +425,18 @@ public class SqlExporterTests extends RefineTest {
} }
} }
protected void createGridWithSingleQuote(int noOfRows, int noOfColumns){
createColumns(noOfColumns);
for(int i = 0; i < noOfRows; i++){
Row row = new Row(noOfColumns);
for(int j = 0; j < noOfColumns; j++){
row.cells.add(new Cell("It's row" + i + "cell" + j, null));
}
project.rows.add(row);
}
}
protected void createGridWithNullFields(int noOfRows, int noOfColumns, int noOfNullFields){ protected void createGridWithNullFields(int noOfRows, int noOfColumns, int noOfNullFields){
createColumns(noOfColumns); createColumns(noOfColumns);
if(noOfNullFields > (noOfColumns * noOfRows)) { if(noOfNullFields > (noOfColumns * noOfRows)) {