Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 5 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp b/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp
index 4e2d9b6..c10e8f7 100644
--- a/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/querygenerator.cpp
@@ -87,7 +87,10 @@ QString QueryGenerator::generateUpdateOfTable(Db* db, const QString& database, c
 
     // If no values were given, we simply use column names as values everywhere
     if (values.isEmpty())
-        return tplWithWhere.arg(target, commonColumnStr, commonColumnStr);
+    {
+        QString conditionStr = commonUpdateCols.join(" AND ");
+        return tplWithWhere.arg(target, commonColumnStr, conditionStr);
+    }
 
     // If values were given, then they will be used in WHERE clause
     QStringList valueCols = values.keys();
@@ -126,7 +129,7 @@ QString QueryGenerator::generateDeleteFromTable(Db* db, const QString& database,
             conditionCols << conditionColTpl.arg(wrapObjIfNeeded(col, dialect), wrapString(col));
 
         // Put it to comma spearated string
-        QString conditionStr = conditionCols.join(", ");
+        QString conditionStr = conditionCols.join(" AND ");
 
         return tplWithWhere.arg(target, conditionStr);
     }