Merging omitempty and inline tag options into the 'db' tag. Fixing #12.

util/main.go

@@ -43,6 +43,25 @@ type C struct {
 	SetName string
 }
 
+type tagOptions map[string]bool
+
+func parseTagOptions(s string) tagOptions {
+	opts := make(tagOptions)
+	chunks := strings.Split(s, ",")
+	for _, chunk := range chunks {
+		opts[strings.TrimSpace(chunk)] = true
+	}
+	return opts
+}
+
+// Based on http://golang.org/src/pkg/encoding/json/tags.go
+func ParseTag(tag string) (string, tagOptions) {
+	if i := strings.Index(tag, ","); i != -1 {
+		return tag[:i], parseTagOptions(tag[i+1:])
+	}
+	return tag, parseTagOptions("")
+}
+
 func columnCompare(s string) string {
 	return strings.ToLower(columnCompareExclude.ReplaceAllString(s, ""))
 }
@@ -56,35 +75,46 @@ func GetStructFieldIndex(t reflect.Type, columnName string) []int {
 
 	n := t.NumField()
 
-	columnNameLower := columnCompare(columnName)
-
 	for i := 0; i < n; i++ {
 
 		field := t.Field(i)
 
-		// Field is exported.
-		if field.PkgPath == "" {
+		if field.PkgPath != "" {
+			// Field is unexported.
+			continue
+		}
 
-			tag := field.Tag
+		// Attempt to use db:"column_name"
+		fieldName, fieldOptions := ParseTag(field.Tag.Get("db"))
 
-			// Tag: field:"columnName"
-			fieldName := tag.Get("field")
+		// Deprecated "field" tag.
+		if deprecatedField := field.Tag.Get("field"); deprecatedField != "" {
+			fieldName = deprecatedField
+		}
 
-			if fieldName != "" {
-				if fieldName == columnName {
-					return []int{i}
+		// Deprecated "inline" tag.
+		if deprecatedInline := field.Tag.Get("inline"); deprecatedInline != "" {
+			fieldOptions["inline"] = true
 		}
+
+		// Matching fieldName
+		if fieldName == "-" {
+			continue
 		}
 
-			// Simply matching column to name.
-			fieldNameLower := columnCompare(field.Name)
+		// Attempt to match field name.
+		if fieldName == columnName {
+			return []int{i}
+		}
 
-			if fieldNameLower == columnNameLower {
+		if fieldName == "" {
+			if columnCompare(field.Name) == columnCompare(columnName) {
 				return []int{i}
 			}
+		}
 
-			// Tag: inline:bool
-			if tag.Get("inline") == "true" {
+		// Inline option.
+		if fieldOptions["inline"] == true {
 			index := GetStructFieldIndex(field.Type, columnName)
 			if index != nil {
 				res := append([]int{i}, index...)
@@ -94,8 +124,6 @@ func GetStructFieldIndex(t reflect.Type, columnName string) []int {
 
 	}
 
-	}
-
 	// No match.
 	return nil
 }

util/sqlutil/main.go

@@ -270,6 +270,7 @@ func (self *T) FieldValues(item interface{}, convertFn func(interface{}) interfa
 	switch item_t.Kind() {
 
 	case reflect.Struct:
+
 		nfields := item_v.NumField()
 
 		values = make([]interface{}, 0, nfields)
@@ -279,26 +280,31 @@ func (self *T) FieldValues(item interface{}, convertFn func(interface{}) interfa
 
 			field := item_t.Field(i)
 
-			if field.PkgPath == "" {
-
-				value := item_v.Field(i).Interface()
+			if field.PkgPath != "" {
+				// Field is unexported.
+				continue
+			}
 
-				// Struct tags
-				tag := field.Tag
+			// Field options.
+			fieldName, fieldOptions := util.ParseTag(field.Tag.Get("db"))
 
-				// omitempty:bool
-				if tag.Get("omitempty") == "true" {
-					zero := reflect.Zero(reflect.TypeOf(value)).Interface()
-					if value == zero {
-						continue
+			// Deprecated "field" tag.
+			if deprecatedField := field.Tag.Get("field"); deprecatedField != "" {
+				fieldName = deprecatedField
 			}
+
+			// Deprecated "omitempty" tag.
+			if deprecatedOmitEmpty := field.Tag.Get("omitempty"); deprecatedOmitEmpty != "" {
+				fieldOptions["omitempty"] = true
 			}
 
-				// field:string
-				fieldName := tag.Get("field")
+			// Deprecated "inline" tag.
+			if deprecatedInline := field.Tag.Get("inline"); deprecatedInline != "" {
+				fieldOptions["inline"] = true
+			}
 
+			// Processing field name.
 			if fieldName == "-" {
-					// Skip the field if its tag's value is -
 				continue
 			}
 
@@ -306,8 +312,17 @@ func (self *T) FieldValues(item interface{}, convertFn func(interface{}) interfa
 				fieldName = self.ColumnLike(field.Name)
 			}
 
-				// inline:bool
-				if tag.Get("inline") == "true" {
+			// Processing tag options.
+			value := item_v.Field(i).Interface()
+
+			if fieldOptions["omitempty"] == true {
+				zero := reflect.Zero(reflect.TypeOf(value)).Interface()
+				if value == zero {
+					continue
+				}
+			}
+
+			if fieldOptions["inline"] == true {
 				infields, invalues, inerr := self.FieldValues(value, convertFn)
 				if inerr != nil {
 					return nil, nil, inerr
@@ -320,7 +335,6 @@ func (self *T) FieldValues(item interface{}, convertFn func(interface{}) interfa
 			}
 
 		}
-		}
 	case reflect.Map:
 		nfields := item_v.Len()
 		values = make([]interface{}, nfields)