Merge tag 'upstream/3.0.5'

Upstream version 3.0.5

# gpg: Signature made Sun 19 Apr 2015 10:30:41 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>"

3 files changed, 16 insertions, 17 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp
index 68c6ad7..8c08a51 100644
--- a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb.cpp
@@ -703,23 +703,6 @@ int AbstractDb::getErrorCode()
 
 bool AbstractDb::initAfterCreated()
 {
-    bool isOpenBefore = isOpen();
-    if (!isOpenBefore)
-    {
-        if (!openForProbing())
-        {
-            qWarning() << "Could not open database for initAfterCreated(). Database:" << name;
-            return false;
-        }
-    }
-
-    // SQLite version
-    QVariant value = exec("SELECT sqlite_version()")->getSingleCell();
-    version = value.toString().mid(0, 1).toUInt();
-
-    if (!isOpenBefore)
-        closeQuiet();
-
     return true;
 }
 
diff --git a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb2.h b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb2.h
index 9b27dc3..0620a7d 100644
--- a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb2.h
+++ b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb2.h
@@ -52,6 +52,7 @@ class AbstractDb2 : public AbstractDb
         int getErrorCodeInternal();
         bool openInternal();
         bool closeInternal();
+        bool initAfterCreated();
         void initAfterOpen();
         SqlQueryPtr prepare(const QString& query);
         QString getTypeLabel();
@@ -220,6 +221,13 @@ bool AbstractDb2<T>::closeInternal()
 }
 
 template <class T>
+bool AbstractDb2<T>::initAfterCreated()
+{
+    version = 2;
+    return AbstractDb::initAfterCreated();
+}
+
+template <class T>
 void AbstractDb2<T>::initAfterOpen()
 {
 }
diff --git a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h
index 9cb58aa..fe37d5e 100644
--- a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h
+++ b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h
@@ -51,6 +51,7 @@ class AbstractDb3 : public AbstractDb
         int getErrorCodeInternal();
         bool openInternal();
         bool closeInternal();
+        bool initAfterCreated();
         void initAfterOpen();
         SqlQueryPtr prepare(const QString& query);
         QString getTypeLabel();
@@ -383,6 +384,13 @@ bool AbstractDb3<T>::closeInternal()
 }
 
 template <class T>
+bool AbstractDb3<T>::initAfterCreated()
+{
+    version = 3;
+    return AbstractDb::initAfterCreated();
+}
+
+template <class T>
 void AbstractDb3<T>::initAfterOpen()
 {
     T::enable_load_extension(dbHandle, true);