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

1 files changed, 33 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp
new file mode 100644
index 0000000..b890c26
--- /dev/null
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/dbpluginstdfilebase.cpp
@@ -0,0 +1,33 @@
+#include "dbpluginstdfilebase.h"

+#include "common/unused.h"

+#include "db/sqlquery.h"

+#include <QFileInfo>

+

+Db *DbPluginStdFileBase::getInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options, QString *errorMessage)

+{

+    UNUSED(errorMessage);

+

+    Db* db = newInstance(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;

+}

+

+QString DbPluginStdFileBase::generateDbName(const QVariant &baseValue)

+{

+    QFileInfo file(baseValue.toString());

+    return file.completeBaseName();

+}