Fix type of nested properties (#1067)

Fix two bugs: - double quotes of some fields - nested properties did not work with array or function, this fixes this problem Co-authored-by: Rafał Strzaliński <[email protected]>
QuesmaOrg · Dec 6, 2024 · bbf9f3b · bbf9f3b
1 parent 80380ff
commit bbf9f3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/quesma/model/base_visitor.go b/quesma/model/base_visitor.go
@@ -77,9 +77,9 @@ func (v *BaseExprVisitor) VisitNestedProperty(e NestedProperty) interface{} {
 	if v.OverrideVisitNestedProperty != nil {
 		return v.OverrideVisitNestedProperty(v, e)
 	}
-	ColumnRef := e.ColumnRef.Accept(v).(ColumnRef)
+	expr := e.ObjectExpr.Accept(v).(Expr)
 	Property := e.PropertyName.Accept(v).(LiteralExpr)
-	return NewNestedProperty(ColumnRef, Property)
+	return NewNestedProperty(expr, Property)
 }
 
 func (v *BaseExprVisitor) VisitArrayAccess(e ArrayAccess) interface{} {

diff --git a/quesma/model/expr.go b/quesma/model/expr.go
@@ -47,12 +47,12 @@ func (e PrefixExpr) Accept(v ExprVisitor) interface{} {
 
 // NestedProperty represents a call to nested property e.g. `columnName.propertyName`
 type NestedProperty struct {
-	ColumnRef    ColumnRef
+	ObjectExpr   Expr
 	PropertyName LiteralExpr
 }
 
-func NewNestedProperty(columnRef ColumnRef, propertyName LiteralExpr) NestedProperty {
-	return NestedProperty{ColumnRef: columnRef, PropertyName: propertyName}
+func NewNestedProperty(columnRef Expr, propertyName LiteralExpr) NestedProperty {
+	return NestedProperty{ObjectExpr: columnRef, PropertyName: propertyName}
 }
 
 func (e NestedProperty) Accept(v ExprVisitor) interface{} { return v.VisitNestedProperty(e) }

diff --git a/quesma/model/expr_string_renderer.go b/quesma/model/expr_string_renderer.go
@@ -49,7 +49,7 @@ func (v *renderer) VisitPrefixExpr(e PrefixExpr) interface{} {
 }
 
 func (v *renderer) VisitNestedProperty(e NestedProperty) interface{} {
-	return fmt.Sprintf("%v.%v", e.ColumnRef.Accept(v), e.PropertyName.Accept(v))
+	return fmt.Sprintf("%v.%v", e.ObjectExpr.Accept(v), e.PropertyName.Accept(v))
 }
 
 func (v *renderer) VisitArrayAccess(e ArrayAccess) interface{} {

diff --git a/quesma/queryparser/query_parser.go b/quesma/queryparser/query_parser.go
@@ -902,7 +902,7 @@ func (cw *ClickhouseQueryTranslator) parseExists(queryMap QueryMap) model.Simple
 			sql = model.NewInfixExpr(model.NewColumnRef(fieldName), "IS", model.NewLiteral("NOT NULL"))
 		case clickhouse.ExistsAndIsArray:
 			sql = model.NewInfixExpr(model.NewNestedProperty(
-				model.NewColumnRef(fieldNameQuoted),
+				model.NewColumnRef(fieldName),
 				model.NewLiteral("size0"),
 			), "=", model.NewLiteral("0"))
 		case clickhouse.NotExists: