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

improve the execute query tab.

Browse Source 
Don't set db state to dirty if only selects are executed.
Result table isn't editable anymore and reset columns correctly
query string is correctly given as UTF8
This commit is contained in:
Peinthor Rene
2012-03-27 15:26:51 +02:00
parent ec331b0c80
commit fa2a70405e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainwindow.cpp
View File

@@ -439,6 +439,7 @@ void MainWindow::setupUi()
queryResultTableView->setObjectName(QString::fromUtf8("queryResultTableView"));
queryResultTableView->setSelectionMode(QTreeView::NoSelection);
queryResultTableView->setModel(queryResultListModel);
queryResultTableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
vboxLayout3->addWidget(queryResultTableView);
@@ -1653,8 +1654,8 @@ void MainWindow::executeQuery()
//log the query
db.logSQL(query, kLogMsg_User);
sqlite3_stmt *vm;
std::string tmpQuery = query.toStdString();
const char *tail = tmpQuery.c_str();
QByteArray utf8Query = query.toUtf8();
const char *tail = utf8Query.data();
int ncol;
int err=0;
QString lastErrorMessage = QString("No error");
@@ -1662,13 +1663,16 @@ void MainWindow::executeQuery()
do
{
queryResultListModel->removeRows(0, queryResultListModel->rowCount());
queryResultListModel->removeColumns(0, queryResultListModel->columnCount());
queryResultListModel->setHorizontalHeaderLabels(QStringList());
queryResultListModel->setVerticalHeaderLabels(QStringList());
err=sqlite3_prepare(db._db,tail,query.length(),
QString queryPart = tail;
err=sqlite3_prepare(db._db,tail,utf8Query.length(),
&vm, &tail);
if (err == SQLITE_OK){
db.setDirty(true);
if( !queryPart.trimmed().startsWith("SELECT", Qt::CaseInsensitive))
db.setDirty(true);
int rownum = 0;
bool mustCreateColumns = true;
while ( sqlite3_step(vm) == SQLITE_ROW ){