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

Fix kinda broken execute query function

Browse Source
This commit is contained in:
Peinthor Rene
2012-02-15 16:57:38 +01:00
parent 3f2c39933d
commit 1e85455adb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mainwindow.cpp
View File

@@ -1637,7 +1637,7 @@ void MainWindow::doubleClickTable( int row, int col )
void MainWindow::executeQuery()
{
QString query = db.GetEncodedQString(sqlTextEdit->toPlainText());
QString query = sqlTextEdit->toPlainText().trimmed();
if (query.isEmpty())
{
QMessageBox::information( this, QApplication::applicationName(), "Query string is empty" );
@@ -1646,20 +1646,19 @@ void MainWindow::executeQuery()
//log the query
db.logSQL(query, kLogMsg_User);
sqlite3_stmt *vm;
const char *tail=NULL;
std::string tmpQuery = query.toStdString();
const char *tail = tmpQuery.c_str();
int ncol;
int err=0;
QString lastErrorMessage = QString("No error");
//Accept multi-line queries, by looping until the tail is empty
while (1) {
if (tail!=NULL) {
query = QString(tail);
}
do
{
queryResultListModel->removeRows(0, queryResultListModel->rowCount());
queryResultListModel->setHorizontalHeaderLabels(QStringList());
queryResultListModel->setVerticalHeaderLabels(QStringList());
err=sqlite3_prepare(db._db,query.toUtf8(),query.length(),
err=sqlite3_prepare(db._db,tail,query.length(),
&vm, &tail);
if (err == SQLITE_OK){
db.setDirty(true);
@@ -1701,9 +1700,8 @@ void MainWindow::executeQuery()
queryErrorLineEdit->setText(lastErrorMessage);
queryResultTableView->resizeColumnsToContents();
if ((!tail)||(*tail==0)) break;
if(err!=SQLITE_OK) break;
}
} while( tail && *tail != 0 );
}