From 1fdc150116cad39aae5c5da407c3312b47a59e3a Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Fri, 17 Dec 2021 07:06:30 -0500
Subject: New upstream version 3.3.3+dfsg1.

---
 SQLiteStudio3/coreSQLiteStudio/schemaresolver.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'SQLiteStudio3/coreSQLiteStudio/schemaresolver.h')

diff --git a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h
index fb19cee..e7bf2c8 100644
--- a/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h
+++ b/SQLiteStudio3/coreSQLiteStudio/schemaresolver.h
@@ -60,19 +60,19 @@ class API_EXPORT SchemaResolver
         explicit SchemaResolver(Db* db);
         virtual ~SchemaResolver();
 
-        QStringList getTables(const QString& database = QString::null);
-        QStringList getIndexes(const QString& database = QString::null);
-        QStringList getTriggers(const QString& database = QString::null);
-        QStringList getViews(const QString& database = QString::null);
-        StrHash<QStringList> getGroupedIndexes(const QString& database = QString::null);
-        StrHash<QStringList> getGroupedTriggers(const QString& database = QString::null);
+        QStringList getTables(const QString& database = QString());
+        QStringList getIndexes(const QString& database = QString());
+        QStringList getTriggers(const QString& database = QString());
+        QStringList getViews(const QString& database = QString());
+        StrHash<QStringList> getGroupedIndexes(const QString& database = QString());
+        StrHash<QStringList> getGroupedTriggers(const QString& database = QString());
         QSet<QString> getDatabases();
         QStringList getObjects(const QString& type);
         QStringList getObjects(const QString& database, const QString& type);
         QStringList getAllObjects();
         QStringList getAllObjects(const QString& database);
         QString getUniqueName(const QString& database, const QString& namePrefix, const QStringList& forbiddenNames = QStringList());
-        QString getUniqueName(const QString& namePrefix = QString::null, const QStringList& forbiddenNames = QStringList());
+        QString getUniqueName(const QString& namePrefix = QString(), const QStringList& forbiddenNames = QStringList());
         QStringList getFkReferencingTables(const QString& table);
         QStringList getFkReferencingTables(const QString& database, const QString& table);
 
@@ -131,7 +131,7 @@ class API_EXPORT SchemaResolver
         QList<DataType> getTableColumnDataTypes(const QString& table, int expectedNumberOfTypes = -1);
         QList<DataType> getTableColumnDataTypes(const QString& database, const QString& table, int expectedNumberOfTypes = -1);
 
-        StrHash<QStringList> getAllTableColumns(const QString& database = QString::null);
+        StrHash<QStringList> getAllTableColumns(const QString& database = QString());
 
         QStringList getViewColumns(const QString& view);
         QStringList getViewColumns(const QString& database, const QString& view);
@@ -175,6 +175,7 @@ class API_EXPORT SchemaResolver
         StrHash<SqliteCreateViewPtr> getAllParsedViews();
         StrHash<SqliteCreateViewPtr> getAllParsedViews(const QString& database);
 
+        QString getSqliteAutoIndexDdl(const QString& database, const QString& index);
         static QString getSqliteMasterDdl(bool temp = false);
         static QStringList getFkReferencingTables(const QString& table, const QList<SqliteCreateTablePtr>& allParsedTables);
 
@@ -202,6 +203,7 @@ class API_EXPORT SchemaResolver
         QList<SqliteCreateTriggerPtr> getParsedTriggersForTableOrView(const QString& database, const QString& tableOrView, bool includeContentReferences, bool table);
         QString getObjectDdlWithDifficultName(const QString& dbName, const QString& lowerName, QString targetTable, ObjectType type);
         QString getObjectDdlWithSimpleName(const QString& dbName, const QString& lowerName, QString targetTable, ObjectType type);
+        StrHash<QString> getIndexesWithTables(const QString& database = QString());
 
         template <class T>
         StrHash<QSharedPointer<T>> getAllParsedObjectsForType(const QString& database, const QString& type);
@@ -212,6 +214,7 @@ class API_EXPORT SchemaResolver
         Db::Flags dbFlags;
 
         static ExpiringCache<ObjectCacheKey,QVariant> cache;
+        static ExpiringCache<QString, QString> autoIndexDdlCache;
 };
 
 int qHash(const SchemaResolver::ObjectCacheKey& key);
@@ -222,7 +225,7 @@ StrHash<QSharedPointer<T>> SchemaResolver::getAllParsedObjectsForType(const QStr
 {
      StrHash< QSharedPointer<T>> parsedObjects;
 
-     QString dbName = getPrefixDb(database, db->getDialect());
+     QString dbName = getPrefixDb(database);
 
      SqlQueryPtr results;
 
-- 
cgit v1.2.3