New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 22 insertions, 4 deletions

diff --git a/Plugins/DbAndroid/dbandroidinstance.cpp b/Plugins/DbAndroid/dbandroidinstance.cpp
index 7dce61c..c1b5629 100644
--- a/Plugins/DbAndroid/dbandroidinstance.cpp
+++ b/Plugins/DbAndroid/dbandroidinstance.cpp
@@ -50,7 +50,7 @@ QList<AliasedColumn> DbAndroidInstance::columnsForQuery(const QString& query)
 
     QList<AliasedColumn> columns;
     AliasedColumn column;
-    for (const QString& colName : results->getColumnNames())
+    for (QString& colName : results->getColumnNames())
     {
         column.setAlias(colName);
         columns << column;
@@ -63,11 +63,16 @@ SqlQueryPtr DbAndroidInstance::prepare(const QString& query)
     return SqlQueryPtr(new SqlQueryAndroid(this, connection, query));
 }
 
-QString DbAndroidInstance::getTypeLabel()
+QString DbAndroidInstance::getTypeLabel() const
 {
     return plugin->getLabel();
 }
 
+QString DbAndroidInstance::getTypeClassName() const
+{
+    return "DbAndroidInstance";
+}
+
 bool DbAndroidInstance::deregisterFunction(const QString& name, int argCount)
 {
     // Unsupported by native Android driver
@@ -76,19 +81,21 @@ bool DbAndroidInstance::deregisterFunction(const QString& name, int argCount)
     return true;
 }
 
-bool DbAndroidInstance::registerScalarFunction(const QString& name, int argCount)
+bool DbAndroidInstance::registerScalarFunction(const QString& name, int argCount, bool deterministic)
 {
     // Unsupported by native Android driver
     UNUSED(name);
     UNUSED(argCount);
+    UNUSED(deterministic);
     return true;
 }
 
-bool DbAndroidInstance::registerAggregateFunction(const QString& name, int argCount)
+bool DbAndroidInstance::registerAggregateFunction(const QString& name, int argCount, bool deterministic)
 {
     // Unsupported by native Android driver
     UNUSED(name);
     UNUSED(argCount);
+    UNUSED(deterministic);
     return true;
 }
 
@@ -112,6 +119,11 @@ bool DbAndroidInstance::isComplete(const QString& sql) const
     return DbSqlite3::complete(sql);
 }
 
+Db* DbAndroidInstance::clone() const
+{
+    return new DbAndroidInstance(plugin, name, path, connOptions);
+}
+
 bool DbAndroidInstance::isOpenInternal()
 {
     return (connection && connection->isConnected());
@@ -159,6 +171,12 @@ bool DbAndroidInstance::closeInternal()
     return true;
 }
 
+bool DbAndroidInstance::flushWalInternal()
+{
+    // WAL mode is not fully supporeted by Android plugin.
+    return true;
+}
+
 bool DbAndroidInstance::registerCollationInternal(const QString& name)
 {
     // Unsupported by native Android driver