(PDB-5161) Remove maybe-strip-escape-quotes and dotted-query-to-path

...now that they've been completely replaced by parse-field.

Author: rbrw

src/puppetlabs/puppetdb/query_eng/parse.clj

@@ -163,40 +163,4 @@
   [names]
   (str/join \. (map quote-path-name-for-field-str names)))
 
-(defn maybe-strip-escaped-quotes
-  [s]
-  (if (and (> (count s) 1)
-           (str/starts-with? s "\"")
-           (str/ends-with? s "\""))
-    (subs s 1 (dec (count s)))
-    s))
-
-(defn- handle-quoted-path-segment
-  [v]
-  (loop [result []
-         [s & splits] v]
-    (let [s-len (count s)]
-      (if (and (str/ends-with? s "\"")
-               (not (= s-len 1))
-               (or (<= s-len 2) (not (= (nth s (- s-len 2)) \\))))
-        [(str/join "." (conj result s)) splits]
-        (recur (conj result s) splits)))))
-
-(defn dotted-query->path
-  [string]
-  (loop [[s & splits :as v] (str/split string #"\.")
-         result []]
-    (if (nil? s)
-      result
-      (let [s-len (count s)]
-        (if (and (str/starts-with? s "\"")
-                 (or (= s-len 1)
-                     (or (not (str/ends-with? s "\""))
-                         (and (str/ends-with? s "\"")
-                              (>= s-len 2)
-                              (= (nth s (- s-len 2)) \\)))))
-          (let [[x xs] (handle-quoted-path-segment v)]
-            (recur xs (conj result x)))
-          (recur splits (conj result s)))))))
-
 (set! *warn-on-reflection* warn-on-reflection-orig)

test/puppetlabs/puppetdb/pql/parser_test.clj

@@ -3,8 +3,7 @@
    [clojure.string :as str]
    [clojure.test :refer :all]
    [instaparse.core :as insta]
-   [puppetlabs.puppetdb.pql :refer [parse]]
-   [puppetlabs.puppetdb.query-eng.parse :refer [dotted-query->path]]))
+   [puppetlabs.puppetdb.pql :refer [parse]]))
 
 ;; These tests are ordered the same as in the EBNF file, so one can
 ;; develop the expressions and tests side-by-side.
@@ -564,18 +563,18 @@
       ""))
 
   (testing "field"
-    (are [in] (= (parse in :start :field)
-                 (vec (concat [:field] (dotted-query->path in))))
-         "certname"
-         "value"
-         "field_underscore"
-         "facts.operatingsystem.κόσμε"
-         "facts.\"quoted field\".foo"
-         "facts.\"field.with.dot\".foo"
-         "facts.\"field-with-dash\".foo"
-         "trusted.authenticated"
-         "parameters.😁"
-         "latest_report?")
+    (doseq [[field expected]
+            [["certname" [:field "certname"]]
+             ["value" [:field "value"]]
+             ["field_underscore" [:field "field_underscore"]]
+             ["facts.operatingsystem.κόσμε" [:field "facts" "operatingsystem" "κόσμε"]]
+             ["facts.\"quoted field\".foo" [:field "facts" "\"quoted field\"" "foo"]]
+             ["facts.\"field.with.dot\".foo" [:field "facts" "\"field.with.dot\"" "foo"]]
+             ["facts.\"field-with-dash\".foo" [:field "facts" "\"field-with-dash\"" "foo"]]
+             ["trusted.authenticated" [:field "trusted" "authenticated"]]
+             ["parameters.😁" [:field "parameters" "😁"]]
+             ["latest_report?" [:field "latest_report?"]]]]
+      (is (= expected (parse field :start :field))))
 
     (are [in] (insta/failure? (insta/parse parse in :start :field))
       "'asdf'"

test/puppetlabs/puppetdb/query_eng/parse_test.clj

@@ -114,27 +114,3 @@
   (is (= "x.y" (parse/path-names->field-str ["x" "y"])))
   (is (= "x.y z" (parse/path-names->field-str ["x" "y z"])))
   (is (= "x.\"y.z\"" (parse/path-names->field-str ["x" "y.z"]))))
-
-(deftest dotted-query-to-path
-  (testing "vanilla dotted path"
-    (is (= (parse/dotted-query->path "facts.foo.bar")
-           ["facts" "foo" "bar"])))
-  (testing "dot inside quotes"
-    (is (= (parse/dotted-query->path "facts.\"foo.bar\".baz")
-           ["facts" "\"foo.bar\"" "baz"]))
-    (is (= (parse/dotted-query->path "facts.\"foo.baz.bar\".baz")
-           ["facts" "\"foo.baz.bar\"" "baz"]))
-    (is (= (parse/dotted-query->path "facts.\"foo.bar\".\"baz.bar\"")
-           ["facts" "\"foo.bar\"" "\"baz.bar\""])))
-  (testing "consecutive dots"
-    (is (= (parse/dotted-query->path "facts.\"foo..bar\"")
-           ["facts" "\"foo..bar\""])))
-  (testing "path with quote in middle"
-    (is (= (parse/dotted-query->path "facts.foo\"bar.baz")
-           ["facts" "foo\"bar" "baz"])))
-  (testing "path containing escaped quote"
-    (is (= (parse/dotted-query->path "\"fo\\\".o\"")
-           ["\"fo\\\".o\""])))
-  (testing "dotted path with quote"
-    (is (= (parse/dotted-query->path "facts.\"foo.bar\"baz\".biz")
-           ["facts" "\"foo.bar\"baz\"" "biz"]))))