WIP

gen.go.tmpl

@@ -28,15 +28,15 @@ const {{.LowerType}}_SelectQuery = "{{.SelectQuery}}"
 
 func {{.LowerType}}_Insert(
 	tx dbConn,
-	row *{{.Type}},
+	row {{.Type}},
-) (err error) {
+) ({{.Type}}, error) {
-  {{.LowerType}}_Sanitize(row)
+  row = {{.LowerType}}_Sanitize(row)
-  if err = {{.LowerType}}_Validate(row); err != nil {
+  if err := {{.LowerType}}_Validate(row); err != nil {
-    return err
+    return row, err
   }
 
-	_, err = tx.Exec("{{.InsertQuery}}", {{.InsertArgs}})
+	_, err := tx.Exec("{{.InsertQuery}}", {{.InsertArgs}})
-	return err
+	return row, err
 }
 
 {{- end}} {{/* if not .NoInsert */}}
@@ -47,27 +47,27 @@ func {{.LowerType}}_Insert(
 
 func {{.LowerType}}_Update(
 	tx dbConn,
-	row *{{.Type}},
+	row {{.Type}},
-) (err error) {
+) ({{.Type}}, error) {
-  {{.LowerType}}_Sanitize(row)
+  row = {{.LowerType}}_Sanitize(row)
-  if err = {{.LowerType}}_Validate(row); err != nil {
+  if err := {{.LowerType}}_Validate(row); err != nil {
-    return err
+    return row, err
   }
 
 	result, err := tx.Exec("{{.UpdateQuery}}", {{.UpdateArgs}})
 	if err != nil {
-		return err
+		return row, err
 	}
 
 	n, err := result.RowsAffected()
 	if err != nil {
-		return err
+		return row, err
 	}
 	switch n {
 	case 0:
-		return sql.ErrNoRows
+		return row, sql.ErrNoRows
 	case 1:
-		return nil
+		return row, nil
 	default:
 		panic("multiple rows updated")
 	}
@@ -78,27 +78,27 @@ func {{.LowerType}}_Update(
 
 func {{.LowerType}}_UpdateFull(
 	tx dbConn,
-	row *{{.Type}},
+	row {{.Type}},
-) (err error) {
+) ({{.Type}}, error) {
-  {{.LowerType}}_Sanitize(row)
+  row = {{.LowerType}}_Sanitize(row)
-  if err = {{.LowerType}}_Validate(row); err != nil {
+  if err := {{.LowerType}}_Validate(row); err != nil {
-    return err
+    return row, err
   }
 
 	result, err := tx.Exec("{{.UpdateFullQuery}}", {{.UpdateFullArgs}})
 	if err != nil {
-		return err
+		return row, err
 	}
 
 	n, err := result.RowsAffected()
 	if err != nil {
-		return err
+		return row, err
 	}
 	switch n {
 		case 0:
-		return sql.ErrNoRows
+		return row, sql.ErrNoRows
 	case 1:
-		return nil
+		return row, nil
 	default:
 		panic("multiple rows updated")
 	}