diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
Merge tag 'upstream/3.0.6'
Upstream version 3.0.6
# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp index ac7cd8a..a3d0e65 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp @@ -9,6 +9,7 @@ #include "common/global.h" #include "iconmanager.h" #include "common/unused.h" +#include "db/sqlquery.h" #include <QDateTimeEdit> #include <QSpinBox> #include <QDebug> @@ -464,7 +465,7 @@ bool DbDialog::testDatabase() { if (testDb->openForProbing()) { - res = !testDb->getEncoding().isEmpty(); + res = !testDb->exec("SELECT sqlite_version();")->getSingleCell().toString().isEmpty(); testDb->closeQuiet(); } delete testDb; |