Merge branch 'yuzuy/conflict_column_name_and_method_name' into dev

Author: aarondl

boilingcore/text_helpers.go

@@ -38,12 +38,23 @@ import (
 // fk == table = industry.Industry | industry.Industry
 // fk != table = industry.ParentIndustry | industry.Industry
 func txtNameToOne(fk drivers.ForeignKey) (localFn, foreignFn string) {
-	foreignFn = strmangle.Singular(trimSuffixes(fk.Column))
-	fkeyNotTableName := foreignFn != strmangle.Singular(fk.ForeignTable)
-	foreignFn = strmangle.TitleCase(foreignFn)
+	fkColumnTrimmedSuffixes := strmangle.Singular(trimSuffixes(fk.Column))
+	fkNotTableName := fkColumnTrimmedSuffixes != strmangle.Singular(fk.ForeignTable)
+	singularForeignTable := strmangle.Singular(fk.ForeignTable)
+
+	if fkColumnTrimmedSuffixes == singularForeignTable {
+		foreignFn = strmangle.TitleCase(strmangle.Singular(fk.Table) + "_" + fkColumnTrimmedSuffixes)
+		if fk.Column != singularForeignTable {
+			foreignFn = strmangle.TitleCase(fkColumnTrimmedSuffixes)
+		}
+	} else if fkColumnTrimmedSuffixes == fk.Column {
+		foreignFn = strmangle.TitleCase(fkColumnTrimmedSuffixes + "_" + strmangle.Singular(fk.ForeignTable))
+	} else {
+		foreignFn = strmangle.TitleCase(fkColumnTrimmedSuffixes)
+	}
 
-	if fkeyNotTableName {
-		localFn = foreignFn
+	if fkNotTableName {
+		localFn = strmangle.TitleCase(fkColumnTrimmedSuffixes)
 	}
 
 	plurality := strmangle.Plural

boilingcore/text_helpers_test.go

@@ -39,6 +39,13 @@ func TestTxtNameToOne(t *testing.T) {
 		{"videos", "user_id", true, "users", "id", true, "Video", "User"},
 		{"videos", "producer_id", true, "users", "id", true, "ProducerVideo", "Producer"},
 
+		{"videos", "user", false, "users", "id", true, "Videos", "VideoUser"},
+		{"videos", "created_by", false, "users", "id", true, "CreatedByVideos", "CreatedByUser"},
+		{"videos", "director", false, "users", "id", true, "DirectorVideos", "DirectorUser"},
+		{"videos", "user", true, "users", "id", true, "Video", "VideoUser"},
+		{"videos", "created_by", true, "users", "id", true, "CreatedByVideo", "CreatedByUser"},
+		{"videos", "director", true, "users", "id", true, "DirectorVideo", "DirectorUser"},
+
 		{"industries", "industry_id", false, "industries", "id", true, "Industries", "Industry"},
 		{"industries", "parent_id", false, "industries", "id", true, "ParentIndustries", "Parent"},
 		{"industries", "industry_id", true, "industries", "id", true, "Industry", "Industry"},