Fixed some type aliases not being correctly encoded when using 'Expr'. Fixes #248

Author: dancannon

CHANGELOG.md

@@ -21,6 +21,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Deprecated the option `NodeRefreshInterval` in `ConnectOpts`
  - Deprecated `SetMaxIdleConns` and `SetMaxOpenConns`, these options should now only be set when creating the session.
 
+### Fixed
+ - Fixed some type aliases not being correctly encoded when using `Expr`.
+
 ## v1.1.4
 ### Added
  - Added root table terms (`r.TableCreate`, `r.TableList` and `r.TableDrop`)

query_control.go

@@ -59,6 +59,41 @@ func Expr(val interface{}) Term {
 		}
 
 		return makeObject(vals)
+	case
+		bool,
+		int,
+		int8,
+		int16,
+		int32,
+		int64,
+		uint,
+		uint8,
+		uint16,
+		uint32,
+		uint64,
+		float32,
+		float64,
+		uintptr,
+		string,
+		*bool,
+		*int,
+		*int8,
+		*int16,
+		*int32,
+		*int64,
+		*uint,
+		*uint8,
+		*uint16,
+		*uint32,
+		*uint64,
+		*float32,
+		*float64,
+		*uintptr,
+		*string:
+		return Term{
+			termType: p.Term_DATUM,
+			data:     val,
+		}
 	default:
 		// Use reflection to check for other types
 		valType := reflect.TypeOf(val)
@@ -103,9 +138,19 @@ func Expr(val interface{}) Term {
 
 			return makeArray(vals)
 		default:
+			data, err := encode(val)
+
+			if err != nil || data == nil {
+				return Term{
+					termType: p.Term_DATUM,
+					data:     nil,
+					lastErr:  err,
+				}
+			}
+
 			return Term{
 				termType: p.Term_DATUM,
-				data:     val,
+				data:     data,
 			}
 		}
 	}