Update mock and tests to use better tables

bdb/drivers/mock.go

@@ -10,14 +10,17 @@ type MockDriver struct{}
 
 // TableNames returns a list of mock table names
 func (m *MockDriver) TableNames(exclude []string) ([]string, error) {
-	tables := []string{"pilots", "jets", "airports", "licenses", "hangars", "pilots_jets_tags"}
+	tables := []string{"pilots", "jets", "airports", "licenses", "hangars", "languages", "pilot_languages"}
 	return strmangle.SetComplement(tables, exclude), nil
 }
 
 // Columns returns a list of mock columns
 func (m *MockDriver) Columns(tableName string) ([]bdb.Column, error) {
 	return map[string][]bdb.Column{
-		"pilots": {{Name: "id", Type: "int", DBType: "integer"}},
+		"pilots": {
+			{Name: "id", Type: "int", DBType: "integer"},
+			{Name: "name", Type: "string", DBType: "character"},
+		},
 		"airports": {
 			{Name: "id", Type: "int", DBType: "integer"},
 			{Name: "size", Type: "null.Int", DBType: "integer", Nullable: true},
@@ -36,15 +39,18 @@ func (m *MockDriver) Columns(tableName string) ([]bdb.Column, error) {
 		"licenses": {
 			{Name: "id", Type: "int", DBType: "integer"},
 			{Name: "pilot_id", Type: "int", DBType: "integer"},
-			{Name: "source_id", Type: "int", DBType: "integer", Nullable: true},
 		},
 		"hangars": {
 			{Name: "id", Type: "int", DBType: "integer"},
 			{Name: "name", Type: "string", DBType: "character", Nullable: true, Unique: true},
 		},
-		"pilots_jets_tags": {
+		"languages": {
+			{Name: "id", Type: "int", DBType: "integer"},
+			{Name: "language", Type: "string", DBType: "character", Nullable: false, Unique: true},
+		},
+		"pilot_languages": {
 			{Name: "pilot_id", Type: "int", DBType: "integer"},
-			{Name: "jet_id", Type: "int", DBType: "integer"},
+			{Name: "language_id", Type: "int", DBType: "integer"},
 		},
 	}[tableName], nil
 }
@@ -58,11 +64,10 @@ func (m *MockDriver) ForeignKeyInfo(tableName string) ([]bdb.ForeignKey, error)
 		},
 		"licenses": {
 			{Name: "licenses_pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id"},
-			{Name: "licenses_source_id_fk", Column: "source_id", ForeignTable: "pilots", ForeignColumn: "id"},
 		},
-		"pilots_jets_tags": {
+		"pilot_languages": {
 			{Name: "pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id"},
-			{Name: "jet_id_fk", Column: "jet_id", ForeignTable: "jets", ForeignColumn: "id"},
+			{Name: "jet_id_fk", Column: "language_id", ForeignTable: "languages", ForeignColumn: "id"},
 		},
 	}[tableName], nil
 }
@@ -96,9 +101,13 @@ func (m *MockDriver) PrimaryKeyInfo(tableName string) (*bdb.PrimaryKey, error) {
 			Name:    "hangar_id_pkey",
 			Columns: []string{"id"},
 		},
-		"pilots_jets_tags": {
+		"languages": {
-			Name:    "pilot_jet_id_pkey",
+			Name:    "language_id_pkey",
-			Columns: []string{"pilot_id", "jet_id"},
+			Columns: []string{"id"},
+		},
+		"pilot_languages": {
+			Name:    "pilot_languages_pkey",
+			Columns: []string{"pilot_id", "language_id"},
 		},
 	}[tableName], nil
 }

bdb/relationships_test.go

@@ -9,46 +9,71 @@ func TestToManyRelationships(t *testing.T) {
 	t.Parallel()
 
 	tables := []Table{
-		{Name: "users", Columns: []Column{{Name: "id"}}},
-		{Name: "contests", Columns: []Column{{Name: "id"}}},
 		{
-			Name: "videos",
+			Name: "pilots",
 			Columns: []Column{
 				{Name: "id"},
-				{Name: "user_id"},
+				{Name: "name"},
-				{Name: "contest_id"},
-			},
-			FKeys: []ForeignKey{
-				{Name: "videos_user_id_fk", Column: "user_id", ForeignTable: "users", ForeignColumn: "id"},
-				{Name: "videos_contest_id_fk", Column: "contest_id", ForeignTable: "contests", ForeignColumn: "id"},
 			},
 		},
 		{
-			Name: "notifications",
+			Name: "airports",
 			Columns: []Column{
-				{Name: "user_id"},
+				{Name: "id"},
-				{Name: "source_id"},
+				{Name: "size"},
-			},
-			FKeys: []ForeignKey{
-				{Name: "notifications_user_id_fk", Column: "user_id", ForeignTable: "users", ForeignColumn: "id"},
-				{Name: "notifications_source_id_fk", Column: "source_id", ForeignTable: "users", ForeignColumn: "id"},
 			},
 		},
 		{
-			Name:        "users_video_tags",
+			Name: "jets",
+			Columns: []Column{
+				{Name: "id"},
+				{Name: "pilot_id"},
+				{Name: "airport_id"},
+			},
+			FKeys: []ForeignKey{
+				{Name: "jets_pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id"},
+				{Name: "jets_airport_id_fk", Column: "airport_id", ForeignTable: "airports", ForeignColumn: "id"},
+			},
+		},
+		{
+			Name: "licenses",
+			Columns: []Column{
+				{Name: "id"},
+				{Name: "pilot_id"},
+			},
+			FKeys: []ForeignKey{
+				{Name: "licenses_pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id"},
+			},
+		},
+		{
+			Name: "hangars",
+			Columns: []Column{
+				{Name: "id"},
+				{Name: "name"},
+			},
+		},
+		{
+			Name: "languages",
+			Columns: []Column{
+				{Name: "id"},
+				{Name: "language"},
+			},
+		},
+		{
+			Name:        "pilot_languages",
 			IsJoinTable: true,
 			Columns: []Column{
-				{Name: "user_id"},
+				{Name: "pilot_id"},
-				{Name: "video_id"},
+				{Name: "language_id"},
 			},
 			FKeys: []ForeignKey{
-				{Name: "user_id_fk", Column: "user_id", ForeignTable: "users", ForeignColumn: "id"},
+				{Name: "pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id"},
-				{Name: "video_id_fk", Column: "video_id", ForeignTable: "videos", ForeignColumn: "id"},
+				{Name: "language_id_fk", Column: "language_id", ForeignTable: "languages", ForeignColumn: "id"},
 			},
 		},
 	}
 
-	relationships := ToManyRelationships("users", tables)
+	relationships := ToManyRelationships("pilots", tables)
 
 	expected := []ToManyRelationship{
 		{
@@ -56,8 +81,8 @@ func TestToManyRelationships(t *testing.T) {
 			Nullable: false,
 			Unique:   false,
 
-			ForeignTable:          "videos",
+			ForeignTable:          "jets",
-			ForeignColumn:         "user_id",
+			ForeignColumn:         "pilot_id",
 			ForeignColumnNullable: false,
 			ForeignColumnUnique:   false,
 
@@ -68,8 +93,8 @@ func TestToManyRelationships(t *testing.T) {
 			Nullable: false,
 			Unique:   false,
 
-			ForeignTable:          "notifications",
+			ForeignTable:          "licenses",
-			ForeignColumn:         "user_id",
+			ForeignColumn:         "pilot_id",
 			ForeignColumnNullable: false,
 			ForeignColumnUnique:   false,
 
@@ -80,37 +105,25 @@ func TestToManyRelationships(t *testing.T) {
 			Nullable: false,
 			Unique:   false,
 
-			ForeignTable:          "notifications",
+			ForeignTable:          "languages",
-			ForeignColumn:         "source_id",
-			ForeignColumnNullable: false,
-			ForeignColumnUnique:   false,
-
-			ToJoinTable: false,
-		},
-		{
-			Column:   "id",
-			Nullable: false,
-			Unique:   false,
-
-			ForeignTable:          "videos",
 			ForeignColumn:         "id",
 			ForeignColumnNullable: false,
 			ForeignColumnUnique:   false,
 
 			ToJoinTable: true,
-			JoinTable:   "users_video_tags",
+			JoinTable:   "pilot_languages",
 
-			JoinLocalColumn:         "user_id",
+			JoinLocalColumn:         "pilot_id",
 			JoinLocalColumnNullable: false,
 			JoinLocalColumnUnique:   false,
 
-			JoinForeignColumn:         "video_id",
+			JoinForeignColumn:         "language_id",
 			JoinForeignColumnNullable: false,
 			JoinForeignColumnUnique:   false,
 		},
 	}
 
-	if len(relationships) != 4 {
+	if len(relationships) != 3 {
 		t.Error("wrong # of relationships:", len(relationships))
 	}
 
@@ -125,47 +138,72 @@ func TestToManyRelationshipsNull(t *testing.T) {
 	t.Parallel()
 
 	tables := []Table{
-		{Name: "users", Columns: []Column{{Name: "id", Nullable: true, Unique: true}}},
-		{Name: "contests", Columns: []Column{{Name: "id", Nullable: true, Unique: true}}},
 		{
-			Name: "videos",
+			Name: "pilots",
 			Columns: []Column{
 				{Name: "id", Nullable: true, Unique: true},
-				{Name: "user_id", Nullable: true, Unique: true},
+				{Name: "name", Nullable: true, Unique: true},
-				{Name: "contest_id", Nullable: true, Unique: true},
-			},
-			FKeys: []ForeignKey{
-				{Name: "videos_user_id_fk", Column: "user_id", ForeignTable: "users", ForeignColumn: "id", Nullable: true, Unique: true},
-				{Name: "videos_contest_id_fk", Column: "contest_id", ForeignTable: "contests", ForeignColumn: "id", Nullable: true, Unique: true},
 			},
 		},
 		{
-			Name: "notifications",
+			Name: "airports",
 			Columns: []Column{
-				{Name: "user_id", Nullable: true, Unique: true},
+				{Name: "id", Nullable: true, Unique: true},
-				{Name: "source_id", Nullable: true, Unique: true},
+				{Name: "size", Nullable: true, Unique: true},
-			},
-			FKeys: []ForeignKey{
-				{Name: "notifications_user_id_fk", Column: "user_id", ForeignTable: "users", ForeignColumn: "id", Nullable: true, Unique: true},
-				{Name: "notifications_source_id_fk", Column: "source_id", ForeignTable: "users", ForeignColumn: "id", Nullable: true, Unique: true},
 			},
 		},
 		{
-			Name:        "users_video_tags",
+			Name: "jets",
+			Columns: []Column{
+				{Name: "id", Nullable: true, Unique: true},
+				{Name: "pilot_id", Nullable: true, Unique: true},
+				{Name: "airport_id", Nullable: true, Unique: true},
+			},
+			FKeys: []ForeignKey{
+				{Name: "jets_pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id", Nullable: true, Unique: true},
+				{Name: "jets_airport_id_fk", Column: "airport_id", ForeignTable: "airports", ForeignColumn: "id", Nullable: true, Unique: true},
+			},
+		},
+		{
+			Name: "licenses",
+			Columns: []Column{
+				{Name: "id", Nullable: true, Unique: true},
+				{Name: "pilot_id", Nullable: true, Unique: true},
+			},
+			FKeys: []ForeignKey{
+				{Name: "licenses_pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id", Nullable: true, Unique: true},
+			},
+		},
+		{
+			Name: "hangars",
+			Columns: []Column{
+				{Name: "id", Nullable: true, Unique: true},
+				{Name: "name", Nullable: true, Unique: true},
+			},
+		},
+		{
+			Name: "languages",
+			Columns: []Column{
+				{Name: "id", Nullable: true, Unique: true},
+				{Name: "language", Nullable: true, Unique: true},
+			},
+		},
+		{
+			Name:        "pilot_languages",
 			IsJoinTable: true,
 			Columns: []Column{
-				{Name: "user_id", Nullable: true, Unique: true},
+				{Name: "pilot_id", Nullable: true, Unique: true},
-				{Name: "video_id", Nullable: true, Unique: true},
+				{Name: "language_id", Nullable: true, Unique: true},
 			},
 			FKeys: []ForeignKey{
-				{Name: "user_id_fk", Column: "user_id", ForeignTable: "users", ForeignColumn: "id", Nullable: true, Unique: true},
+				{Name: "pilot_id_fk", Column: "pilot_id", ForeignTable: "pilots", ForeignColumn: "id", Nullable: true, Unique: true},
-				{Name: "video_id_fk", Column: "video_id", ForeignTable: "videos", ForeignColumn: "id", Nullable: true, Unique: true},
+				{Name: "language_id_fk", Column: "language_id", ForeignTable: "languages", ForeignColumn: "id", Nullable: true, Unique: true},
 			},
 		},
 	}
 
-	relationships := ToManyRelationships("users", tables)
+	relationships := ToManyRelationships("pilots", tables)
-	if len(relationships) != 4 {
+	if len(relationships) != 3 {
 		t.Error("wrong # of relationships:", len(relationships))
 	}
 
@@ -175,8 +213,8 @@ func TestToManyRelationshipsNull(t *testing.T) {
 			Nullable: true,
 			Unique:   true,
 
-			ForeignTable:          "videos",
+			ForeignTable:          "jets",
-			ForeignColumn:         "user_id",
+			ForeignColumn:         "pilot_id",
 			ForeignColumnNullable: true,
 			ForeignColumnUnique:   true,
 
@@ -187,8 +225,8 @@ func TestToManyRelationshipsNull(t *testing.T) {
 			Nullable: true,
 			Unique:   true,
 
-			ForeignTable:          "notifications",
+			ForeignTable:          "licenses",
-			ForeignColumn:         "user_id",
+			ForeignColumn:         "pilot_id",
 			ForeignColumnNullable: true,
 			ForeignColumnUnique:   true,
 
@@ -199,31 +237,19 @@ func TestToManyRelationshipsNull(t *testing.T) {
 			Nullable: true,
 			Unique:   true,
 
-			ForeignTable:          "notifications",
+			ForeignTable:          "languages",
-			ForeignColumn:         "source_id",
-			ForeignColumnNullable: true,
-			ForeignColumnUnique:   true,
-
-			ToJoinTable: false,
-		},
-		{
-			Column:   "id",
-			Nullable: true,
-			Unique:   true,
-
-			ForeignTable:          "videos",
 			ForeignColumn:         "id",
 			ForeignColumnNullable: true,
 			ForeignColumnUnique:   true,
 
 			ToJoinTable: true,
-			JoinTable:   "users_video_tags",
+			JoinTable:   "pilot_languages",
 
-			JoinLocalColumn:         "user_id",
+			JoinLocalColumn:         "pilot_id",
 			JoinLocalColumnNullable: true,
 			JoinLocalColumnUnique:   true,
 
-			JoinForeignColumn:         "video_id",
+			JoinForeignColumn:         "language_id",
 			JoinForeignColumnNullable: true,
 			JoinForeignColumnUnique:   true,
 		},

text_helpers_test.go

@@ -147,33 +147,13 @@ func TestTextsFromRelationship(t *testing.T) {
 	expect.LocalTable.NameGo = "Pilot"
 	expect.LocalTable.NameSingular = "pilot"
 
-	expect.ForeignTable.NameGo = "License"
+	expect.ForeignTable.NameGo = "Language"
-	expect.ForeignTable.NameSingular = "license"
+	expect.ForeignTable.NameSingular = "language"
-	expect.ForeignTable.NamePluralGo = "Licenses"
+	expect.ForeignTable.NamePluralGo = "Languages"
-	expect.ForeignTable.NameHumanReadable = "licenses"
+	expect.ForeignTable.NameHumanReadable = "languages"
-	expect.ForeignTable.Slice = "LicenseSlice"
+	expect.ForeignTable.Slice = "LanguageSlice"
 
-	expect.Function.Name = "SourceLicenses"
+	expect.Function.Name = "Languages"
-	expect.Function.Receiver = "p"
-	expect.Function.LocalAssignment = "ID"
-	expect.Function.ForeignAssignment = "SourceID.Int"
-
-	if !reflect.DeepEqual(expect, texts) {
-		t.Errorf("Want:\n%s\nGot:\n%s\n", spew.Sdump(expect), spew.Sdump(texts))
-	}
-
-	texts = textsFromRelationship(tables, pilots, pilots.ToManyRelationships[3])
-	expect = RelationshipToManyTexts{}
-	expect.LocalTable.NameGo = "Pilot"
-	expect.LocalTable.NameSingular = "pilot"
-
-	expect.ForeignTable.NameGo = "Jet"
-	expect.ForeignTable.NameSingular = "jet"
-	expect.ForeignTable.NamePluralGo = "Jets"
-	expect.ForeignTable.NameHumanReadable = "jets"
-	expect.ForeignTable.Slice = "JetSlice"
-
-	expect.Function.Name = "Jets"
 	expect.Function.Receiver = "p"
 	expect.Function.LocalAssignment = "ID"
 	expect.Function.ForeignAssignment = "ID"