Changeset 21399 for trunk/ippTools/src/difftool.c

Timestamp:

Feb 6, 2009, 2:26:38 PM (17 years ago)

Author:

Paul Price

Message:

Following the reworked diff schema, a diffRun may have state 'new'
even if its components have failed. In that case, the delete and
update parts of revertdiffskyfile would alter a different number of
rows (or no rows would be updated at all), causing an error. But it's
not an error, so removed the check which is no longer valid.

File:

• trunk/ippTools/src/difftool.c (modified) (3 diffs)

trunk/ippTools/src/difftool.c

@@ -655 +655 @@
     }
 
-    int num;                            // Number affected
-
     // Update state to 'new'
     {
@@ -684 +682 @@
         psFree(query);
 
-        num = psDBAffectedRows(config->dbh);
-
-        if (num < 1) {
-            psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            return false;
-        }
+        psLogMsg("diftool", PS_LOG_INFO, "Updated %" PRIu64 " rows", psDBAffectedRows(config->dbh));
     }
 
@@ -722 +712 @@
         psFree(query);
 
-        if (psDBAffectedRows(config->dbh) != num) {
-            psError(PS_ERR_UNKNOWN, false, "Updated and deleted different number of entries!");
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            return false;
-        }
+        psLogMsg("difftool", PS_LOG_INFO, "Deleted %" PRIu64 " rows", psDBAffectedRows(config->dbh));
     }