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: fix importing into existing table

Browse Source 
The previous commit broke the application of the type affinity rules for
already existing tables. Now the problem is at least restricted to
the case when the new "Use local number conventions" is used.

See issue #2140.
This commit is contained in:
mgrojo
2020-12-20 00:58:14 +01:00
parent f9314b6dbe
commit dafa873dea
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ImportCsvDialog.cpp
+18 -14
View File
@@ -653,21 +653,25 @@ bool ImportCsvDialog::importCsv(const QString& fileName, const QString& name)
// No need to bind NULL values here as that is the default bound value in SQLite
} else {
// This is a non-empty value, or we want to insert the empty string. Just add it to the statement.
// Find the correct data type taken 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();
bool convert_ok;
sqlite_int64 int64_value = locale.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);
if(convert_ok)
sqlite3_bind_double(stmt, static_cast<int>(i)+1, value);
else
// Set new data type. If we don't find any better data type, we fall back to the TEXT data type
bool convert_ok = false;
if(ui->checkLocalConventions->isChecked()) {
// Find the correct data type taken 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);
if(convert_ok) {
sqlite3_bind_int64(stmt, static_cast<int>(i)+1, int64_value);
} else {
double value = locale.toDouble(content, &convert_ok);
if(convert_ok)
sqlite3_bind_double(stmt, static_cast<int>(i)+1, value);
}
}
sqlite3_bind_text(stmt, static_cast<int>(i)+1, rowData.fields[i].data, static_cast<int>(rowData.fields[i].data_length), SQLITE_STATIC);
if(!convert_ok) {
// If we don't find any better data type or we want SQLite to apply the type affinity
// (impossible when using local conventions), we fall back to the TEXT data type.
sqlite3_bind_text(stmt, static_cast<int>(i)+1, rowData.fields[i].data, static_cast<int>(rowData.fields[i].data_length), SQLITE_STATIC);
}
}
}