Add support for postgres json operators `->`, `->>`, `#>`, and `#>>` #458

poonai · 2022-04-13T11:10:12Z

arrow are used to represent nested field of json.

SELECT info->'items'->>'product' FROM orders

This PR adds support to parse identifier which are separated using arrow

Signed-off-by: password rbalajis25@gmail.com

Signed-off-by: password <rbalajis25@gmail.com>

coveralls · 2022-04-13T11:12:33Z

Pull Request Test Coverage Report for Build 2187863098

74 of 93 (79.57%) changed or added relevant lines in 4 files are covered.
242 unchanged lines in 3 files lost coverage.
Overall coverage decreased (-0.1%) to 90.431%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
src/parser.rs	13	17	76.47%
src/ast/mod.rs	10	16	62.5%
src/tokenizer.rs	13	22	59.09%

Files with Coverage Reduction	New Missed Lines	%
src/test_utils.rs	1	83.08%
src/parser.rs	91	83.32%
src/ast/mod.rs	150	77.77%

Totals
Change from base Build 2085061398:	-0.1%
Covered Lines:	7957
Relevant Lines:	8799

💛 - Coveralls

Signed-off-by: password <rbalajis25@gmail.com>

alamb

According to

https://www.postgresql.org/docs/current/functions-json.html

It appears there are also #> and #>> operators. I wonder if you have thought about supporting them?

src/ast/mod.rs

src/tokenizer.rs

poonai · 2022-04-17T10:58:11Z

It appears there are also #> and #>> operators. I wonder if you have thought about supporting them?

done 😃

Signed-off-by: poonai <rbalajis25@gmail.com>

alamb

Thanks @poonai -- I think this is quite close (the only thing I think that is required is the Display for Token::LongArrow)

alamb · 2022-04-18T20:39:39Z

src/ast/mod.rs

+            JsonOperator::LongArrow => {
+                write!(f, "->>")
+            }
+            JsonOperator::Arrow => {
+                write!(f, "->")
+            }


I don't think it matters, but it would be nice to keep the order of the variants consistent

Suggested change

JsonOperator::LongArrow => {

write!(f, "->>")

}

JsonOperator::Arrow => {

write!(f, "->")

}

JsonOperator::Arrow => {

write!(f, "->")

}

JsonOperator::LongArrow => {

write!(f, "->>")

}

alamb · 2022-04-18T20:39:59Z

src/ast/mod.rs

@@ -192,6 +225,12 @@ pub enum Expr {
    Identifier(Ident),
    /// Multi-part identifier, e.g. `table_alias.column` or `schema.table.col`
    CompoundIdentifier(Vec<Ident>),
+    /// JsonIdentifier eg: data->'tags'


Suggested change

/// JsonIdentifier eg: data->'tags'

/// JSON access (postgres) eg: data->'tags'

alamb · 2022-04-18T20:40:13Z

src/tokenizer.rs

@@ -141,6 +141,14 @@ pub enum Token {
    PGCubeRoot,
    /// `?` or `$` , a prepared statement arg placeholder
    Placeholder(String),
+    /// ->, used as a operator to extract json field in PostgreSQL
+    Arrow,
+    /// -->, used as a operator to extract json field as text in PostgreSQL


Suggested change

/// -->, used as a operator to extract json field as text in PostgreSQL

/// ->>, used as a operator to extract json field as text in PostgreSQL

alamb · 2022-04-18T20:40:22Z

src/tokenizer.rs

@@ -197,6 +205,10 @@ impl fmt::Display for Token {
            Token::PGSquareRoot => f.write_str("|/"),
            Token::PGCubeRoot => f.write_str("||/"),
            Token::Placeholder(ref s) => write!(f, "{}", s),
+            Token::Arrow => write!(f, "->"),
+            Token::LongArrow => write!(f, "-->"),


Suggested change

Token::LongArrow => write!(f, "-->"),

Token::LongArrow => write!(f, "->>"),

I wonder why the tests didn't cover this? I think there is a function that verifies that a parsed sql statement is then displayed in the same way

We are printing JsonOperator not the Token. so it escaped 😅

Signed-off-by: password <rbalajis25@gmail.com>

alamb

Thanks @poonai !

add support for postgres json selection

620bcc6

Signed-off-by: password <rbalajis25@gmail.com>

poonai mentioned this pull request Apr 13, 2022

Add support for json in postgres query inspektor-dev/inspektor#45

Open

fix clippy

90afe08

Signed-off-by: password <rbalajis25@gmail.com>

alamb reviewed Apr 15, 2022

View reviewed changes

src/ast/mod.rs Outdated Show resolved Hide resolved

src/ast/mod.rs Outdated Show resolved Hide resolved

src/tokenizer.rs Outdated Show resolved Hide resolved

add support for postgres #> and #>> json operator

0013510

fix clippy

60cac39

Signed-off-by: poonai <rbalajis25@gmail.com>

alamb changed the title ~~add support for postgres json selection~~ Add support for postgres json operators ->m ->> Apr 18, 2022

alamb changed the title ~~Add support for postgres json operators ->m ->>~~ Add support for postgres json operators ->, ->>, #>, and #>> Apr 18, 2022

alamb reviewed Apr 18, 2022

View reviewed changes

resolve comments

d48b3fa

Signed-off-by: password <rbalajis25@gmail.com>

alamb approved these changes Apr 19, 2022

View reviewed changes

alamb merged commit d035784 into apache:main Apr 19, 2022

	/// JsonIdentifier eg: data->'tags'
	/// JSON access (postgres) eg: data->'tags'

	/// -->, used as a operator to extract json field as text in PostgreSQL
	/// ->>, used as a operator to extract json field as text in PostgreSQL

	Token::LongArrow => write!(f, "-->"),
	Token::LongArrow => write!(f, "->>"),

Add support for postgres json operators ->, ->>, #>, and #>> #458

Add support for postgres json operators ->, ->>, #>, and #>> #458

Uh oh!

Conversation

poonai commented Apr 13, 2022

Uh oh!

coveralls commented Apr 13, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 2187863098

💛 - Coveralls

Uh oh!

alamb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

poonai commented Apr 17, 2022

Uh oh!

alamb left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alamb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Add support for postgres json operators `->`, `->>`, `#>`, and `#>>` #458

Add support for postgres json operators `->`, `->>`, `#>`, and `#>>` #458

coveralls commented Apr 13, 2022 •

edited

Loading