Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

5 files changed, 19 insertions, 35 deletions

diff --git a/Plugins/DbSqlite2/DbSqlite2.pro b/Plugins/DbSqlite2/DbSqlite2.pro
index b254ca5..ae58ad4 100644
--- a/Plugins/DbSqlite2/DbSqlite2.pro
+++ b/Plugins/DbSqlite2/DbSqlite2.pro
@@ -36,3 +36,9 @@ OTHER_FILES += \
 
 
 
+
+
+
+
+
+
diff --git a/Plugins/DbSqlite2/dbsqlite2.cpp b/Plugins/DbSqlite2/dbsqlite2.cpp
index 8047c7e..93871ae 100644
--- a/Plugins/DbSqlite2/dbsqlite2.cpp
+++ b/Plugins/DbSqlite2/dbsqlite2.cpp
@@ -7,37 +7,14 @@ DbSqlite2::DbSqlite2()
 {
 }
 
-Db* DbSqlite2::getInstance(const QString& name, const QString& path, const QHash<QString, QVariant>& options, QString* errorMessage)
-{
-    UNUSED(errorMessage);
-    Db* db = new DbSqlite2Instance(name, path, options);
-
-    if (!db->openForProbing())
-    {
-        delete db;
-        return nullptr;
-    }
-
-    SqlQueryPtr results = db->exec("SELECT * FROM sqlite_master");
-    if (results->isError())
-    {
-        delete db;
-        return nullptr;
-    }
-
-    db->closeQuiet();
-    return db;
-}
-
 QList<DbPluginOption> DbSqlite2::getOptionsList() const
 {
     return QList<DbPluginOption>();
 }
 
-QString DbSqlite2::generateDbName(const QVariant& baseValue)
+Db *DbSqlite2::newInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options)
 {
-    QFileInfo file(baseValue.toString());
-    return file.baseName();
+    return new DbSqlite2Instance(name, path, options);
 }
 
 QString DbSqlite2::getLabel() const
diff --git a/Plugins/DbSqlite2/dbsqlite2.h b/Plugins/DbSqlite2/dbsqlite2.h
index c428031..a52fc26 100644
--- a/Plugins/DbSqlite2/dbsqlite2.h
+++ b/Plugins/DbSqlite2/dbsqlite2.h
@@ -2,10 +2,10 @@
 #define DBSQLITE2_H
 
 #include "dbsqlite2_global.h"
-#include "plugins/dbplugin.h"
+#include "plugins/dbpluginstdfilebase.h"
 #include "plugins/genericplugin.h"
 
-class DBSQLITE2SHARED_EXPORT DbSqlite2 : public GenericPlugin, public DbPlugin
+class DBSQLITE2SHARED_EXPORT DbSqlite2 : public GenericPlugin, public DbPluginStdFileBase
 {
     Q_OBJECT
     SQLITESTUDIO_PLUGIN("dbsqlite2.json")
@@ -15,9 +15,10 @@ class DBSQLITE2SHARED_EXPORT DbSqlite2 : public GenericPlugin, public DbPlugin
 
         QString getLabel() const;
         bool checkIfDbServedByPlugin(Db* db) const;
-        Db* getInstance(const QString& name, const QString& path, const QHash<QString, QVariant>& options, QString* errorMessage);
         QList<DbPluginOption> getOptionsList() const;
-        QString generateDbName(const QVariant& baseValue);
+
+    protected:
+        Db *newInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options);
 };
 
 #endif // DBSQLITE2_H
diff --git a/Plugins/DbSqlite2/dbsqlite2.json b/Plugins/DbSqlite2/dbsqlite2.json
index 59a17e1..cd9f437 100644
--- a/Plugins/DbSqlite2/dbsqlite2.json
+++ b/Plugins/DbSqlite2/dbsqlite2.json
@@ -1,7 +1,8 @@
 {
-    "type":        "DbPlugin",
-    "title":       "SQLite 2",
-    "description": "Provides support for SQLite 2.* databases",
-    "version":     10005,
-    "author":      "SalSoft"
+    "type":          "DbPlugin",
+    "title":         "SQLite 2",
+    "description":   "Provides support for SQLite 2.* databases",
+    "minAppVersion": 30101,
+    "version":       10006,
+    "author":        "SalSoft"
 }
diff --git a/Plugins/DbSqlite2/dbsqlite2instance.cpp b/Plugins/DbSqlite2/dbsqlite2instance.cpp
index 35f1f9f..6da4e5b 100644
--- a/Plugins/DbSqlite2/dbsqlite2instance.cpp
+++ b/Plugins/DbSqlite2/dbsqlite2instance.cpp
@@ -3,7 +3,6 @@
 DbSqlite2Instance::DbSqlite2Instance(const QString& name, const QString& path, const QHash<QString, QVariant>& connOptions) :
     AbstractDb2<Sqlite2>(name, path, connOptions)
 {
-
 }
 
 QString DbSqlite2Instance::getEncoding()