Merge pull request #9 from lovoo/bbq

bbq: use schema filter for value export

bbq/bbq.go

@@ -58,10 +58,11 @@ func convertToMapReflect(value reflect.Value) map[string]bigquery.Value {
 	values := make(map[string]bigquery.Value, value.NumField())
 
 	for i := 0; i < value.NumField(); i++ {
-		// field is ignored for marshalling, so let's not export it
-		if value.Type().Field(i).Tag.Get("json") == "-" {
+
+		if !useFieldForExport(value.Type().Field(i)) {
 			continue
 		}
+
 		switch value.Field(i).Kind() {
 		case reflect.Ptr:
 			if !value.Field(i).IsNil() && value.Field(i).Elem().Kind() == reflect.Struct {

bbq/infer_schema.go

@@ -119,16 +119,8 @@ func inferFields(rt reflect.Type) (bigquery.Schema, error) {
 
 	for i := 0; i < rt.NumField(); i++ {
 		field := rt.Field(i)
-		// field is ignored for marshalling, so let's not export it
-		if field.Tag.Get("json") == "-" {
-			continue
-		}
-		if field.Name == "" {
-			continue
-		}
 
-		// if the field is not exported, drop it
-		if strings.ToUpper(field.Name[:1]) != field.Name[:1] {
+		if !useFieldForExport(field) {
 			continue
 		}
 
@@ -154,6 +146,24 @@ func isSupportedIntType(t reflect.Type) bool {
 	}
 }
 
+// Checks whether a field should be exported. This is both used for the mapping and for
+// inferring the schema
+func useFieldForExport(field reflect.StructField) bool {
+	// field is ignored for marshalling, so let's not export it
+	if field.Tag.Get("json") == "-" {
+		return false
+	}
+	if field.Name == "" {
+		return false
+	}
+
+	// if the field is not exported, drop it
+	if strings.ToUpper(field.Name[:1]) != field.Name[:1] {
+		return false
+	}
+	return true
+}
+
 // typeList is a linked list of reflect.Types.
 type typeList struct {
 	t    reflect.Type