fixed structFieldValues not returning readonly fields

Author: ungerik

impl/insert.go

@@ -134,16 +134,7 @@ func insertStructValues(table string, rowStruct interface{}, namer sqldb.StructF
 		return nil, nil, fmt.Errorf("InsertStruct into table %s: expected struct but got %T", table, rowStruct)
 	}
 
-	columns, flags, vals := structFields(v, namer, ignoreColumns, restrictToColumns, false)
-	for i := 0; i < len(columns); i++ {
-		// Remove readonly column data
-		if flags[i].IsReadOnly() {
-			columns = append(columns[:i], columns[i+1:]...)
-			flags = append(flags[:i], flags[i+1:]...)
-			vals = append(vals[:i], vals[i+1:]...)
-			i--
-		}
-	}
+	columns, _, vals = structFieldValues(v, namer, ignoreColumns, restrictToColumns, false)
 	if len(columns) == 0 {
 		return nil, nil, fmt.Errorf("InsertStruct into table %s: %T has no exported struct fields with `db` tag", table, rowStruct)
 	}

impl/scanstruct.go

@@ -96,22 +96,25 @@ func getStructFieldPointers(v reflect.Value, namer sqldb.StructFieldNamer, ignor
 	return nil
 }
 
-// structFields returns the struct field names using the passed namer ignoring names in ignoreNames
+// structFieldValues returns the struct field names using the passed namer ignoring names in ignoreNames
 // and if restrictToNames is not empty, then filtering out names not in it.
+// struct fields with ,readonly suffix in their struct field naming tag will not be returned
+// because this function is intended for getting struct values for writing.
 // If true is passed for keepPK, then ignoreNames and restrictToNames are not applied to names with
 // the ,pk suffix in their struct field naming tag.
 // The same number of pkCol bools will be returend as names, every corresponding bool marking
 // if the name had the ,pk suffix in their struct field naming tag.
-func structFields(v reflect.Value, namer sqldb.StructFieldNamer, ignoreNames, restrictToNames []string, keepPK bool) (names []string, flags []sqldb.FieldFlag, vals []interface{}) {
+// If false is passed for keepReadOnly then
+func structFieldValues(v reflect.Value, namer sqldb.StructFieldNamer, ignoreNames, restrictToNames []string, keepPK bool) (names []string, flags []sqldb.FieldFlag, vals []interface{}) {
 	for i := 0; i < v.NumField(); i++ {
 		field := v.Type().Field(i)
 		name, flag, ok := namer.StructFieldName(field)
-		if !ok {
+		if !ok || flag.IsReadOnly() {
 			continue
 		}
 
 		if field.Anonymous {
-			embedNames, embedFlags, embedValues := structFields(v.Field(i), namer, ignoreNames, restrictToNames, keepPK)
+			embedNames, embedFlags, embedValues := structFieldValues(v.Field(i), namer, ignoreNames, restrictToNames, keepPK)
 			names = append(names, embedNames...)
 			flags = append(flags, embedFlags...)
 			vals = append(vals, embedValues...)

impl/update.go

@@ -76,7 +76,7 @@ func UpdateStruct(conn sqldb.Connection, table string, rowStruct interface{}, na
 		return fmt.Errorf("UpdateStruct of table %s: expected struct but got %T", table, rowStruct)
 	}
 
-	columns, flags, vals := structFields(v, namer, ignoreColumns, restrictToColumns, true)
+	columns, flags, vals := structFieldValues(v, namer, ignoreColumns, restrictToColumns, true)
 	if len(columns) == 0 {
 		return fmt.Errorf("UpdateStruct of table %s: %T has no exported struct fields with `db` tag", table, rowStruct)
 	}

impl/upsert.go

@@ -26,7 +26,7 @@ func UpsertStruct(conn sqldb.Connection, table string, rowStruct interface{}, na
 		return fmt.Errorf("UpsertStruct to table %s: expected struct but got %T", table, rowStruct)
 	}
 
-	columns, flags, vals := structFields(v, namer, ignoreColumns, restrictToColumns, true)
+	columns, flags, vals := structFieldValues(v, namer, ignoreColumns, restrictToColumns, true)
 	if len(columns) == 0 {
 		return fmt.Errorf("UpsertStruct to table %s: %T has no exported struct fields with `db` tag", table, rowStruct)
 	}