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

Change the internal data type for cell contents to a binary type

Browse Source 
Store the data of a DB cell in a QByteArray, i.e. a binary data type,
instead of putting it in a QString, thus converting it to a UTF8 string.

Rewrite the reading and writing of DB cells to correctly handle binary
data containing 0x00 bytes.

Change the edit dialog to actually do all the data checks etc. on a
currently invisible QHexEdit widget instead of a QTextEdit.

All these changes combined make it possible to actually store binary
data without it being corrupted. You can for example import pictures
now, export them and actually open the exported file. So this is an
improvement.
This commit is contained in:
Martin Kleusberg
2013-03-17 01:38:48 +01:00
parent 0cf9ecd158
commit 6c8712d804
7 changed files with 104 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/sqlitedb.cpp
View File

@@ -386,8 +386,8 @@ bool DBBrowserDB::deleteRecord( int wrow)
if (!isOpen()) return false;
bool ok = false;
rowList tab = browseRecs;
QStringList& rt = tab[wrow];
QString& rowid = rt[0];
QList<QByteArray> rt = tab[wrow];
QString rowid = rt[0];
lastErrorMessage = QString("no error");
QString statement = QString("DELETE FROM `%1` WHERE rowid=%2;").arg(curBrowseTableName).arg(rowid);
@@ -406,45 +406,52 @@ bool DBBrowserDB::deleteRecord( int wrow)
return ok;
}
bool DBBrowserDB::updateRecord(int wrow, int wcol, const QString & wtext)
bool DBBrowserDB::updateRecord(int wrow, int wcol, const QByteArray& wtext)
{
char * errmsg;
if (!hasValidBrowseSet) return false;
if (!isOpen()) return false;
bool ok = false;
lastErrorMessage = QString("no error");
QStringList& rt = browseRecs[wrow];
QString& rowid = rt[0];
QString& cv = rt[wcol+1];//must account for rowid
QList<QByteArray>& rt = browseRecs[wrow];
QString rowid = rt[0];
QByteArray& cv = rt[wcol+1];//must account for rowid
QString ct = browseFields.at(wcol);
QString statement = QString("UPDATE `%1` SET `%2`=").arg(curBrowseTableName).arg(ct);
QString sql = QString("UPDATE `%1` SET `%2`=? WHERE rowid=%4;").arg(curBrowseTableName).arg(ct).arg(rowid);
char * formSQL = sqlite3_mprintf("%Q", wtext.toUtf8().constData());
statement.append(formSQL);
if (formSQL) sqlite3_free(formSQL);
statement.append(" WHERE rowid=");
statement.append(rowid);
statement.append(";");
logSQL(sql, kLogMsg_App);
setRestorePoint();
if (_db){
logSQL(statement, kLogMsg_App);
setRestorePoint();
if (SQLITE_OK==sqlite3_exec(_db,statement.toUtf8(),
NULL,NULL,&errmsg)){
ok=true;
/*update local copy*/
cv = wtext;
} else {
lastErrorMessage = QString::fromUtf8(errmsg);
qCritical() << "update Record: " << lastErrorMessage;
}
sqlite3_stmt* stmt;
if(sqlite3_prepare(_db, sql.toUtf8(), -1, &stmt, 0) != SQLITE_OK)
{
lastErrorMessage = sqlite3_errmsg(_db);
qCritical() << "updateRecord: " << lastErrorMessage;
return false;
}
if(sqlite3_bind_blob(stmt, 1, wtext.constData(), wtext.length(), SQLITE_STATIC) != SQLITE_OK)
{
lastErrorMessage = sqlite3_errmsg(_db);
qCritical() << "updateRecord: " << lastErrorMessage;
return false;
}
if(sqlite3_step(stmt) != SQLITE_DONE)
{
lastErrorMessage = sqlite3_errmsg(_db);
qCritical() << "updateRecord: " << lastErrorMessage;
return false;
}
if(sqlite3_finalize(stmt) != SQLITE_OK)
{
lastErrorMessage = sqlite3_errmsg(_db);
qCritical() << "updateRecord: " << lastErrorMessage;
return false;
}
return ok;
cv = wtext;
return true;
}
bool DBBrowserDB::browseTable( const QString & tablename, const QString& orderby )
@@ -664,44 +671,43 @@ bool DBBrowserDB::renameTable(const QString& from_table, const QString& to_table
void DBBrowserDB::getTableRecords( const QString & tablename, const QString& orderby )
{
sqlite3_stmt *vm;
const char *tail;
sqlite3_stmt* stmt;
int ncol;
QStringList r;
// char *errmsg;
int err=0;
// int tabnum = 0;
QList<QByteArray> r;
browseRecs.clear();
idmap.clear();
lastErrorMessage = QObject::tr("no error");
QString statement = QString("SELECT rowid, * FROM `%1` ORDER BY %2;").arg(tablename).arg(orderby);
logSQL(statement, kLogMsg_App);
QByteArray utf8Statement = statement.toUtf8();
err=sqlite3_prepare(_db,utf8Statement,utf8Statement.length(),
&vm, &tail);
if (err == SQLITE_OK){
int rownum = 0;
while ( sqlite3_step(vm) == SQLITE_ROW ){
r.clear();
ncol = sqlite3_data_count(vm);
for (int e=0; e<ncol; ++e){
QString rv = QString::fromUtf8((const char*)sqlite3_column_text(vm,e));
r << rv;
if (e==0){
idmap.insert(rv.toInt(),rownum);
rownum++;
}
}
browseRecs.append(r);
}
sqlite3_finalize(vm);
}else{
QString sql = QString("SELECT rowid, * FROM `%1` ORDER BY %2;").arg(tablename).arg(orderby);
logSQL(sql, kLogMsg_App);
if(sqlite3_prepare(_db, sql.toUtf8(), -1, &stmt, 0) != SQLITE_OK)
{
lastErrorMessage = QObject::tr("could not get fields");
return;
}
int rownum = 0;
while(sqlite3_step(stmt) == SQLITE_ROW)
{
r.clear();
ncol = sqlite3_data_count(stmt);
for(int e=0;e<ncol;++e)
{
QByteArray rv = QByteArray(static_cast<const char*>(sqlite3_column_blob(stmt, e)), sqlite3_column_bytes(stmt, e));
r.append(rv);
if(e == 0)
{
idmap.insert(rv.toInt(), rownum);
rownum++;
}
}
browseRecs.append(r);
}
sqlite3_finalize(stmt);
}
resultMap DBBrowserDB::getFindResults( const QString & wstatement)