Add RandomizeEnforcedStruct

* Fix broken Select QM test

bdb/drivers/postgres.go

@@ -255,7 +255,7 @@ func (p *PostgresDriver) TranslateColumnType(c bdb.Column) bdb.Column {
 			c.Type = "null.Float64"
 		case "real":
 			c.Type = "null.Float32"
-		case "bit", "interval", "bit varying", "character", "character varying", "cidr", "inet", "json", "macaddr", "text", "uuid", "xml":
+		case "bit", "interval", "uuint", "bit varying", "character", "character varying", "cidr", "inet", "json", "macaddr", "text", "uuid", "xml":
 			c.Type = "null.String"
 		case "bytea":
 			c.Type = "[]byte"
@@ -278,7 +278,7 @@ func (p *PostgresDriver) TranslateColumnType(c bdb.Column) bdb.Column {
 			c.Type = "float64"
 		case "real":
 			c.Type = "float32"
-		case "bit", "interval", "bit varying", "character", "character varying", "cidr", "inet", "json", "macaddr", "text", "uuid", "xml":
+		case "bit", "interval", "uuint", "bit varying", "character", "character varying", "cidr", "inet", "json", "macaddr", "text", "uuid", "xml":
 			c.Type = "string"
 		case "bytea":
 			c.Type = "[]byte"

boil/query_test.go

@@ -252,7 +252,7 @@ func TestSetSelect(t *testing.T) {
 		t.Errorf("Expected selectCols len 2, got %d", len(q.selectCols))
 	}
 
-	if q.selectCols[0] != `"col1"` && q.selectCols[1] != `"col2"` {
+	if q.selectCols[0] != `col1` && q.selectCols[1] != `col2` {
 		t.Errorf("select cols value mismatch: %#v", q.selectCols)
 	}
 }

boil/testing.go

@@ -33,6 +33,8 @@ var (
 	typeTime        = reflect.TypeOf(time.Time{})
 
 	rgxValidTime = regexp.MustCompile(`[2-9]+`)
+
+	enforcedTypes = []string{"uuid"}
 )
 
 type seed int
@@ -193,7 +195,7 @@ func RandomizeStruct(str interface{}, colTypes map[string]string, includeInvalid
 			continue
 		}
 
-		fieldDBType := colTypes[typ.Field(i).Name]
+		fieldDBType := colTypes[fieldTyp.Name]
 		if err := randomizeField(fieldVal, fieldDBType, includeInvalid); err != nil {
 			return err
 		}
@@ -202,6 +204,37 @@ func RandomizeStruct(str interface{}, colTypes map[string]string, includeInvalid
 	return nil
 }
 
+func RandomizeEnforcedStruct(obj interface{}, colTypes map[string]string) error {
+	value := reflect.Indirect(reflect.ValueOf(obj))
+	if !value.IsValid() {
+		return fmt.Errorf("Invalid object provided: %T", obj)
+	}
+
+	kind := value.Kind()
+	if kind != reflect.Struct {
+		return fmt.Errorf("Inner element should be a struct, given a non-struct: %T", obj)
+	}
+
+	typ := value.Type()
+	nFields := value.NumField()
+
+	// Iterate through fields
+	for i := 0; i < nFields; i++ {
+		fieldVal := value.Field(i)
+		fieldTyp := typ.Field(i)
+		for _, v := range enforcedTypes {
+			if colTypes[fieldTyp.Name] == v {
+				if err := randomizeField(fieldVal, v, false); err != nil {
+					return err
+				}
+				break
+			}
+		}
+	}
+
+	return nil
+}
+
 // randDate generates a random time.Time between 1850 and 2050.
 // Only the Day/Month/Year columns are set so that Dates and DateTimes do
 // not cause mismatches in the test data comparisons.

boil/testing_test.go

@@ -8,6 +8,8 @@ import (
 )
 
 func TestIsZeroValue(t *testing.T) {
+	t.Parallel()
+
 	o := struct {
 		A []byte
 		B time.Time
@@ -49,6 +51,8 @@ func TestIsZeroValue(t *testing.T) {
 }
 
 func TestIsValueMatch(t *testing.T) {
+	t.Parallel()
+
 	var errs []error
 	var values []interface{}
 
@@ -117,6 +121,8 @@ func TestIsValueMatch(t *testing.T) {
 }
 
 func TestRandomizeStruct(t *testing.T) {
+	t.Parallel()
+
 	var testStruct = struct {
 		Int       int
 		Int64     int64
@@ -184,3 +190,34 @@ func TestRandomizeStruct(t *testing.T) {
 		t.Errorf("the null values are not being randomized: %#v", testStruct)
 	}
 }
+
+func TestRandomizeEnforcedStruct(t *testing.T) {
+	t.Parallel()
+
+	var testStruct = struct {
+		Int1     int
+		NullInt1 null.Int
+		UUID1    string
+		UUID2    string
+	}{}
+
+	fieldTypes := map[string]string{
+		"Int":     "integer",
+		"NullInt": "integer",
+		"UUID1":   "uuid",
+		"UUID2":   "uuid",
+	}
+
+	err := RandomizeEnforcedStruct(&testStruct, fieldTypes)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if testStruct.Int1 != 0 || testStruct.NullInt1.Int != 0 ||
+		testStruct.NullInt1.Valid != false {
+		t.Errorf("the regular values are being randomized when they should be zero vals: %#v", testStruct)
+	}
+
+	if testStruct.UUID1 == "" || testStruct.UUID2 == "" {
+		t.Errorf("the enforced values should be set: %#v", testStruct)
+	}
+}