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

exportsql: real handling of null and empty strings

Browse Source
This commit is contained in:
Peinthor Rene
2014-11-23 09:16:06 +01:00
parent 0f48f1a035
commit e814fa2a03
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sqlitedb.cpp
View File

@@ -358,31 +358,28 @@ bool DBBrowserDB::dump(const QString& filename)
{
int fieldsize = sqlite3_column_bytes(stmt, i);
int fieldtype = sqlite3_column_type(stmt, i);
if(fieldsize)
{
QByteArray bcontent(
(const char*)sqlite3_column_blob(stmt, i),
fieldsize);
QByteArray bcontent(
(const char*)sqlite3_column_blob(stmt, i),
fieldsize);
if(bcontent.left(2048).contains('\0')) // binary check
{
stream << QString("X'%1'").arg(QString(bcontent.toHex()));
}
else
{
if(fieldtype == SQLITE_TEXT || fieldtype == SQLITE_BLOB)
{
stream << "'" << bcontent.replace("'", "''") << "'";
}
else
{
stream << bcontent;
}
}
if(bcontent.left(2048).contains('\0')) // binary check
{
stream << QString("X'%1'").arg(QString(bcontent.toHex()));
}
else
{
stream << "NULL";
switch(fieldtype)
{
case SQLITE_TEXT:
case SQLITE_BLOB:
stream << "'" << bcontent.replace("'", "''") << "'";
break;
case SQLITE_NULL:
stream << "NULL";
break;
default:
stream << bcontent;
}
}
if(i != columns - 1)
stream << ',';
@@ -428,9 +425,8 @@ bool DBBrowserDB::dump(const QString& filename)
QApplication::restoreOverrideCursor();
qApp->processEvents();
return true;
} else {
return false;
}
return false;
}
bool DBBrowserDB::executeSQL ( const QString & statement, bool dirtyDB, bool logsql)