Revert "issue #24005: do not delete report rows upon build"

diff --git a/scripts/lib/build_database_util.js b/scripts/lib/build_database_util.js
index e2da5e7..0cbb145 100644 (file)
--- a/scripts/lib/build_database_util.js
+++ b/scripts/lib/build_database_util.js
@@ -61,7 +61,7 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
       tableName = defaultSchema ? defaultSchema + ".pkgreport" : "report",
       description,
       disableSql,
-      updateSql,
+      deleteSql,
       insertSql,
       enableSql;
 
@@ -80,26 +80,20 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
 
     disableSql = "ALTER TABLE " + tableName + " DISABLE TRIGGER ALL;";
 
+    deleteSql = "delete from " + tableName + " " +
+      "where report_name = '" + name +
+      "' and report_grade = " + grade + ";";
+
     insertSql = "insert into " + tableName + " (report_name, report_descrip, " +
-      "report_source, report_loaddate, report_grade) select " +
+      "report_source, report_loaddate, report_grade) VALUES (" +
       "'" + name + "'," +
       "$$" + description + "$$," +
       "$$" + content + "$$," +
-      "now(), " + grade +
-      " where not exists (select c.report_id from " + tableName + " c " +
-      "where report_name = '" + name +
-      "' and report_grade = " + grade + ");";
-
-    updateSql = "update " + tableName + " set " +
-      " report_descrip = $$" + description +
-      "$$, report_source = $$" + content +
-      "$$, report_loaddate = now() " +
-      "where report_name = '" + name +
-      "' and report_grade = " + grade + ";";
+      "now(), " + grade + ");";
 
     enableSql = "ALTER TABLE " + tableName + " ENABLE TRIGGER ALL;";
 
-    return disableSql + insertSql + updateSql + enableSql;
+    return disableSql + deleteSql + insertSql + enableSql;
   };
 
   var convertFromScript = function (content, filename, defaultSchema) {
@@ -107,29 +101,25 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
       tableName = defaultSchema ? defaultSchema + ".pkgscript" : "unknown",
       notes = "", //"xtMfg package",
       disableSql,
+      deleteSql,
       insertSql,
-      updateSql,
       enableSql;
 
     disableSql = "ALTER TABLE " + tableName + " DISABLE TRIGGER ALL;";
 
+    deleteSql = "delete from " + tableName + " " +
+      "where script_name = '" + name +
+      "';";
+
     insertSql = "insert into " + tableName + " (script_name, script_order, script_enabled, " +
-      "script_source, script_notes) select " +
+      "script_source, script_notes) VALUES (" +
       "'" + name + "', 0, TRUE, " +
       "$$" + content + "$$," +
-      "'" + notes + "'" +
-      " where not exists (select c.script_id from " + tableName + " c " +
-      "where script_name = '" + name + "');";
-
-    updateSql = "update " + tableName + " set " +
-      "script_name = '" + name + "', script_order = 0, script_enabled = TRUE, " +
-      "script_source = $$" + content +
-      "$$, script_notes = '" + notes + "' " +
-      "where script_name = '" + name + "';";
+      "'" + notes + "');";
 
     enableSql = "ALTER TABLE " + tableName + " ENABLE TRIGGER ALL;";
 
-    return disableSql + insertSql + updateSql + enableSql;
+    return disableSql + deleteSql + insertSql + enableSql;
   };
 
   var convertFromUiform = function (content, filename, defaultSchema) {
@@ -137,28 +127,25 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
       tableName = defaultSchema ? defaultSchema + ".pkguiform" : "unknown",
       notes = "", //"xtMfg package",
       disableSql,
+      deleteSql,
       insertSql,
-      updateSql,
       enableSql;
 
     disableSql = "ALTER TABLE " + tableName + " DISABLE TRIGGER ALL;";
 
+    deleteSql = "delete from " + tableName + " " +
+      "where uiform_name = '" + name +
+      "';";
+
     insertSql = "insert into " + tableName + " (uiform_name, uiform_order, uiform_enabled, " +
-      "uiform_source, uiform_notes) select " +
+      "uiform_source, uiform_notes) VALUES (" +
       "'" + name + "', 0, TRUE, " +
       "$$" + content + "$$," +
-      "'" + notes + "' " +
-      " where not exists (select c.uiform_id from " + tableName + " c " +
-      "where uiform_name = '" + name + "');";
-
-    updateSql = "update " + tableName + " set uiform_name = '" +
-      name + "', uiform_order = 0, uiform_enabled = TRUE, " +
-      "uiform_source = $$" + content + "$$, uiform_notes = '" + notes + "' " +
-      "where uiform_name = '" + name + "';";
+      "'" + notes + "');";
 
     enableSql = "ALTER TABLE " + tableName + " ENABLE TRIGGER ALL;";
 
-    return disableSql + insertSql + updateSql + enableSql;
+    return disableSql + deleteSql + insertSql + enableSql;
   };
 
   var conversionMap = {