Updated UUID term for 2.2

Author: dancannon

query_control.go

@@ -296,7 +296,9 @@ func (t Term) Info(args ...interface{}) Term {
 	return constructMethodTerm(t, "Info", p.Term_INFO, args, map[string]interface{}{})
 }
 
-// UUID returns a UUID (universally unique identifier), a string that can be used as a unique ID.
+// Return a UUID (universally unique identifier), a string that can be used as a
+// unique ID. If a string is passed to uuid as an argument, the UUID will be
+// deterministic, derived from the string’s SHA-1 hash.
 func UUID(args ...interface{}) Term {
-	return constructRootTerm("UUID", p.Term_UUID, []interface{}{}, map[string]interface{}{})
+	return constructRootTerm("UUID", p.Term_UUID, args, map[string]interface{}{})
 }

query_control_test.go

@@ -447,6 +447,30 @@ func (s *RethinkSuite) TestControlToJSON(c *test.C) {
 	c.Assert(response, test.Equals, "[4,5]")
 }
 
+func (s *RethinkSuite) TestControlUUID(c *test.C) {
+	var response string
+	query := UUID()
+	res, err := query.Run(session)
+	c.Assert(err, test.IsNil)
+
+	err = res.One(&response)
+
+	c.Assert(err, test.IsNil)
+	c.Assert(len(response) == 36, test.Equals, true)
+}
+
+func (s *RethinkSuite) TestControlUUIDString(c *test.C) {
+	var response string
+	query := UUID("rethinkdb")
+	res, err := query.Run(session)
+	c.Assert(err, test.IsNil)
+
+	err = res.One(&response)
+
+	c.Assert(err, test.IsNil)
+	c.Assert(len(response) == 36, test.Equals, true)
+}
+
 func (s *RethinkSuite) TestControlInvalidType(c *test.C) {
 	query := Expr(map[struct{ string }]string{})
 	_, err := query.Run(session)