fix: mariadb

sequelize · May 23, 2020 · f0de18f · f0de18f
1 parent 49d7e0f
commit f0de18f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/dialects/mariadb/query.js b/lib/dialects/mariadb/query.js
@@ -92,11 +92,13 @@ class Query extends AbstractQuery {
   formatResults(data) {
     let result = this.instance;
 
-    if (this.isBulkUpdateQuery() || this.isBulkDeleteQuery()
-      || this.isUpsertQuery()) {
+    if (this.isBulkUpdateQuery() || this.isBulkDeleteQuery()) {
       return data.affectedRows;
     }
-    if (this.isInsertQuery(data)) {
+    if (this.isUpsertQuery()) {
+      return [null, data.affectedRows === 1];
+    }
+    if (this.isInsertQuery(data) || this.isUpsertQuery()) {
       this.handleInsertQuery(data);
 
       if (!this.instance) {
@@ -114,9 +116,12 @@ class Query extends AbstractQuery {
           for (let i = 0; i < data.affectedRows; i++) {
             result[i] = { [pkField]: startId + i };
           }
-          return [result, data.affectedRows];
+          response = result;
+        } else {
+          response = data[this.getInsertIdField()];
         }
-        return [data[this.getInsertIdField()], data.affectedRows];
+
+        return [response, data.affectedRows];
       }
     }