mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-05-19 03:58:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

CSV Import: fixes of the local convention option

Browse Source 
Added default value for new setting.
Avoid second call to ui->checkLocalConventions->isChecked().

See issue #2140.
This commit is contained in:
mgrojo
2020-12-20 14:58:27 +01:00
parent dafa873dea
commit e0b40ad90e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ImportCsvDialog.cpp
+3 -4
View File
@@ -655,14 +655,13 @@ bool ImportCsvDialog::importCsv(const QString& fileName, const QString& name)
// This is a non-empty value, or we want to insert the empty string. Just add it to the statement.
bool convert_ok = false;
if(ui->checkLocalConventions->isChecked()) {
// Find the correct data type taken into account the locale.
// Find the correct data type taking into account the locale.
QString content = QString::fromUtf8(rowData.fields[i].data, static_cast<int>(rowData.fields[i].data_length));
const QLocale &locale = ui->checkLocalConventions->isChecked() ? QLocale::system() : QLocale::c();
sqlite_int64 int64_value = locale.toLongLong(content, &convert_ok);
sqlite_int64 int64_value = QLocale::system().toLongLong(content, &convert_ok);
if(convert_ok) {
sqlite3_bind_int64(stmt, static_cast<int>(i)+1, int64_value);
} else {
double value = locale.toDouble(content, &convert_ok);
double value = QLocale::system().toDouble(content, &convert_ok);
if(convert_ok)
sqlite3_bind_double(stmt, static_cast<int>(i)+1, value);
}
src/Settings.cpp
+2
View File
@@ -186,6 +186,8 @@ QVariant Settings::getDefaultValue(const std::string& group, const std::string&
return '"';
if(name == "encoding")
return "UTF-8";
if(name == "localconventions")
return false;
}
// exportsql group?