Merge pull request #1751 from craigcomstock/ENT-5562/master

ENT-5562 Changed m_inventory dumping behavior to exclude when values is null (3.12.x)

Author: nickanderson

templates/federated_reporting/dump.sh

@@ -58,7 +58,8 @@ log "Dumping tables: $CFE_FR_TABLES"
 
   # in case of 3.12 must copy m_inventory as if it was __inventory
   if [[ "$CFE_VERSION" =~ "3.12." ]]; then
-    "$CFE_BIN_DIR"/psql cfdb -c "COPY (SELECT * FROM m_inventory) TO STDOUT CSV QUOTE '''' FORCE QUOTE *" |
+    # pg_dump will not dump the contents of views so we must run the following SQL:
+    "$CFE_BIN_DIR"/psql cfdb -c "COPY (SELECT * FROM m_inventory WHERE values IS NOT NULL) TO STDOUT CSV QUOTE '''' FORCE QUOTE *" |
       sed -e 's.^.INSERT INTO __inventory (hostkey, values) VALUES (.' \
           -e 's.$.);.'
   fi