Merge pull request #502 from gfrey/fix_field_parser

Fix field schema parsing

Author: a-hilaly

pkg/simpleschema/field.go

@@ -36,10 +36,7 @@ func parseFieldSchema(fieldSchema string) (string, []*Marker, error) {
 	}
 
 	// split the type and markers if possible
-	parts := strings.Split(fieldSchema, "|")
-	if len(parts) > 2 {
-		return "", nil, fmt.Errorf("invalid type: %s", fieldSchema)
-	}
+	parts := strings.SplitN(fieldSchema, "|", 2)
 
 	// trim spaces from the type
 	typ := strings.TrimSpace(parts[0])

pkg/simpleschema/field_test.go

@@ -72,6 +72,15 @@ func TestParseFieldSchema(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name:        "array field with complex validation",
+			fieldSchema: "[]string | validation=\"self.all(x, startsWith(x, 'foo') || startsWith(x, 'bar'))\"",
+			wantType:    "[]string",
+			wantMarkers: []*Marker{
+				{MarkerType: MarkerTypeValidation, Key: "validation", Value: "self.all(x, startsWith(x, 'foo') || startsWith(x, 'bar'))"},
+			},
+			wantErr: false,
+		},
 	}
 
 	for _, tt := range tests {