Added random generators from go-randomdata

Author: robreid

Makefile

@@ -20,7 +20,7 @@ cover:
 	github.com/codingconcepts/datagen/internal/pkg/runner;\
 	go tool cover -html=coverage.out
 
-build:
+release:
 	# linux
 	GOOS=linux go build -ldflags "-X main.semver=${VERSION}" -o datagen ;\
 	tar -zcvf datagen_${VERSION}_linux.tar.gz ./datagen ;\

README.md

@@ -10,6 +10,12 @@ If you need to generate a lot of random data for your database tables but don't
 
 > "right now datagen and [modelgen](https://github.com/LUSHDigital/modelgen) are god sends to me"
 
+## Credit
+
+* [go-randomdata](https://github.com/Pallinder/go-randomdata) for the following generators:
+
+title, namef, namel, name, email, phone, postcode, address, street, city, county, state, currency, locale, country, country2, country3, ip4, ip6, and user-agent.
+
 ## Installation
 
 To build from source, either clone the repo, or use `go get` as follows (datagen will automatically be built by Go):
@@ -317,6 +323,174 @@ Works in a simliar way to `row` but references _sequential_ rows from a previous
 {{end}}
 ```
 
+##### title
+
+Generates a random title for a random gender.
+
+```
+{{title}}
+```
+
+##### namef
+
+Generates a random first name for a random gender.
+
+```
+{{namef}}
+```
+
+##### namel
+
+Generates a random last name.
+
+```
+{{namel}}
+```
+
+##### name
+
+Generates a random full name for a random gender.
+
+```
+{{name}}
+```
+
+##### email
+
+Generates a random email address.
+
+```
+{{email}}
+```
+
+##### phone
+
+Generates a random phone number in E164 format.
+
+```
+{{phone}}
+```
+
+##### postcode
+
+Generates a random postcode, taking a 2-letter country code.
+
+```
+{{postcode "GB"}}
+```
+
+##### address
+
+Generates a random American address. It's possible to create addresses for other countries using the various other functions available.
+
+```
+{{address}}
+```
+
+##### street
+
+Generates a random street name, taking a 2-letter country code.
+
+```
+{{street "GB"}}
+```
+
+##### city
+
+Generates a random American city name.
+
+```
+{{city}}
+```
+
+##### county
+
+Generates a random county/state name, taking a 2-letter country code. To generate a random state name without having to pass "US" as an argument, use the `state` function.
+
+```
+{{county "GB"}}
+```
+
+##### state
+
+Generates a random American state name.
+
+```
+{{state}}
+```
+
+##### state2
+
+Generates a random American state name in its 2-letter format.
+
+```
+{{state2}}
+```
+
+##### currency
+
+Generates a random currency in ISO 4217 format.
+
+```
+{{currency}}
+```
+
+##### locale
+
+Generates a random locale.
+
+```
+{{locale}}
+```
+
+##### country
+
+Generates a random country name.
+
+```
+{{country}}
+```
+
+##### country2
+
+Generates a random country name in ISO 3166-1 alpha-2 format.
+
+```
+{{country2}}
+```
+
+##### country3
+
+Generates a random country name in ISO 3166-1 alpha-3 format.
+
+```
+{{country3}}
+```
+
+##### ip4
+
+Generates a random v4 IP address.
+
+```
+{{ip4}}
+```
+
+##### ip6
+
+Generates a random v6 IP address.
+
+```
+{{ip5}}
+```
+
+##### user-agent
+
+Generates a random user agent to simulate an API client.
+
+```
+{{agent}}
+```
+
 ## Other database types:
 
 ### MySQL

examples/script.sql

@@ -17,7 +17,7 @@ insert into "pet" ("pid", "name", "type") values
 	{{if $i}},{{end}}
 	(
 		'{{ref "owner" "id"}}',
-		'{{string 10 10 "p-" "abcde"}}',
+		'{{name}}',
 		'{{wset "dog" 60 "cat" 40}}'
 	)
 {{end}};

internal/pkg/random/random.go

@@ -181,6 +181,17 @@ func Set(set ...interface{}) interface{} {
 	return set[i]
 }
 
+// NTimes returns a slice of empty structs of random length. If you know
+// the size of the slice you'd like, just pass the min argument, if you'd
+// like a slice between a minimum and maximum size, pass a value for extra.
+func NTimes(min int64, extra ...int64) []struct{} {
+	max := min
+	if len(extra) > 0 {
+		max = extra[0]
+	}
+	return make([]struct{}, Int(min, max))
+}
+
 func between64(min, max int64) int64 {
 	if min == max {
 		return min

internal/pkg/runner/runner.go

@@ -16,6 +16,8 @@ import (
 
 	"github.com/codingconcepts/datagen/internal/pkg/parse"
 	"github.com/pkg/errors"
+
+	"github.com/Pallinder/go-randomdata"
 )
 
 // Runner holds the configuration that will be used at runtime.
@@ -55,25 +57,40 @@ func New(db *sql.DB, opts ...Option) *Runner {
 	}
 
 	r.funcs = template.FuncMap{
-		"string":  random.String,
-		"stringf": random.StringF(r.stringFdefaults),
-		"int":     random.Int,
-		"date":    random.Date(r.dateFormat),
-		"float":   random.Float,
-		"uuid":    func() string { return uuid.New().String() },
-		"set":     random.Set,
-		"wset":    r.wset,
-		"fset":    r.loadAndSet,
-		"ref":     r.store.reference,
-		"row":     r.store.row,
-		"each":    r.store.each,
-		"ntimes": func(min int64, extra ...int64) []struct{} {
-			max := min
-			if len(extra) > 0 {
-				max = extra[0]
-			}
-			return make([]struct{}, random.Int(min, max))
-		},
+		"string":   random.String,
+		"stringf":  random.StringF(r.stringFdefaults),
+		"int":      random.Int,
+		"date":     random.Date(r.dateFormat),
+		"float":    random.Float,
+		"ntimes":   random.NTimes,
+		"set":      random.Set,
+		"uuid":     func() string { return uuid.New().String() },
+		"wset":     r.wset,
+		"fset":     r.loadAndSet,
+		"ref":      r.store.reference,
+		"row":      r.store.row,
+		"each":     r.store.each,
+		"title":    func() string { return randomdata.Title(randomdata.RandomGender) },
+		"namef":    func() string { return randomdata.FirstName(randomdata.RandomGender) },
+		"namel":    randomdata.LastName,
+		"name":     func() string { return randomdata.FullName(randomdata.RandomGender) },
+		"email":    randomdata.Email,
+		"phone":    randomdata.PhoneNumber,
+		"postcode": randomdata.PostalCode,
+		"address":  randomdata.Address,
+		"street":   randomdata.StreetForCountry,
+		"city":     randomdata.City,
+		"county":   randomdata.ProvinceForCountry,
+		"state":    func() string { return randomdata.State(randomdata.Large) },
+		"state2":   func() string { return randomdata.State(randomdata.Small) },
+		"currency": randomdata.Currency,
+		"locale":   randomdata.Locale, // BCP 47
+		"country":  func() string { return randomdata.Country(randomdata.FullCountry) },
+		"country2": func() string { return randomdata.Country(randomdata.TwoCharCountry) },   // ISO 3166-1 alpha-2
+		"country3": func() string { return randomdata.Country(randomdata.ThreeCharCountry) }, // ISO 3166-1 alpha-3
+		"ip4":      randomdata.IpV4Address,
+		"ip6":      randomdata.IpV6Address,
+		"agent":    randomdata.UserAgentString,
 	}
 
 	return &r