Merge branch 'ttacon-master' into develop

dancannon · dancannon · commit 304dfe4c56b1 · 2015-03-04T22:49:46.000Z
diff --git a/pseudotypes.go b/pseudotypes.go
@@ -214,6 +214,6 @@ func reqlGeometryToNativeGeometry(obj map[string]interface{}) (interface{}, erro
 			}, nil
 		}
 	} else {
-		return nil, fmt.Errorf("pseudo-type GEOMETRY object %v field has unknown type %s", typ)
+		return nil, fmt.Errorf("pseudo-type GEOMETRY object %v field has unknown type %s", obj, typ)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,6 @@ func reqlGeometryToNativeGeometry(obj map[string]interface{}) (interface{}, erro`
`214`	`214`	`}, nil`
`215`	`215`	`}`
`216`	`216`	`} else {`
`217`		`- return nil, fmt.Errorf("pseudo-type GEOMETRY object %v field has unknown type %s", typ)`
	`217`	`+ return nil, fmt.Errorf("pseudo-type GEOMETRY object %v field has unknown type %s", obj, typ)`
`218`	`218`	`}`
`219`	`219`	`}`