Fix extra comma bug in mutations

psql/insert.go

@@ -131,7 +131,6 @@ func nestedInsertRelColumnsMap(item kvitem) map[string]struct{} {
 func renderNestedInsertRelColumns(w io.Writer, item kvitem, values bool) error {
 	if len(item.items) == 0 {
 		if item.relPC != nil && item.relPC.Type == RelOneToMany {
-			io.WriteString(w, `, `)
 			if values {
 				colWithTable(w, item.relPC.Left.Table, item.relPC.Left.Col)
 			} else {
@@ -141,14 +140,18 @@ func renderNestedInsertRelColumns(w io.Writer, item kvitem, values bool) error {
 	} else {
 		// Render child foreign key columns if child-to-parent
 		// relationship is one-to-many
+		i := 0
 		for _, v := range item.items {
 			if v.relCP.Type == RelOneToMany {
-				io.WriteString(w, `, `)
+				if i != 0 {
+					io.WriteString(w, `, `)
+				}
 				if values {
 					colWithTable(w, v.relCP.Left.Table, v.relCP.Left.Col)
 				} else {
 					quoted(w, v.relCP.Right.Col)
 				}
+				i++
 			}
 		}
 	}

psql/mutate.go

@@ -360,6 +360,7 @@ func renderInsertUpdateColumns(w io.Writer,
 	values bool) (uint32, error) {
 
 	root := &qc.Selects[0]
+	renderedCol := false
 
 	n := 0
 	for _, cn := range ti.Columns {
@@ -386,6 +387,10 @@ func renderInsertUpdateColumns(w io.Writer,
 		} else {
 			quoted(w, cn.Name)
 		}
+
+		if !renderedCol {
+			renderedCol = true
+		}
 		n++
 	}
 
@@ -407,10 +412,17 @@ func renderInsertUpdateColumns(w io.Writer,
 			io.WriteString(w, root.PresetMap[cn])
 			io.WriteString(w, `' :: `)
 			io.WriteString(w, col.Type)
-
 		} else {
 			quoted(w, cn)
 		}
+
+		if !renderedCol {
+			renderedCol = true
+		}
+	}
+
+	if len(skipcols) != 0 && renderedCol {
+		io.WriteString(w, `, `)
 	}
 	return 0, nil
 }

psql/update.go

@@ -164,7 +164,6 @@ func renderNestedUpdateRelColumns(w io.Writer, item kvitem, values bool) error {
 	// relationship is one-to-many
 	for _, v := range item.items {
 		if v._ctype > 0 && v.relCP.Type == RelOneToMany {
-			io.WriteString(w, `, `)
 			if values {
 				colWithTable(w, v.relCP.Left.Table, v.relCP.Left.Col)
 			} else {