From 1fdc150116cad39aae5c5da407c3312b47a59e3a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 17 Dec 2021 07:06:30 -0500 Subject: New upstream version 3.3.3+dfsg1. --- .../sqlitestudiocli/commands/clicommand.cpp | 34 +++++++++------------- .../sqlitestudiocli/commands/clicommandsql.cpp | 3 +- .../sqlitestudiocli/commands/clicommandtables.cpp | 2 +- .../sqlitestudiocli/commands/clicommandtree.cpp | 2 +- 4 files changed, 17 insertions(+), 24 deletions(-) (limited to 'SQLiteStudio3/sqlitestudiocli/commands') diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp index 20f180e..e23a042 100644 --- a/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp +++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp @@ -147,14 +147,12 @@ QStringList CliCommand::getCompletionTables() if (!cli->getCurrentDb()) return results; - Dialect dialect = Dialect::Sqlite3; - SchemaResolver resolver(cli->getCurrentDb()); resolver.setIgnoreSystemObjects(true); - results += wrapObjNamesIfNeeded(resolver.getTables(), dialect); - results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTables("temp"), dialect)); + results += wrapObjNamesIfNeeded(resolver.getTables()); + results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTables("temp"))); for (const QString& database : resolver.getDatabases()) - results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getTables(database), dialect)); + results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getTables(database))); return results; } @@ -165,14 +163,12 @@ QStringList CliCommand::getCompletionIndexes() if (!cli->getCurrentDb()) return results; - Dialect dialect = Dialect::Sqlite3; - SchemaResolver resolver(cli->getCurrentDb()); resolver.setIgnoreSystemObjects(true); - results += wrapObjNamesIfNeeded(resolver.getIndexes(), dialect); - results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getIndexes("temp"), dialect)); + results += wrapObjNamesIfNeeded(resolver.getIndexes()); + results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getIndexes("temp"))); for (const QString& database : resolver.getDatabases()) - results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getIndexes(database), dialect)); + results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getIndexes(database))); return results; } @@ -183,14 +179,12 @@ QStringList CliCommand::getCompletionTriggers() if (!cli->getCurrentDb()) return results; - Dialect dialect = Dialect::Sqlite3; - SchemaResolver resolver(cli->getCurrentDb()); resolver.setIgnoreSystemObjects(true); - results += wrapObjNamesIfNeeded(resolver.getTriggers(), dialect); - results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTriggers("temp"), dialect)); + results += wrapObjNamesIfNeeded(resolver.getTriggers()); + results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTriggers("temp"))); for (const QString& database : resolver.getDatabases()) - results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getTriggers(database), dialect)); + results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getTriggers(database))); return results; } @@ -201,14 +195,12 @@ QStringList CliCommand::getCompletionViews() if (!cli->getCurrentDb()) return results; - Dialect dialect = Dialect::Sqlite3; - SchemaResolver resolver(cli->getCurrentDb()); resolver.setIgnoreSystemObjects(true); - results += wrapObjNamesIfNeeded(resolver.getViews(), dialect); - results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getViews("temp"), dialect)); + results += wrapObjNamesIfNeeded(resolver.getViews()); + results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getViews("temp"))); for (const QString& database : resolver.getDatabases()) - results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getViews(database), dialect)); + results += prefixEach(wrapObjIfNeeded(database)+".", wrapObjNamesIfNeeded(resolver.getViews(database))); return results; } @@ -274,7 +266,7 @@ QStringList CliCommand::getCompletionInternalDbs() return results; SchemaResolver resolver(cli->getCurrentDb()); - results += resolver.getDatabases().toList(); + results += resolver.getDatabases().values(); results << "main" << "temp"; results.sort(Qt::CaseInsensitive); return results; diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp index 4b66592..cb89dfe 100644 --- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp +++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp @@ -8,6 +8,7 @@ #include "common/unused.h" #include "cli_config.h" #include "cliutils.h" +#include "common/compatibility.h" #include #include @@ -290,7 +291,7 @@ void CliCommandSql::shrinkColumns(QList& colu previousTotalWidth = totalWidth; // Sort columns by current widths - qSort(columnWidths); + sSort(columnWidths); // See if we can shrink headers only, or we already need to shrink the data for (SortedColumnWidth* colWidth : columnWidths) diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp index 8a8f5dc..8f79e82 100644 --- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp +++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp @@ -41,7 +41,7 @@ void CliCommandTables::execute() dbList << "main" << "temp"; dbList += resolver.getDatabases(); - int width = longest(dbList.toList()).length(); + int width = longest(dbList.values()).length(); width = qMax(width, tr("Database").length()); println(pad(tr("Database"), width, ' ') + " " + tr("Table")); diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp index c99fe66..0fc359e 100644 --- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp +++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp @@ -27,7 +27,7 @@ void CliCommandTree::execute() else { databases << "main" << "temp"; - databases += resolver.getDatabases().toList(); + databases += resolver.getDatabases().values(); } AsciiTree tree; -- cgit v1.2.3