New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

8 files changed, 95 insertions, 6 deletions

diff --git a/SQLiteStudio3/Tests/TestUtils/TestUtils.pro b/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
index f448ccb..77e0b19 100644
--- a/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
+++ b/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
@@ -23,7 +23,8 @@ SOURCES += \
     mocks.cpp \

     dbattachermock.cpp \

     dbmanagermock.cpp \

-    collationmanagermock.cpp

+    collationmanagermock.cpp \

+    extensionmanagermock.cpp

 

 HEADERS +=\

         testutils_global.h \

@@ -35,7 +36,8 @@ HEADERS +=\
     mocks.h \

     dbattachermock.h \

     dbmanagermock.h \

-    collationmanagermock.h

+    collationmanagermock.h \

+    extensionmanagermock.h

 

 unix:!symbian {

     maemo5 {

diff --git a/SQLiteStudio3/Tests/TestUtils/configmock.cpp b/SQLiteStudio3/Tests/TestUtils/configmock.cpp
index 9bf3863..5a9169a 100644
--- a/SQLiteStudio3/Tests/TestUtils/configmock.cpp
+++ b/SQLiteStudio3/Tests/TestUtils/configmock.cpp
@@ -35,6 +35,11 @@ QVariant ConfigMock::get(const QString&, const QString&)
     return QVariant();
 }
 
+QVariant ConfigMock::get(const QString &, const QString &, const QVariant &)
+{
+    return QVariant();
+}
+
 QHash<QString, QVariant> ConfigMock::getAll()
 {
     return QHash<QString, QVariant>();
@@ -102,6 +107,10 @@ void ConfigMock::clearSqlHistory()
 {
 }
 
+void ConfigMock::deleteSqlHistory(const QList<qint64>&)
+{
+}
+
 QAbstractItemModel* ConfigMock::getSqlHistoryModel()
 {
     return nullptr;
@@ -124,6 +133,37 @@ QStringList ConfigMock::getCliHistory() const
     return QStringList();
 }
 
+void ConfigMock::addBindParamHistory(const QVector<QPair<QString, QVariant> >&)
+{
+}
+
+void ConfigMock::applyBindParamHistoryLimit()
+{
+}
+
+QVector<QPair<QString, QVariant> > ConfigMock::getBindParamHistory(const QStringList&) const
+{
+    return QVector<QPair<QString, QVariant>>();
+}
+
+void ConfigMock::addPopulateHistory(const QString&, const QString&, int, const QHash<QString, QPair<QString, QVariant> >&)
+{
+}
+
+void ConfigMock::applyPopulateHistoryLimit()
+{
+}
+
+QHash<QString, QPair<QString, QVariant>> ConfigMock::getPopulateHistory(const QString&, const QString&, int&) const
+{
+    return QHash<QString, QPair<QString, QVariant>>();
+}
+
+QVariant ConfigMock::getPopulateHistory(const QString&) const
+{
+    return QVariant();
+}
+
 void ConfigMock::addDdlHistory(const QString&, const QString&, const QString&)
 {
 }
diff --git a/SQLiteStudio3/Tests/TestUtils/configmock.h b/SQLiteStudio3/Tests/TestUtils/configmock.h
index 89c870e..7f04e98 100644
--- a/SQLiteStudio3/Tests/TestUtils/configmock.h
+++ b/SQLiteStudio3/Tests/TestUtils/configmock.h
@@ -16,6 +16,7 @@ class ConfigMock : public Config
         void rollbackMassSave();
         void set(const QString&, const QString&, const QVariant&);
         QVariant get(const QString&, const QString&);
+        QVariant get(const QString&, const QString&, const QVariant&);
         QHash<QString, QVariant> getAll();
         bool addDb(const QString&, const QString&, const QHash<QString, QVariant>&);
         bool updateDb(const QString&, const QString&, const QString&, const QHash<QString, QVariant>&);
@@ -30,11 +31,19 @@ class ConfigMock : public Config
         qint64 addSqlHistory(const QString&, const QString&, int, int);
         void updateSqlHistory(qint64, const QString&, const QString&, int, int);
         void clearSqlHistory();
+        void deleteSqlHistory(const QList<qint64>&);
         QAbstractItemModel*getSqlHistoryModel();
         void addCliHistory(const QString&);
         void applyCliHistoryLimit();
         void clearCliHistory();
         QStringList getCliHistory() const;
+        void addBindParamHistory(const QVector<QPair<QString, QVariant>>&);
+        void applyBindParamHistoryLimit();
+        QVector<QPair<QString, QVariant>> getBindParamHistory(const QStringList&) const;
+        void addPopulateHistory(const QString&, const QString&, int, const QHash<QString, QPair<QString, QVariant>>&);
+        void applyPopulateHistoryLimit();
+        QHash<QString, QPair<QString, QVariant>> getPopulateHistory(const QString&, const QString&, int&) const;
+        QVariant getPopulateHistory(const QString&) const;
         void addDdlHistory(const QString&, const QString&, const QString&);
         QList<DdlHistoryEntryPtr> getDdlHistoryFor(const QString&, const QString&, const QDate&);
         DdlHistoryModel* getDdlHistoryModel();
diff --git a/SQLiteStudio3/Tests/TestUtils/dbmanagermock.cpp b/SQLiteStudio3/Tests/TestUtils/dbmanagermock.cpp
index 926e57b..10caed4 100644
--- a/SQLiteStudio3/Tests/TestUtils/dbmanagermock.cpp
+++ b/SQLiteStudio3/Tests/TestUtils/dbmanagermock.cpp
@@ -57,7 +57,7 @@ Db* DbManagerMock::getByPath(const QString&)
     return nullptr;
 }
 
-Db*DbManagerMock::createInMemDb()
+Db*DbManagerMock::createInMemDb(bool)
 {
     return nullptr;
 }
diff --git a/SQLiteStudio3/Tests/TestUtils/dbmanagermock.h b/SQLiteStudio3/Tests/TestUtils/dbmanagermock.h
index ce7eb51..ee69fa1 100644
--- a/SQLiteStudio3/Tests/TestUtils/dbmanagermock.h
+++ b/SQLiteStudio3/Tests/TestUtils/dbmanagermock.h
@@ -16,9 +16,9 @@ class DbManagerMock : public DbManager
         QList<Db*> getValidDbList();
         QList<Db*> getConnectedDbList();
         QStringList getDbNames();
-        Db*getByName(const QString&, Qt::CaseSensitivity);
-        Db*getByPath(const QString&);
-        Db*createInMemDb();
+        Db* getByName(const QString&, Qt::CaseSensitivity);
+        Db* getByPath(const QString&);
+        Db* createInMemDb(bool = false);
         bool isTemporary(Db*);
         QString quickAddDb(const QString &path, const QHash<QString, QVariant> &);
         DbPlugin* getPluginForDbFile(const QString&);
diff --git a/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp
new file mode 100644
index 0000000..dc4669b
--- /dev/null
+++ b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.cpp
@@ -0,0 +1,19 @@
+#include "extensionmanagermock.h"
+
+ExtensionManagerMock::ExtensionManagerMock()
+{
+}
+
+void ExtensionManagerMock::setExtensions(const QList<SqliteExtensionManager::ExtensionPtr>&)
+{
+}
+
+QList<SqliteExtensionManager::ExtensionPtr> ExtensionManagerMock::getAllExtensions() const
+{
+    return QList<SqliteExtensionManager::ExtensionPtr>();
+}
+
+QList<SqliteExtensionManager::ExtensionPtr> ExtensionManagerMock::getExtensionForDatabase(const QString&) const
+{
+    return QList<SqliteExtensionManager::ExtensionPtr>();
+}
diff --git a/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h
new file mode 100644
index 0000000..7a7a1f4
--- /dev/null
+++ b/SQLiteStudio3/Tests/TestUtils/extensionmanagermock.h
@@ -0,0 +1,17 @@
+#ifndef EXTENSIONMANAGERMOCK_H
+#define EXTENSIONMANAGERMOCK_H
+
+#include "services/sqliteextensionmanager.h"
+
+class ExtensionManagerMock : public SqliteExtensionManager
+{
+    public:
+        ExtensionManagerMock();
+
+    public:
+        void setExtensions(const QList<ExtensionPtr>&);
+        QList<ExtensionPtr> getAllExtensions() const;
+        QList<ExtensionPtr> getExtensionForDatabase(const QString&) const;
+};
+
+#endif // EXTENSIONMANAGERMOCK_H
diff --git a/SQLiteStudio3/Tests/TestUtils/mocks.cpp b/SQLiteStudio3/Tests/TestUtils/mocks.cpp
index dee3bfd..bb1a226 100644
--- a/SQLiteStudio3/Tests/TestUtils/mocks.cpp
+++ b/SQLiteStudio3/Tests/TestUtils/mocks.cpp
@@ -7,6 +7,7 @@
 #include "collationmanagermock.h"
 #include "dbattachermock.h"
 #include "dbmanagermock.h"
+#include "extensionmanagermock.h"
 
 MockRepository* mockRepository = nullptr;
 
@@ -34,4 +35,5 @@ void initMocks()
     SQLITESTUDIO->setDbAttacherFactory(new DbAttacherFactoryMock());
     SQLITESTUDIO->setDbManager(new DbManagerMock());
     SQLITESTUDIO->setCollationManager(new CollationManagerMock());
+    SQLITESTUDIO->setSqliteExtensionManager(new ExtensionManagerMock());
 }