Update upstream source from tag 'upstream/3.4.4+dfsg'

Update to upstream version '3.4.4+dfsg'
with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed

1 files changed, 11 insertions, 1 deletions

diff --git a/Plugins/DbSqliteWx/dbsqlitewxinstance.cpp b/Plugins/DbSqliteWx/dbsqlitewxinstance.cpp
index 2462c77..0335976 100644
--- a/Plugins/DbSqliteWx/dbsqlitewxinstance.cpp
+++ b/Plugins/DbSqliteWx/dbsqlitewxinstance.cpp
@@ -6,6 +6,16 @@ DbSqliteWxInstance::DbSqliteWxInstance(const QString& name, const QString& path,
 {

 }

 

+Db* DbSqliteWxInstance::clone() const

+{

+    return new DbSqliteWxInstance(name, path, connOptions);

+}

+

+QString DbSqliteWxInstance::getTypeClassName() const

+{

+    return "DbSqliteWxInstance";

+}

+

 void DbSqliteWxInstance::initAfterOpen()

 {

     SqlQueryPtr res;

@@ -30,7 +40,7 @@ void DbSqliteWxInstance::initAfterOpen()
     QString key = connOptions[DbSqliteWx::PASSWORD_OPT].toString();

     if (!key.isEmpty())

     {

-        res = exec(QString("PRAGMA key = '%1';").arg(key), Flag::NO_LOCK);

+        res = exec(QString("PRAGMA key = '%1';").arg(escapeString(key)), Flag::NO_LOCK);

         if (res->isError())

             qWarning() << "Error while defining WxSqlite3 key:" << res->getErrorText();

     }