Merge pull request #81 from ovh/fix/filterbylabels

fix(filterbylabels): fix filterbylabels when using an ident in query

Author: Florentin DUBOIS

tsl/genericParser.go

@@ -300,6 +300,13 @@ loop:
 				p.Unscan()
 
 				instruction, err = p.parsePostVariables(pos, lit, instruction.connectStatement, false, loadVariable)
+
+				// resets select frameworks pointer
+				frameworks := make([]FrameworkStatement, 0)
+				for _, item := range instruction.selectStatement.frameworks {
+					frameworks = append(frameworks, item)
+				}
+				instruction.selectStatement.frameworks = frameworks
 				if err != nil {
 					return nil, nil, err
 				}

tsl/statements.go

@@ -293,7 +293,8 @@ func (from FromStatement) String() string {
 
 func (framework FrameworkStatement) String() string {
 	attributes := AttributesToString(framework.attributes)
-	return " FrameworkStatement{ op: " + framework.operator.String() + "; attributes: " + attributes + "}"
+	unknown := UnknownAttributesToString(framework.unNamedAttributes)
+	return " FrameworkStatement{ op: " + framework.operator.String() + "; attributes: " + attributes + "; unknown" + unknown + "}"
 }
 
 func (field InternalField) String() string {
@@ -318,3 +319,13 @@ func AttributesToString(attributes map[PrefixAttributes]InternalField) string {
 
 	return buffer.String()
 }
+
+// UnknownAttributesToString transform an UnkonwAttributes map into string
+func UnknownAttributesToString(attributes map[int]InternalField) string {
+	attrs := make([]string, len(attributes))
+	i := 0
+	for k, v := range attributes {
+		attrs[i] = fmt.Sprintf("%d:%s", k, v)
+	}
+	return fmt.Sprintf("{%s}", strings.Join(attrs, ", "))
+}