(PDB-4985) Ensure an index hit for trusted facts

Author: Oana Tanasoiu

src/puppetlabs/puppetdb/query_eng/engine.clj

@@ -1806,7 +1806,7 @@
 
             [[(op :guard #{"=" ">" "<" "<=" ">=" "~"}) (column :guard validate-dotted-field) value]]
             ;; (= :inventory (get-in (meta node) [:query-context :entity]))
-            (when (string/includes? column "match(")
+            (if (string/includes? column "match(")
               (let [[head & path] (->> column
                                        utils/parse-matchfields
                                        su/dotted-query->path
@@ -1819,7 +1819,10 @@
                                     (map :path_array)
                                     (map (fn [path] (if (= (first path) "trusted") path (cons "facts" path))))
                                     (map #(string/join "." %)))]
-                (into ["or"] (map #(vector op % value) fact_paths))))
+                (into ["or"] (map #(vector op % value) fact_paths)))
+              (if (re-matches #"^trusted.*" column)
+                [op (str "facts." column) value]
+                [op column value]))
 
             [["extract" (columns :guard numeric-fact-functions?) (expr :guard no-type-restriction?)]]
             (when (= :facts (get-in meta node [:query-context :entity]))

test/puppetlabs/puppetdb/query_eng_test.clj

@@ -178,6 +178,19 @@
                       :results-query
                       first)))))
 
+(deftest index-hit-for-trusted-facts-on-inventory
+  (testing "facts.trusted.extensions and trusted.extensions should generate the same SQL"
+    (is (re-find #"WHERE \(fs.stable||fs.volatile\) @> ?"
+                 (->> ["extract" [] ["=" "facts.trusted.extensions.foo" "bar"]]
+                      (compile-user-query->sql inventory-query)
+                      :results-query
+                      first)))
+    (is (re-find #"WHERE \(fs.stable||fs.volatile\) @> ?"
+                 (->> ["extract" [] ["=" "trusted.extensions.foo" "bar"]]
+                      (compile-user-query->sql inventory-query)
+                      :results-query
+                      first)))))
+
 (deftest test-valid-query-operators
   (is (thrown-with-msg? IllegalArgumentException
                         #"'and' takes at least one argument, but none were supplied"