sqlc-dev · kyleconroy · Mar 9, 2020 · Mar 9, 2020 · Mar 9, 2020 · Mar 9, 2020
diff --git a/README.md b/README.md
@@ -482,8 +482,7 @@ If you need to update a large number of expexted test output in the
 `internal/endtoend/testdata` directory, run the `regenerate.sh` script.
 
 ```
-cd internal/endtoend
-./regenerate.sh
+./scripts/regenerate.sh
 ```
 
 ## Acknowledgements

diff --git a/examples/booktest/mysql/models.go b/examples/booktest/mysql/models.go
diff --git a/examples/booktest/postgresql/models.go b/examples/booktest/postgresql/models.go
diff --git a/examples/ondeck/models.go b/examples/ondeck/models.go
diff --git a/internal/dinosql/gen.go b/internal/dinosql/gen.go
@@ -340,6 +340,9 @@ func modelImports(r Generateable, settings config.CombinedSettings) fileImports
 	if UsesType(r, "net.HardwareAddr", settings) {
 		std["net"] = struct{}{}
 	}
+	if len(r.Enums(settings)) > 0 {
+		std["fmt"] = struct{}{}
+	}
 
 	// Custom imports
 	pkg := make(map[string]struct{})
@@ -1144,7 +1147,14 @@ const (
 )
 
 func (e *{{.Name}}) Scan(src interface{}) error {
-	*e = {{.Name}}(src.([]byte))
+	switch s := src.(type) {
+	case []byte:
+		*e = {{.Name}}(s)
+	case string:
+		*e = {{.Name}}(s)
+	default:
+		return fmt.Errorf("unsupported scan type for {{.Name}}: %T", src)
+	}
 	return nil
 }
 {{end}}

diff --git a/internal/endtoend/regenerate.sh b/internal/endtoend/regenerate.sh
diff --git a/internal/endtoend/testdata/enums/go/models.go b/internal/endtoend/testdata/enums/go/models.go
diff --git a/internal/endtoend/testdata/mysql_enums/go/models.go b/internal/endtoend/testdata/mysql_enums/go/models.go
diff --git a/internal/endtoend/testdata/mysql_overrides/go/models.go b/internal/endtoend/testdata/mysql_overrides/go/models.go
diff --git a/internal/endtoend/testdata/mysql_param/go/models.go b/internal/endtoend/testdata/mysql_param/go/models.go
diff --git a/internal/endtoend/testdata/mysql_parse/go/models.go b/internal/endtoend/testdata/mysql_parse/go/models.go
diff --git a/internal/endtoend/testdata/ondeck/models.go b/internal/endtoend/testdata/ondeck/models.go
diff --git a/internal/endtoend/testdata/schema_scoped_enum/go/models.go b/internal/endtoend/testdata/schema_scoped_enum/go/models.go
diff --git a/scripts/regenerate.sh b/scripts/regenerate.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -x
+
+for dir in internal/endtoend/testdata/*; do (cd "$dir" && sqlc-dev generate); done
+for dir in examples/*; do (cd "$dir" && sqlc-dev generate); done