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

Update to upstream version '3.4.13+dfsg'
with Debian dir bf81ee0219cb8e4562a4751df17d75814772d2d6

1 files changed, 7 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/services/collationmanager.h b/SQLiteStudio3/coreSQLiteStudio/services/collationmanager.h
index ef1f57a..02e2bda 100644
--- a/SQLiteStudio3/coreSQLiteStudio/services/collationmanager.h
+++ b/SQLiteStudio3/coreSQLiteStudio/services/collationmanager.h
@@ -14,9 +14,15 @@ class API_EXPORT CollationManager : public QObject
     Q_OBJECT
 
     public:
+        enum CollationType
+        {
+            FUNCTION_BASED = 0,
+            EXTENSION_BASED = 1
+        };
         struct API_EXPORT Collation
         {
             QString name;
+            CollationType type;
             QString lang;
             QString code;
             QStringList databases;
@@ -30,6 +36,7 @@ class API_EXPORT CollationManager : public QObject
         virtual QList<CollationPtr> getCollationsForDatabase(const QString& dbName) const = 0;
         virtual int evaluate(const QString& name, const QString& value1, const QString& value2) = 0;
         virtual int evaluateDefault(const QString& value1, const QString& value2) = 0;
+        virtual CollationPtr getCollation(const QString &name) const = 0;
 
     signals:
         void collationListChanged();