Merge pull request #34 from Shelnutt2/issue-33

Shelnutt2 · web-flow · commit 223474467a3a · 2020-04-29T06:28:30.000-04:00
Fix including primary_key with json tags
diff --git a/utils_mysql.go b/utils_mysql.go
@@ -95,7 +95,7 @@ func generateMysqlTypes(obj map[string]map[string]string, depth int, jsonAnnotat
 			annotations = append(annotations, fmt.Sprintf("gorm:\"column:%s%s\"", key, primary))
 		}
 		if jsonAnnotation == true {
-			annotations = append(annotations, fmt.Sprintf("json:\"%s%s\"", key, primary))
+			annotations = append(annotations, fmt.Sprintf("json:\"%s\"", key))
 		}
 		if len(annotations) > 0 {
 			structure += fmt.Sprintf("\n%s %s `%s`",

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func generateMysqlTypes(obj map[string]map[string]string, depth int, jsonAnnotat`
`95`	`95`	`annotations = append(annotations, fmt.Sprintf("gorm:\"column:%s%s\"", key, primary))`
`96`	`96`	`}`
`97`	`97`	`if jsonAnnotation == true {`
`98`		`- annotations = append(annotations, fmt.Sprintf("json:\"%s%s\"", key, primary))`
	`98`	`+ annotations = append(annotations, fmt.Sprintf("json:\"%s\"", key))`
`99`	`99`	`}`
`100`	`100`	`if len(annotations) > 0 {`
`101`	`101`	structure += fmt.Sprintf("\n%s %s `%s`",