Merge pull request #25 from kanmu/michiomochi/replace-to-withstack

michiomochi · web-flow · commit 54c3d1b7b034 · 2024-02-27T14:00:32.000+09:00
Replace errors.Wrap to errors.WithStack
diff --git a/README.md b/README.md
@@ -8,22 +8,19 @@
 
 `dgw` generates Golang struct, and simple Table/Row Data Gateway functions from PostgreSQL table metadata. Heavily inspired by [xo](https://github.com/knq/xo).
 
-
 ## Why created
 
 Personally, I prefer Table/Row Data Gateway over ORM/Query Builder approach when using Go with RDBMS. However, it is very time consuming, tedious, and error-prone to write a lot of columns, query place holders, and struct fields that all have to be exactly in order even for a simple select/insert statement. `dgw` generate Go struct, and simple functions to get/create row from PostgreSQL table definitions to avoid manually writing simple but tedious SQL.
 
 - `dgw` can properly detect autogenerated column (e.g. serial, bigserial), and composit primary key to create appropriate SQL.
 - `dgw` has ability to easily customize PostgreSQL column type <-> Go type mapping using toml config file.
 
-
 ## Installation
 
 ```
 brew install kanmu/tools/dgw
 ```
 
-
 ## How to use
 
 ```
@@ -108,7 +105,7 @@ func (r *T1) Create(db Queryer) error {
 		`INSERT INTO t1 (i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id`,
 		&r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData).Scan(&r.ID)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t1")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -120,7 +117,7 @@ func GetT1ByPk(db Queryer, pk0 int64) (*T1, error) {
 		`SELECT id, i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data FROM t1 WHERE id = $1`,
 		pk0).Scan(&r.ID, &r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t1")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -140,7 +137,7 @@ func (r *T2) Create(db Queryer) error {
 		`INSERT INTO t2 (str, t_with_tz, t_without_tz) VALUES ($1, $2, $3) RETURNING id, i`,
 		&r.Str, &r.TWithTz, &r.TWithoutTz).Scan(&r.ID, &r.I)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t2")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -152,7 +149,7 @@ func GetT2ByPk(db Queryer, pk0 int64, pk1 int) (*T2, error) {
 		`SELECT id, i, str, t_with_tz, t_without_tz FROM t2 WHERE id = $1 AND i = $2`,
 		pk0, pk1).Scan(&r.ID, &r.I, &r.Str, &r.TWithTz, &r.TWithoutTz)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t2")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -169,7 +166,7 @@ func (r *T3) Create(db Queryer) error {
 		`INSERT INTO t3 (id, i) VALUES ($1, $2)`,
 		&r.ID, &r.I)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t3")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -181,7 +178,7 @@ func GetT3ByPk(db Queryer, pk0 int, pk1 int) (*T3, error) {
 		`SELECT id, i FROM t3 WHERE id = $1 AND i = $2`,
 		pk0, pk1).Scan(&r.ID, &r.I)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t3")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
diff --git a/dgw.go b/dgw.go
@@ -32,7 +32,7 @@ type Queryer interface {
 func OpenDB(connStr string) (*sql.DB, error) {
 	conn, err := sql.Open("postgres", connStr)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to connect to database")
+		return nil, errors.WithStack(err)
 	}
 	return conn, nil
 }
@@ -180,7 +180,7 @@ type StructField struct {
 func PgLoadTypeMapFromFile(filePath string) (*PgTypeMapConfig, error) {
 	var conf PgTypeMapConfig
 	if _, err := toml.DecodeFile(filePath, &conf); err != nil {
-		return nil, errors.Wrap(err, "faild to parse config file")
+		return nil, errors.WithStack(err)
 	}
 	return &conf, nil
 }
@@ -189,7 +189,7 @@ func PgLoadTypeMapFromFile(filePath string) (*PgTypeMapConfig, error) {
 func PgLoadColumnDef(db Queryer, schema string, table string) ([]*PgColumn, error) {
 	colDefs, err := db.Query(pgLoadColumnDef, schema, table)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to load table def")
+		return nil, errors.WithStack(err)
 	}
 
 	cols := []*PgColumn{}
@@ -205,7 +205,7 @@ func PgLoadColumnDef(db Queryer, schema string, table string) ([]*PgColumn, erro
 			&c.DDLType,
 		)
 		if err != nil {
-			return nil, errors.Wrap(err, "failed to scan")
+			return nil, errors.WithStack(err)
 		}
 
 		// Some data types have an extra part e.g, "character varying(16)" and
@@ -223,7 +223,7 @@ func PgLoadColumnDef(db Queryer, schema string, table string) ([]*PgColumn, erro
 func PgLoadTableDef(db Queryer, schema string) ([]*PgTable, error) {
 	tbDefs, err := db.Query(pgLoadTableDef, schema)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to load table def")
+		return nil, errors.WithStack(err)
 	}
 	tbs := []*PgTable{}
 	for tbDefs.Next() {
@@ -233,7 +233,7 @@ func PgLoadTableDef(db Queryer, schema string) ([]*PgTable, error) {
 			&t.Name,
 		)
 		if err != nil {
-			return nil, errors.Wrap(err, "failed to scan")
+			return nil, errors.WithStack(err)
 		}
 		cols, err := PgLoadColumnDef(db, schema, t.Name)
 		if err != nil {
@@ -291,7 +291,7 @@ func PgTableToStruct(t *PgTable, typeCfg *PgTypeMapConfig, keyConfig *AutoKeyMap
 	for _, c := range t.Columns {
 		f, err := PgColToField(c, typeCfg)
 		if err != nil {
-			return nil, errors.Wrap(err, "faield to convert col to field")
+			return nil, errors.WithStack(err)
 		}
 		fs = append(fs, f)
 	}
@@ -304,11 +304,11 @@ func PgExecuteDefaultTmpl(st *StructTmpl, path string) ([]byte, error) {
 	var src []byte
 	d, err := Asset(path)
 	if err != nil {
-		return src, errors.Wrap(err, "failed to load asset")
+		return src, errors.WithStack(err)
 	}
 	tpl, err := template.New("struct").Funcs(tmplFuncMap).Parse(string(d))
 	if err != nil {
-		return src, errors.Wrap(err, "failed to parse template")
+		return src, errors.WithStack(err)
 	}
 	buf := new(bytes.Buffer)
 	if err := tpl.Execute(buf, st); err != nil {
@@ -326,7 +326,7 @@ func PgExecuteCustomTmpl(st *StructTmpl, customTmpl string) ([]byte, error) {
 	var src []byte
 	tpl, err := template.New("struct").Funcs(tmplFuncMap).Parse(customTmpl)
 	if err != nil {
-		return src, errors.Wrap(err, "failed to parse template")
+		return src, errors.WithStack(err)
 	}
 	buf := new(bytes.Buffer)
 	if err := tpl.Execute(buf, st); err != nil {
@@ -348,12 +348,12 @@ func PgCreateStruct(
 
 	tbls, err := PgLoadTableDef(db, schema)
 	if err != nil {
-		return src, errors.Wrap(err, "faield to load table definitions")
+		return src, errors.WithStack(err)
 	}
 	cfg := &PgTypeMapConfig{}
 	if typeMapPath == "" {
 		if _, err := toml.Decode(typeMap, cfg); err != nil {
-			return src, errors.Wrap(err, "faield to read type map")
+			return src, errors.WithStack(err)
 		}
 	} else {
 		if _, err := toml.DecodeFile(typeMapPath, cfg); err != nil {
@@ -366,7 +366,7 @@ func PgCreateStruct(
 		}
 		st, err := PgTableToStruct(tbl, cfg, autoGenKeyCfg)
 		if err != nil {
-			return src, errors.Wrap(err, "faield to convert table definition to struct")
+			return src, errors.WithStack(err)
 		}
 		if customTmpl != "" {
 			tmpl, err := ioutil.ReadFile(customTmpl)
@@ -375,17 +375,17 @@ func PgCreateStruct(
 			}
 			s, err := PgExecuteCustomTmpl(&StructTmpl{Struct: st}, string(tmpl))
 			if err != nil {
-				return nil, errors.Wrap(err, "PgExecuteCustomTmpl failed")
+				return nil, errors.WithStack(err)
 			}
 			src = append(src, s...)
 		} else {
 			s, err := PgExecuteDefaultTmpl(&StructTmpl{Struct: st}, "template/struct.tmpl")
 			if err != nil {
-				return src, errors.Wrap(err, "faield to execute template")
+				return src, errors.WithStack(err)
 			}
 			m, err := PgExecuteDefaultTmpl(&StructTmpl{Struct: st}, "template/method.tmpl")
 			if err != nil {
-				return src, errors.Wrap(err, "faield to execute template")
+				return src, errors.WithStack(err)
 			}
 			src = append(src, s...)
 			src = append(src, m...)
diff --git a/example/conn.go b/example/conn.go
@@ -11,7 +11,7 @@ import (
 func OpenDB(connStr string) (*sql.DB, error) {
 	conn, err := sql.Open("postgres", connStr)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to connect to database")
+		return nil, errors.WithStack(err)
 	}
 	return conn, nil
 }
diff --git a/example/defaultstruct.go b/example/defaultstruct.go
@@ -27,7 +27,7 @@ func (r *T1) Create(db Queryer) error {
 		`INSERT INTO t1 (i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id`,
 		&r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData).Scan(&r.ID)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t1")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -39,7 +39,7 @@ func GetT1ByPk(db Queryer, pk0 int64) (*T1, error) {
 		`SELECT id, i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data FROM t1 WHERE id = $1`,
 		pk0).Scan(&r.ID, &r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t1")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -59,7 +59,7 @@ func (r *T2) Create(db Queryer) error {
 		`INSERT INTO t2 (str, t_with_tz, t_without_tz) VALUES ($1, $2, $3) RETURNING id, i`,
 		&r.Str, &r.TWithTz, &r.TWithoutTz).Scan(&r.ID, &r.I)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t2")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -71,7 +71,7 @@ func GetT2ByPk(db Queryer, pk0 int64, pk1 int) (*T2, error) {
 		`SELECT id, i, str, t_with_tz, t_without_tz FROM t2 WHERE id = $1 AND i = $2`,
 		pk0, pk1).Scan(&r.ID, &r.I, &r.Str, &r.TWithTz, &r.TWithoutTz)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t2")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -88,7 +88,7 @@ func (r *T3) Create(db Queryer) error {
 		`INSERT INTO t3 (id, i) VALUES ($1, $2)`,
 		&r.ID, &r.I)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t3")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -100,7 +100,7 @@ func GetT3ByPk(db Queryer, pk0 int, pk1 int) (*T3, error) {
 		`SELECT id, i FROM t3 WHERE id = $1 AND i = $2`,
 		pk0, pk1).Scan(&r.ID, &r.I)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t3")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -117,7 +117,7 @@ func (r *T4) Create(db Queryer) error {
 		`INSERT INTO t4 (id, i) VALUES ($1, $2)`,
 		&r.ID, &r.I)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert t4")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -129,7 +129,7 @@ func GetT4ByPk(db Queryer, pk0 int, pk1 int) (*T4, error) {
 		`SELECT id, i FROM t4 WHERE id = $1 AND i = $2`,
 		pk0, pk1).Scan(&r.ID, &r.I)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select t4")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -148,7 +148,7 @@ func (r *UserAccount) Create(db Queryer) error {
 		`INSERT INTO user_account (email, last_name, first_name) VALUES ($1, $2, $3) RETURNING id`,
 		&r.Email, &r.LastName, &r.FirstName).Scan(&r.ID)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert user_account")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -160,7 +160,7 @@ func GetUserAccountByPk(db Queryer, pk0 int64) (*UserAccount, error) {
 		`SELECT id, email, last_name, first_name FROM user_account WHERE id = $1`,
 		pk0).Scan(&r.ID, &r.Email, &r.LastName, &r.FirstName)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select user_account")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -179,7 +179,7 @@ func (r *UserAccountCompositePk) Create(db Queryer) error {
 		`INSERT INTO user_account_composite_pk (id, email, last_name, first_name) VALUES ($1, $2, $3, $4)`,
 		&r.ID, &r.Email, &r.LastName, &r.FirstName)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert user_account_composite_pk")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -191,7 +191,7 @@ func GetUserAccountCompositePkByPk(db Queryer, pk0 int64, pk1 string) (*UserAcco
 		`SELECT id, email, last_name, first_name FROM user_account_composite_pk WHERE id = $1 AND email = $2`,
 		pk0, pk1).Scan(&r.ID, &r.Email, &r.LastName, &r.FirstName)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select user_account_composite_pk")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
@@ -210,7 +210,7 @@ func (r *UserAccountUUID) Create(db Queryer) error {
 		`INSERT INTO user_account_uuid (email, last_name, first_name) VALUES ($1, $2, $3) RETURNING uuid`,
 		&r.Email, &r.LastName, &r.FirstName).Scan(&r.UUID)
 	if err != nil {
-		return errors.Wrap(err, "failed to insert user_account_uuid")
+		return errors.WithStack(err)
 	}
 	return nil
 }
@@ -222,7 +222,7 @@ func GetUserAccountUUIDByPk(db Queryer, pk0 string) (*UserAccountUUID, error) {
 		`SELECT uuid, email, last_name, first_name FROM user_account_uuid WHERE uuid = $1`,
 		pk0).Scan(&r.UUID, &r.Email, &r.LastName, &r.FirstName)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to select user_account_uuid")
+		return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }
diff --git a/template/method.tmpl b/template/method.tmpl
@@ -20,7 +20,7 @@ func (r *{{ .Struct.Name }}) CreateContext(ctx context.Context, db Queryer) erro
             {{ createInsertParams .Struct }})
     {{- end }}
 	if err != nil {
-        return errors.Wrap(err, "failed to insert {{ .Struct.Table.Name }}")
+        return errors.WithStack(err)
 	}
 	return nil
 }
@@ -32,7 +32,7 @@ func Get{{ .Struct.Name }}ByPkContext(ctx context.Context, db Queryer, {{ create
         `{{ createSelectByPkSQL .Struct }}`,
         {{ createSelectByPkSQLParams .Struct }}).Scan({{ createSelectByPkScan .Struct }})
 	if err != nil {
-        return nil, errors.Wrap(err, "failed to select {{ .Struct.Table.Name }}")
+        return nil, errors.WithStack(err)
 	}
 	return &r, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -8,22 +8,19 @@`
`8`	`8`
`9`	`9`	`dgw` generates Golang struct, and simple Table/Row Data Gateway functions from PostgreSQL table metadata. Heavily inspired by [xo](https://github.com/knq/xo).
`10`	`10`
`11`		`-`
`12`	`11`	`## Why created`
`13`	`12`
`14`	`13`	Personally, I prefer Table/Row Data Gateway over ORM/Query Builder approach when using Go with RDBMS. However, it is very time consuming, tedious, and error-prone to write a lot of columns, query place holders, and struct fields that all have to be exactly in order even for a simple select/insert statement. `dgw` generate Go struct, and simple functions to get/create row from PostgreSQL table definitions to avoid manually writing simple but tedious SQL.
`15`	`14`
`16`	`15`	- `dgw` can properly detect autogenerated column (e.g. serial, bigserial), and composit primary key to create appropriate SQL.
`17`	`16`	- `dgw` has ability to easily customize PostgreSQL column type <-> Go type mapping using toml config file.
`18`	`17`
`19`		`-`
`20`	`18`	`## Installation`
`21`	`19`
`22`	`20`	```
`23`	`21`	`brew install kanmu/tools/dgw`
`24`	`22`	```
`25`	`23`
`26`		`-`
`27`	`24`	`## How to use`
`28`	`25`
`29`	`26`	```
`@@ -108,7 +105,7 @@ func (r *T1) Create(db Queryer) error {`
`108`	`105`	`INSERT INTO t1 (i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id`,
`109`	`106`	`&r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData).Scan(&r.ID)`
`110`	`107`	`if err != nil {`
`111`		`- return errors.Wrap(err, "failed to insert t1")`
	`108`	`+ return errors.WithStack(err)`
`112`	`109`	`}`
`113`	`110`	`return nil`
`114`	`111`	`}`
`@@ -120,7 +117,7 @@ func GetT1ByPk(db Queryer, pk0 int64) (*T1, error) {`
`120`	`117`	`SELECT id, i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data FROM t1 WHERE id = $1`,
`121`	`118`	`pk0).Scan(&r.ID, &r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData)`
`122`	`119`	`if err != nil {`
`123`		`- return nil, errors.Wrap(err, "failed to select t1")`
	`120`	`+ return nil, errors.WithStack(err)`
`124`	`121`	`}`
`125`	`122`	`return &r, nil`
`126`	`123`	`}`
`@@ -140,7 +137,7 @@ func (r *T2) Create(db Queryer) error {`
`140`	`137`	`INSERT INTO t2 (str, t_with_tz, t_without_tz) VALUES ($1, $2, $3) RETURNING id, i`,
`141`	`138`	`&r.Str, &r.TWithTz, &r.TWithoutTz).Scan(&r.ID, &r.I)`
`142`	`139`	`if err != nil {`
`143`		`- return errors.Wrap(err, "failed to insert t2")`
	`140`	`+ return errors.WithStack(err)`
`144`	`141`	`}`
`145`	`142`	`return nil`
`146`	`143`	`}`
`@@ -152,7 +149,7 @@ func GetT2ByPk(db Queryer, pk0 int64, pk1 int) (*T2, error) {`
`152`	`149`	`SELECT id, i, str, t_with_tz, t_without_tz FROM t2 WHERE id = $1 AND i = $2`,
`153`	`150`	`pk0, pk1).Scan(&r.ID, &r.I, &r.Str, &r.TWithTz, &r.TWithoutTz)`
`154`	`151`	`if err != nil {`
`155`		`- return nil, errors.Wrap(err, "failed to select t2")`
	`152`	`+ return nil, errors.WithStack(err)`
`156`	`153`	`}`
`157`	`154`	`return &r, nil`
`158`	`155`	`}`
`@@ -169,7 +166,7 @@ func (r *T3) Create(db Queryer) error {`
`169`	`166`	`INSERT INTO t3 (id, i) VALUES ($1, $2)`,
`170`	`167`	`&r.ID, &r.I)`
`171`	`168`	`if err != nil {`
`172`		`- return errors.Wrap(err, "failed to insert t3")`
	`169`	`+ return errors.WithStack(err)`
`173`	`170`	`}`
`174`	`171`	`return nil`
`175`	`172`	`}`
`@@ -181,7 +178,7 @@ func GetT3ByPk(db Queryer, pk0 int, pk1 int) (*T3, error) {`
`181`	`178`	`SELECT id, i FROM t3 WHERE id = $1 AND i = $2`,
`182`	`179`	`pk0, pk1).Scan(&r.ID, &r.I)`
`183`	`180`	`if err != nil {`
`184`		`- return nil, errors.Wrap(err, "failed to select t3")`
	`181`	`+ return nil, errors.WithStack(err)`
`185`	`182`	`}`
`186`	`183`	`return &r, nil`
`187`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ type Queryer interface {`
`32`	`32`	`func OpenDB(connStr string) (*sql.DB, error) {`
`33`	`33`	`conn, err := sql.Open("postgres", connStr)`
`34`	`34`	`if err != nil {`
`35`		`- return nil, errors.Wrap(err, "failed to connect to database")`
	`35`	`+ return nil, errors.WithStack(err)`
`36`	`36`	`}`
`37`	`37`	`return conn, nil`
`38`	`38`	`}`
`@@ -180,7 +180,7 @@ type StructField struct {`
`180`	`180`	`func PgLoadTypeMapFromFile(filePath string) (*PgTypeMapConfig, error) {`
`181`	`181`	`var conf PgTypeMapConfig`
`182`	`182`	`if _, err := toml.DecodeFile(filePath, &conf); err != nil {`
`183`		`- return nil, errors.Wrap(err, "faild to parse config file")`
	`183`	`+ return nil, errors.WithStack(err)`
`184`	`184`	`}`
`185`	`185`	`return &conf, nil`
`186`	`186`	`}`
`@@ -189,7 +189,7 @@ func PgLoadTypeMapFromFile(filePath string) (*PgTypeMapConfig, error) {`
`189`	`189`	`func PgLoadColumnDef(db Queryer, schema string, table string) ([]*PgColumn, error) {`
`190`	`190`	`colDefs, err := db.Query(pgLoadColumnDef, schema, table)`
`191`	`191`	`if err != nil {`
`192`		`- return nil, errors.Wrap(err, "failed to load table def")`
	`192`	`+ return nil, errors.WithStack(err)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`cols := []*PgColumn{}`
`@@ -205,7 +205,7 @@ func PgLoadColumnDef(db Queryer, schema string, table string) ([]*PgColumn, erro`
`205`	`205`	`&c.DDLType,`
`206`	`206`	`)`
`207`	`207`	`if err != nil {`
`208`		`- return nil, errors.Wrap(err, "failed to scan")`
	`208`	`+ return nil, errors.WithStack(err)`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`// Some data types have an extra part e.g, "character varying(16)" and`
`@@ -223,7 +223,7 @@ func PgLoadColumnDef(db Queryer, schema string, table string) ([]*PgColumn, erro`
`223`	`223`	`func PgLoadTableDef(db Queryer, schema string) ([]*PgTable, error) {`
`224`	`224`	`tbDefs, err := db.Query(pgLoadTableDef, schema)`
`225`	`225`	`if err != nil {`
`226`		`- return nil, errors.Wrap(err, "failed to load table def")`
	`226`	`+ return nil, errors.WithStack(err)`
`227`	`227`	`}`
`228`	`228`	`tbs := []*PgTable{}`
`229`	`229`	`for tbDefs.Next() {`
`@@ -233,7 +233,7 @@ func PgLoadTableDef(db Queryer, schema string) ([]*PgTable, error) {`
`233`	`233`	`&t.Name,`
`234`	`234`	`)`
`235`	`235`	`if err != nil {`
`236`		`- return nil, errors.Wrap(err, "failed to scan")`
	`236`	`+ return nil, errors.WithStack(err)`
`237`	`237`	`}`
`238`	`238`	`cols, err := PgLoadColumnDef(db, schema, t.Name)`
`239`	`239`	`if err != nil {`
`@@ -291,7 +291,7 @@ func PgTableToStruct(t PgTable, typeCfg PgTypeMapConfig, keyConfig *AutoKeyMap`
`291`	`291`	`for _, c := range t.Columns {`
`292`	`292`	`f, err := PgColToField(c, typeCfg)`
`293`	`293`	`if err != nil {`
`294`		`- return nil, errors.Wrap(err, "faield to convert col to field")`
	`294`	`+ return nil, errors.WithStack(err)`
`295`	`295`	`}`
`296`	`296`	`fs = append(fs, f)`
`297`	`297`	`}`
`@@ -304,11 +304,11 @@ func PgExecuteDefaultTmpl(st *StructTmpl, path string) ([]byte, error) {`
`304`	`304`	`var src []byte`
`305`	`305`	`d, err := Asset(path)`
`306`	`306`	`if err != nil {`
`307`		`- return src, errors.Wrap(err, "failed to load asset")`
	`307`	`+ return src, errors.WithStack(err)`
`308`	`308`	`}`
`309`	`309`	`tpl, err := template.New("struct").Funcs(tmplFuncMap).Parse(string(d))`
`310`	`310`	`if err != nil {`
`311`		`- return src, errors.Wrap(err, "failed to parse template")`
	`311`	`+ return src, errors.WithStack(err)`
`312`	`312`	`}`
`313`	`313`	`buf := new(bytes.Buffer)`
`314`	`314`	`if err := tpl.Execute(buf, st); err != nil {`
`@@ -326,7 +326,7 @@ func PgExecuteCustomTmpl(st *StructTmpl, customTmpl string) ([]byte, error) {`
`326`	`326`	`var src []byte`
`327`	`327`	`tpl, err := template.New("struct").Funcs(tmplFuncMap).Parse(customTmpl)`
`328`	`328`	`if err != nil {`
`329`		`- return src, errors.Wrap(err, "failed to parse template")`
	`329`	`+ return src, errors.WithStack(err)`
`330`	`330`	`}`
`331`	`331`	`buf := new(bytes.Buffer)`
`332`	`332`	`if err := tpl.Execute(buf, st); err != nil {`
`@@ -348,12 +348,12 @@ func PgCreateStruct(`
`348`	`348`
`349`	`349`	`tbls, err := PgLoadTableDef(db, schema)`
`350`	`350`	`if err != nil {`
`351`		`- return src, errors.Wrap(err, "faield to load table definitions")`
	`351`	`+ return src, errors.WithStack(err)`
`352`	`352`	`}`
`353`	`353`	`cfg := &PgTypeMapConfig{}`
`354`	`354`	`if typeMapPath == "" {`
`355`	`355`	`if _, err := toml.Decode(typeMap, cfg); err != nil {`
`356`		`- return src, errors.Wrap(err, "faield to read type map")`
	`356`	`+ return src, errors.WithStack(err)`
`357`	`357`	`}`
`358`	`358`	`} else {`
`359`	`359`	`if _, err := toml.DecodeFile(typeMapPath, cfg); err != nil {`
`@@ -366,7 +366,7 @@ func PgCreateStruct(`
`366`	`366`	`}`
`367`	`367`	`st, err := PgTableToStruct(tbl, cfg, autoGenKeyCfg)`
`368`	`368`	`if err != nil {`
`369`		`- return src, errors.Wrap(err, "faield to convert table definition to struct")`
	`369`	`+ return src, errors.WithStack(err)`
`370`	`370`	`}`
`371`	`371`	`if customTmpl != "" {`
`372`	`372`	`tmpl, err := ioutil.ReadFile(customTmpl)`
`@@ -375,17 +375,17 @@ func PgCreateStruct(`
`375`	`375`	`}`
`376`	`376`	`s, err := PgExecuteCustomTmpl(&StructTmpl{Struct: st}, string(tmpl))`
`377`	`377`	`if err != nil {`
`378`		`- return nil, errors.Wrap(err, "PgExecuteCustomTmpl failed")`
	`378`	`+ return nil, errors.WithStack(err)`
`379`	`379`	`}`
`380`	`380`	`src = append(src, s...)`
`381`	`381`	`} else {`
`382`	`382`	`s, err := PgExecuteDefaultTmpl(&StructTmpl{Struct: st}, "template/struct.tmpl")`
`383`	`383`	`if err != nil {`
`384`		`- return src, errors.Wrap(err, "faield to execute template")`
	`384`	`+ return src, errors.WithStack(err)`
`385`	`385`	`}`
`386`	`386`	`m, err := PgExecuteDefaultTmpl(&StructTmpl{Struct: st}, "template/method.tmpl")`
`387`	`387`	`if err != nil {`
`388`		`- return src, errors.Wrap(err, "faield to execute template")`
	`388`	`+ return src, errors.WithStack(err)`
`389`	`389`	`}`
`390`	`390`	`src = append(src, s...)`
`391`	`391`	`src = append(src, m...)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`func OpenDB(connStr string) (*sql.DB, error) {`
`12`	`12`	`conn, err := sql.Open("postgres", connStr)`
`13`	`13`	`if err != nil {`
`14`		`- return nil, errors.Wrap(err, "failed to connect to database")`
	`14`	`+ return nil, errors.WithStack(err)`
`15`	`15`	`}`
`16`	`16`	`return conn, nil`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func (r *T1) Create(db Queryer) error {`
`27`	`27`	`INSERT INTO t1 (i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id`,
`28`	`28`	`&r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData).Scan(&r.ID)`
`29`	`29`	`if err != nil {`
`30`		`- return errors.Wrap(err, "failed to insert t1")`
	`30`	`+ return errors.WithStack(err)`
`31`	`31`	`}`
`32`	`32`	`return nil`
`33`	`33`	`}`
`@@ -39,7 +39,7 @@ func GetT1ByPk(db Queryer, pk0 int64) (*T1, error) {`
`39`	`39`	`SELECT id, i, str, num_float, nullable_str, t_with_tz, t_without_tz, nullable_tz, json_data, xml_data FROM t1 WHERE id = $1`,
`40`	`40`	`pk0).Scan(&r.ID, &r.I, &r.Str, &r.NumFloat, &r.NullableStr, &r.TWithTz, &r.TWithoutTz, &r.NullableTz, &r.JSONData, &r.XMLData)`
`41`	`41`	`if err != nil {`
`42`		`- return nil, errors.Wrap(err, "failed to select t1")`
	`42`	`+ return nil, errors.WithStack(err)`
`43`	`43`	`}`
`44`	`44`	`return &r, nil`
`45`	`45`	`}`
`@@ -59,7 +59,7 @@ func (r *T2) Create(db Queryer) error {`
`59`	`59`	`INSERT INTO t2 (str, t_with_tz, t_without_tz) VALUES ($1, $2, $3) RETURNING id, i`,
`60`	`60`	`&r.Str, &r.TWithTz, &r.TWithoutTz).Scan(&r.ID, &r.I)`
`61`	`61`	`if err != nil {`
`62`		`- return errors.Wrap(err, "failed to insert t2")`
	`62`	`+ return errors.WithStack(err)`
`63`	`63`	`}`
`64`	`64`	`return nil`
`65`	`65`	`}`
`@@ -71,7 +71,7 @@ func GetT2ByPk(db Queryer, pk0 int64, pk1 int) (*T2, error) {`
`71`	`71`	`SELECT id, i, str, t_with_tz, t_without_tz FROM t2 WHERE id = $1 AND i = $2`,
`72`	`72`	`pk0, pk1).Scan(&r.ID, &r.I, &r.Str, &r.TWithTz, &r.TWithoutTz)`
`73`	`73`	`if err != nil {`
`74`		`- return nil, errors.Wrap(err, "failed to select t2")`
	`74`	`+ return nil, errors.WithStack(err)`
`75`	`75`	`}`
`76`	`76`	`return &r, nil`
`77`	`77`	`}`
`@@ -88,7 +88,7 @@ func (r *T3) Create(db Queryer) error {`
`88`	`88`	`INSERT INTO t3 (id, i) VALUES ($1, $2)`,
`89`	`89`	`&r.ID, &r.I)`
`90`	`90`	`if err != nil {`
`91`		`- return errors.Wrap(err, "failed to insert t3")`
	`91`	`+ return errors.WithStack(err)`
`92`	`92`	`}`
`93`	`93`	`return nil`
`94`	`94`	`}`
`@@ -100,7 +100,7 @@ func GetT3ByPk(db Queryer, pk0 int, pk1 int) (*T3, error) {`
`100`	`100`	`SELECT id, i FROM t3 WHERE id = $1 AND i = $2`,
`101`	`101`	`pk0, pk1).Scan(&r.ID, &r.I)`
`102`	`102`	`if err != nil {`
`103`		`- return nil, errors.Wrap(err, "failed to select t3")`
	`103`	`+ return nil, errors.WithStack(err)`
`104`	`104`	`}`
`105`	`105`	`return &r, nil`
`106`	`106`	`}`
`@@ -117,7 +117,7 @@ func (r *T4) Create(db Queryer) error {`
`117`	`117`	`INSERT INTO t4 (id, i) VALUES ($1, $2)`,
`118`	`118`	`&r.ID, &r.I)`
`119`	`119`	`if err != nil {`
`120`		`- return errors.Wrap(err, "failed to insert t4")`
	`120`	`+ return errors.WithStack(err)`
`121`	`121`	`}`
`122`	`122`	`return nil`
`123`	`123`	`}`
`@@ -129,7 +129,7 @@ func GetT4ByPk(db Queryer, pk0 int, pk1 int) (*T4, error) {`
`129`	`129`	`SELECT id, i FROM t4 WHERE id = $1 AND i = $2`,
`130`	`130`	`pk0, pk1).Scan(&r.ID, &r.I)`
`131`	`131`	`if err != nil {`
`132`		`- return nil, errors.Wrap(err, "failed to select t4")`
	`132`	`+ return nil, errors.WithStack(err)`
`133`	`133`	`}`
`134`	`134`	`return &r, nil`
`135`	`135`	`}`
`@@ -148,7 +148,7 @@ func (r *UserAccount) Create(db Queryer) error {`
`148`	`148`	`INSERT INTO user_account (email, last_name, first_name) VALUES ($1, $2, $3) RETURNING id`,
`149`	`149`	`&r.Email, &r.LastName, &r.FirstName).Scan(&r.ID)`
`150`	`150`	`if err != nil {`
`151`		`- return errors.Wrap(err, "failed to insert user_account")`
	`151`	`+ return errors.WithStack(err)`
`152`	`152`	`}`
`153`	`153`	`return nil`
`154`	`154`	`}`
`@@ -160,7 +160,7 @@ func GetUserAccountByPk(db Queryer, pk0 int64) (*UserAccount, error) {`
`160`	`160`	`SELECT id, email, last_name, first_name FROM user_account WHERE id = $1`,
`161`	`161`	`pk0).Scan(&r.ID, &r.Email, &r.LastName, &r.FirstName)`
`162`	`162`	`if err != nil {`
`163`		`- return nil, errors.Wrap(err, "failed to select user_account")`
	`163`	`+ return nil, errors.WithStack(err)`
`164`	`164`	`}`
`165`	`165`	`return &r, nil`
`166`	`166`	`}`
`@@ -179,7 +179,7 @@ func (r *UserAccountCompositePk) Create(db Queryer) error {`
`179`	`179`	`INSERT INTO user_account_composite_pk (id, email, last_name, first_name) VALUES ($1, $2, $3, $4)`,
`180`	`180`	`&r.ID, &r.Email, &r.LastName, &r.FirstName)`
`181`	`181`	`if err != nil {`
`182`		`- return errors.Wrap(err, "failed to insert user_account_composite_pk")`
	`182`	`+ return errors.WithStack(err)`
`183`	`183`	`}`
`184`	`184`	`return nil`
`185`	`185`	`}`
`@@ -191,7 +191,7 @@ func GetUserAccountCompositePkByPk(db Queryer, pk0 int64, pk1 string) (*UserAcco`
`191`	`191`	`SELECT id, email, last_name, first_name FROM user_account_composite_pk WHERE id = $1 AND email = $2`,
`192`	`192`	`pk0, pk1).Scan(&r.ID, &r.Email, &r.LastName, &r.FirstName)`
`193`	`193`	`if err != nil {`
`194`		`- return nil, errors.Wrap(err, "failed to select user_account_composite_pk")`
	`194`	`+ return nil, errors.WithStack(err)`
`195`	`195`	`}`
`196`	`196`	`return &r, nil`
`197`	`197`	`}`
`@@ -210,7 +210,7 @@ func (r *UserAccountUUID) Create(db Queryer) error {`
`210`	`210`	`INSERT INTO user_account_uuid (email, last_name, first_name) VALUES ($1, $2, $3) RETURNING uuid`,
`211`	`211`	`&r.Email, &r.LastName, &r.FirstName).Scan(&r.UUID)`
`212`	`212`	`if err != nil {`
`213`		`- return errors.Wrap(err, "failed to insert user_account_uuid")`
	`213`	`+ return errors.WithStack(err)`
`214`	`214`	`}`
`215`	`215`	`return nil`
`216`	`216`	`}`
`@@ -222,7 +222,7 @@ func GetUserAccountUUIDByPk(db Queryer, pk0 string) (*UserAccountUUID, error) {`
`222`	`222`	`SELECT uuid, email, last_name, first_name FROM user_account_uuid WHERE uuid = $1`,
`223`	`223`	`pk0).Scan(&r.UUID, &r.Email, &r.LastName, &r.FirstName)`
`224`	`224`	`if err != nil {`
`225`		`- return nil, errors.Wrap(err, "failed to select user_account_uuid")`
	`225`	`+ return nil, errors.WithStack(err)`
`226`	`226`	`}`
`227`	`227`	`return &r, nil`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func (r *{{ .Struct.Name }}) CreateContext(ctx context.Context, db Queryer) erro`
`20`	`20`	`{{ createInsertParams .Struct }})`
`21`	`21`	`{{- end }}`
`22`	`22`	`if err != nil {`
`23`		`- return errors.Wrap(err, "failed to insert {{ .Struct.Table.Name }}")`
	`23`	`+ return errors.WithStack(err)`
`24`	`24`	`}`
`25`	`25`	`return nil`
`26`	`26`	`}`
`@@ -32,7 +32,7 @@ func Get{{ .Struct.Name }}ByPkContext(ctx context.Context, db Queryer, {{ create`
`32`	`32`	`{{ createSelectByPkSQL .Struct }}`,
`33`	`33`	`{{ createSelectByPkSQLParams .Struct }}).Scan({{ createSelectByPkScan .Struct }})`
`34`	`34`	`if err != nil {`
`35`		`- return nil, errors.Wrap(err, "failed to select {{ .Struct.Table.Name }}")`
	`35`	`+ return nil, errors.WithStack(err)`
`36`	`36`	`}`
`37`	`37`	`return &r, nil`
`38`	`38`	`}`