Skip to content

Support jsonb_typeof in pql queries #3576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: 6.x
Choose a base branch
from
Draft

Support jsonb_typeof in pql queries #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion resources/puppetlabs/puppetdb/pql/pql-grammar.ebnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ extract = <lbracket>, [<whitespace>], [extractfields], [<whitespace>], <rbracket
expr-or = expr-and { <whitespace>, or, <whitespace>, expr-or };
expr-and = expr-not { <whitespace>, and, <whitespace>, expr-and };
expr-not = ( not, [<whitespace>], expr-not ) | expr-rest;
<expr-rest> = ( <lparens>, [<whitespace>], expression, [<whitespace>], <rparens> ) | condexpression | condexpnull | subquery;
<expr-rest> = ( <lparens>, [<whitespace>], expression, [<whitespace>], <rparens> ) | condexpression | condexpnull | subquery | jsonbexpr;

(* Implicit subqueries *)
subquery = entity, [<whitespace>], where;
Expand Down Expand Up @@ -85,6 +85,10 @@ groupedarglist = <lparens>, [<whitespace>], [arglist], [<whitespace>], <rparens>
<arglist> = (field | string), [ [<whitespace>], <','>, [<whitespace>], stringlist ];
<stringlist> = string , [ [<whitespace>], <','>, [<whitespace>], stringlist ];

(* jsonb_typeof part *)
jsonbexpr = jsonb, <lparens>, [<whitespace>], field, [<whitespace>], <rparens>, [<whitespace>], condmatch, [<whitespace>], string;
<jsonb> = 'jsonb_typeof';

(* Represents a field from an entity *)
field = #'[a-zA-Z0-9_]+\??' | (dottedfield, fieldpath);
<fieldpath> = <'.'>, (quotedfield | standardfield | matchfield) , [fieldpath];
Expand Down
5 changes: 5 additions & 0 deletions src/puppetlabs/puppetdb/pql/transform.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
[entity args]
(vec (concat ["function" entity] args)))

(defn transform-jsonb-typeof
[func-name field eq-operator type]
[eq-operator ["function" func-name field] type])

(defn transform-condexpression
[a b c]
(case b
Expand Down Expand Up @@ -145,6 +149,7 @@
:expr-and transform-expr-and
:expr-not transform-expr-not
:function transform-function
:jsonbexpr transform-jsonb-typeof
:condexpression transform-condexpression
:condexpnull transform-condexpnull
:groupedarglist transform-groupedlist
Expand Down