mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Quote only data with end-of-lines, tabs or double-quotes

Browse Source 
Headers are also quoted if they contain end-of-lines or tabs.

See #1244
This commit is contained in:
mgrojo
2017-12-01 23:58:06 +01:00
parent 882fc8d3d3
commit aa2aa137f2
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ExtendedTableWidget.cpp
View File

@@ -244,7 +244,11 @@ void ExtendedTableWidget::copy(const bool withHeaders)
result.append(fieldSepText);
htmlResult.append("</th><th>");
}
result.append(QString("\"%1\"").arg(headerText)); // TODO: Check if we need the quotes here
// SQLite allows tabs in column and table names. TODO: should we escape double quotes too?
if (headerText.contains('\n') || headerText.contains('\t'))
result.append(QString("\"%1\"").arg(headerText));
else
result.append(headerText);
htmlResult.append(headerText);
}
result.append(rowSepText);
@@ -268,18 +272,21 @@ void ExtendedTableWidget::copy(const bool withHeaders)
// Table cell data
QString text = data;
if (text.contains('\n'))
if (text.contains('\n') || text.contains('\t'))
htmlResult.append("<pre>" + text.toHtmlEscaped() + "</pre>");
else
htmlResult.append(text.toHtmlEscaped());
// non-NULL data is enquoted in plain text format, whilst NULL isn't
// TODO: Do we really want to do this for the non-internal buffer case? The only case where we should definitely quote the data is when there are line breaks
// in the text, again for spreadsheet compatability. We also need to quote when there are tabs in the string (or replace the tabs by spaces, that's what
// LibreOffice seems to be doing here).
// Empty string is enquoted in plain text format, whilst NULL isn't
// We also quote the data when there are line breaks in the text, again for spreadsheet compatability.
// We also need to quote when there are tabs in the string (another option would be to replace the tabs by spaces, that's what
// LibreOffice seems to be doing here).
if (!data.isNull()) {
text.replace("\"", "\"\"");
result.append(QString("\"%1\"").arg(text));
if (text.isEmpty() || text.contains('\n') || text.contains('\t') || text.contains('"')) {
text.replace("\"", "\"\"");
result.append(QString("\"%1\"").arg(text));
} else
result.append(text);
}
}