Commit 56e68f3

authored

feat: refactor logical filters and add tests (elchicodepython#17)

1 parent 4a3d123 commit 56e68f3Copy full SHA for 56e68f3

File tree

+24

-11

lines changed

+24

-11

lines changed

Lines changed: 3 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,28 +7,20 @@ def __init__(self, *filters: List[WhereFilter]):`
`7`	`7`	`self.__filters = filters`
`8`	`8`
`9`	`9`	`def get_where(self) -> str:`
`10`		`- return (`
`11`		`- "("`
`12`		`- + "~or".join([filter.get_where() for filter in self.__filters])`
`13`		`- + ")"`
`14`		`- )`
	`10`	`+ return f"({'~or'.join([filter.get_where() for filter in self.__filters])})"`
`15`	`11`
`16`	`12`
`17`	`13`	`class And(WhereFilter):`
`18`	`14`	`def __init__(self, *filters: List[WhereFilter]):`
`19`	`15`	`self.__filters = filters`
`20`	`16`
`21`	`17`	`def get_where(self) -> str:`
`22`		`- return (`
`23`		`- "("`
`24`		`- + "~and".join([filter.get_where() for filter in self.__filters])`
`25`		`- + ")"`
`26`		`- )`
	`18`	`+ return f"({'~and'.join([filter.get_where() for filter in self.__filters])})"`
`27`	`19`
`28`	`20`
`29`	`21`	`class Not(WhereFilter):`
`30`	`22`	`def __init__(self, filter: WhereFilter):`
`31`	`23`	`self.__filter = filter`
`32`	`24`
`33`	`25`	`def get_where(self) -> str:`
`34`		`- return "~not"+self.__filter.get_where()`
	`26`	`+ return f"~not{self.__filter.get_where()}"`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+from nocodb import filters`
	`2`	`+`
	`3`	`+`
	`4`	`+def test_or_with_two_filters():`
	`5`	`+ filter1 = filters.EqFilter("column1", "value1")`
	`6`	`+ filter2 = filters.EqFilter("column2", "value2")`
	`7`	`+ or_filter = filters.Or(filter1, filter2)`
	`8`	`+ assert or_filter.get_where() == "((column1,eq,value1)~or(column2,eq,value2))"`
	`9`	`+`
	`10`	`+`
	`11`	`+def test_and_with_two_filters():`
	`12`	`+ filter1 = filters.And(filters.EqFilter("column1", "value1"))`
	`13`	`+ filter2 = filters.And(filters.EqFilter("column2", "value2"))`
	`14`	`+ and_filter = filters.And(filter1, filter2)`
	`15`	`+ assert and_filter.get_where() == "(((column1,eq,value1))~and((column2,eq,value2)))"`
	`16`	`+`
	`17`	`+`
	`18`	`+def test_not_filter():`
	`19`	`+ filter = filters.EqFilter("column", "value")`
	`20`	`+ not_filter = filters.Not(filter)`
	`21`	`+ assert not_filter.get_where() == "~not(column,eq,value)"`

Comments

(0)