sqlite: Update usage update stmt

Need to include NetworkAddressFamily, otherwise update will always match
and we will never get two usage rows.

Author: kristrev

metadata_writer_inventory_conn.c

@@ -291,6 +291,7 @@ static int32_t md_inventory_execute_update_usage(struct md_writer_sqlite *mws,
 
     if (sqlite3_bind_int64(stmt, 1, mce->rx_bytes) ||
         sqlite3_bind_int64(stmt, 2, mce->tx_bytes) ||
+        sqlite3_bind_int(stmt, 4, mce->network_address_family) ||
         sqlite3_bind_int64(stmt, 6, date_start)) {
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to UPDATE usage query\n");
         return SQLITE_ERROR;
@@ -299,19 +300,19 @@ static int32_t md_inventory_execute_update_usage(struct md_writer_sqlite *mws,
     if (mce->imei) {
         if (sqlite3_bind_text(stmt, 3, mce->imei, strlen(mce->imei),
                 SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 4, mce->interface_id,
+            sqlite3_bind_text(stmt, 5, mce->interface_id,
                 strlen(mce->interface_id), SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 5, mce->imsi,
+            sqlite3_bind_text(stmt, 6, mce->imsi,
                 strlen(mce->imsi), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to UPDATE usage query #2\n");
             return SQLITE_ERROR;
         }
     } else {
         if (sqlite3_bind_text(stmt, 3, mce->interface_id,
                 strlen(mce->interface_id), SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 4, no_iccid_str,
-                strlen(no_iccid_str), SQLITE_STATIC) ||
             sqlite3_bind_text(stmt, 5, no_iccid_str,
+                strlen(no_iccid_str), SQLITE_STATIC) ||
+            sqlite3_bind_text(stmt, 6, no_iccid_str,
                 strlen(no_iccid_str), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to UPDATE usage query #2\n");
             return SQLITE_ERROR;

metadata_writer_sqlite.h

@@ -187,7 +187,7 @@
 #define UPDATE_USAGE        "UPDATE DataUse SET " \
                             "RxData = RxData + ?, TxData = TxData + ? " \
                             "WHERE " \
-                            "DeviceId=? AND SimCardIccid=? AND SimCardImsi=? AND Timestamp=?"
+                            "DeviceId=? AND NetworkAddressFamily=? AND SimCardIccid=? AND SimCardImsi=? AND Timestamp=?"
 
 #define UPDATE_EVENT_ID     "UPDATE NetworkEvent SET " \
                             "NodeId=? "\