rename structFieldValues to writeableStructFieldValues

Author: ungerik

impl/insert.go

@@ -136,7 +136,7 @@ func insertStructValues(table string, rowStruct any, namer sqldb.StructFieldName
 		return nil, nil, fmt.Errorf("InsertStruct into table %s: expected struct but got %T", table, rowStruct)
 	}
 
-	columns, _, vals = structFieldValues(v, namer, ignoreColumns, restrictToColumns, false)
+	columns, _, vals = writeableStructFieldValues(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) // TODO better error message
 	}

impl/scanstruct.go

@@ -96,7 +96,7 @@ func getStructFieldPointers(v reflect.Value, namer sqldb.StructFieldNamer, ignor
 	return nil
 }
 
-// structFieldValues returns the struct field names using the passed namer ignoring names in ignoreNames
+// writeableStructFieldValues 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.
@@ -105,7 +105,7 @@ func getStructFieldPointers(v reflect.Value, namer sqldb.StructFieldNamer, ignor
 // 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.
 // 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 []any) {
+func writeableStructFieldValues(v reflect.Value, namer sqldb.StructFieldNamer, ignoreNames, restrictToNames []string, keepPK bool) (names []string, flags []sqldb.FieldFlag, vals []any) {
 	for i := 0; i < v.NumField(); i++ {
 		field := v.Type().Field(i)
 		name, flag, ok := namer.StructFieldName(field)
@@ -114,7 +114,7 @@ func structFieldValues(v reflect.Value, namer sqldb.StructFieldNamer, ignoreName
 		}
 
 		if field.Anonymous {
-			embedNames, embedFlags, embedValues := structFieldValues(v.Field(i), namer, ignoreNames, restrictToNames, keepPK)
+			embedNames, embedFlags, embedValues := writeableStructFieldValues(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 any, namer sqld
 		return fmt.Errorf("UpdateStruct of table %s: expected struct but got %T", table, rowStruct)
 	}
 
-	columns, flags, vals := structFieldValues(v, namer, ignoreColumns, restrictToColumns, true)
+	columns, flags, vals := writeableStructFieldValues(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) // TODO better error message
 	}

impl/upsert.go

@@ -26,7 +26,7 @@ func UpsertStruct(conn sqldb.Connection, table string, rowStruct any, namer sqld
 		return fmt.Errorf("UpsertStruct to table %s: expected struct but got %T", table, rowStruct)
 	}
 
-	columns, flags, vals := structFieldValues(v, namer, ignoreColumns, restrictToColumns, true)
+	columns, flags, vals := writeableStructFieldValues(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) // TODO better error message
 	}