Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

2 files changed, 3 insertions, 5 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.cpp b/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.cpp
index 59f4ac5..9547cd1 100644
--- a/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.cpp
@@ -9,12 +9,11 @@
 DbAttacherImpl::DbAttacherImpl(Db* db)
 {
     this->db = db;
-    dialect = db->getDialect();
 }
 
 bool DbAttacherImpl::attachDatabases(const QString& query)
 {
-    Parser parser(dialect);
+    Parser parser;
     if (!parser.parse(query))
         return false;
 
@@ -89,7 +88,7 @@ QHash<QString, TokenList> DbAttacherImpl::groupDbTokens(const TokenList& dbToken
     QString strippedName;
     for (TokenPtr token : dbTokens)
     {
-        strippedName = stripObjName(token->value, dialect);
+        strippedName = stripObjName(token->value);
         if (!nameToDbMap.contains(strippedName, Qt::CaseInsensitive))
             continue;
 
@@ -129,7 +128,7 @@ QHash<TokenPtr, TokenPtr> DbAttacherImpl::getTokenMapping(const TokenList& dbTok
     TokenPtr dstToken;
     for (TokenPtr srcToken : dbTokens)
     {
-        strippedName = stripObjName(srcToken->value, dialect);
+        strippedName = stripObjName(srcToken->value);
         if (strippedName.compare("main", Qt::CaseInsensitive) == 0 ||
                 strippedName.compare("temp", Qt::CaseInsensitive) == 0)
             continue;
diff --git a/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.h b/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.h
index 6fbe6c8..13ca021 100644
--- a/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.h
+++ b/SQLiteStudio3/coreSQLiteStudio/impl/dbattacherimpl.h
@@ -81,7 +81,6 @@ class DbAttacherImpl : public DbAttacher
 
         QList<SqliteQueryPtr> queries;
         Db* db = nullptr;
-        Dialect dialect;
         BiStrHash dbNameToAttach;
         StrHash<Db*> nameToDbMap;
         bool mainDbNameUsed = false;