Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 14 insertions, 4 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h
index 7a84ec2..9cb58aa 100644
--- a/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h
+++ b/SQLiteStudio3/coreSQLiteStudio/db/abstractdb3.h
@@ -868,7 +868,8 @@ bool AbstractDb3<T>::Query::execInternal(const QList<QVariant>& args)
     if (res != T::OK)
         return false;
 
-    for (int paramIdx = 1; paramIdx <= queryWithParams.second; paramIdx++)
+
+    for (int paramIdx = 1, argCount = args.size(); paramIdx <= queryWithParams.second && paramIdx <= argCount; paramIdx++)
     {
         res = bindParam(paramIdx, args[paramIdx-1]);
         if (res != T::OK)
@@ -906,16 +907,25 @@ bool AbstractDb3<T>::Query::execInternal(const QHash<QString, QVariant>& args)
     if (res != T::OK)
         return false;
 
-    int paramIdx = 1;
-    foreach (const QString& paramName, queryWithParams.second)
+    int paramIdx = -1;
+    for (const QString& paramName : queryWithParams.second)
     {
         if (!args.contains(paramName))
         {
+            qWarning() << "Could not bind parameter" << paramName << "because it was not found in passed arguments.";
+            setError(SqlErrorCode::OTHER_EXECUTION_ERROR, "Error while preparing statement: could not bind parameter " + paramName);
+            return false;
+        }
+
+        paramIdx = T::bind_parameter_index(stmt, paramName.toUtf8().constData());
+        if (paramIdx <= 0)
+        {
+            qWarning() << "Could not bind parameter" << paramName << "because it was not found in prepared statement.";
             setError(SqlErrorCode::OTHER_EXECUTION_ERROR, "Error while preparing statement: could not bind parameter " + paramName);
             return false;
         }
 
-        res = bindParam(paramIdx++, args[paramName]);
+        res = bindParam(paramIdx, args[paramName]);
         if (res != T::OK)
         {
             db->extractLastError();