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

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

1 files changed, 32 insertions, 0 deletions

diff --git a/Plugins/DbAndroid/dbandroidinstance.cpp b/Plugins/DbAndroid/dbandroidinstance.cpp
index 900b929..7dce61c 100644
--- a/Plugins/DbAndroid/dbandroidinstance.cpp
+++ b/Plugins/DbAndroid/dbandroidinstance.cpp
@@ -10,6 +10,7 @@
 #include "schemaresolver.h"
 #include "services/notifymanager.h"
 #include "db/dbsqlite3.h"
+#include "parser/parser.h"
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -26,6 +27,37 @@ DbAndroidInstance::~DbAndroidInstance()
     closeInternal();
 }
 
+QList<AliasedColumn> DbAndroidInstance::columnsForQuery(const QString& query)
+{
+    Parser parser;
+    bool res = parser.parse(query);
+    if (!res)
+    {
+        qWarning() << "Could not parse query for providing columnsForQuery from DbAndroid:" << query;
+        return QList<AliasedColumn>();
+    }
+
+    if (!isDataReturningQuery(parser.getQueries().last()->queryType))
+        return QList<AliasedColumn>();
+
+    SqlQueryPtr results = exec(query);
+    if (results->isError())
+    {
+        qWarning() << "Could not execute query for providing columnsForQuery from DbAndroid:" << query
+                   << ". The error was:" << results->getErrorText();
+        return QList<AliasedColumn>();
+    }
+
+    QList<AliasedColumn> columns;
+    AliasedColumn column;
+    for (const QString& colName : results->getColumnNames())
+    {
+        column.setAlias(colName);
+        columns << column;
+    }
+    return columns;
+}
+
 SqlQueryPtr DbAndroidInstance::prepare(const QString& query)
 {
     return SqlQueryPtr(new SqlQueryAndroid(this, connection, query));