NEOS-1227 Fix building run configs for single table sync with depende…

…ncies (#2265)
nucleuscloud · Jul 4, 2024 · c8af603 · c8af603
1 parent 62f25a4
commit c8af603
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 9 deletions.
diff --git a/backend/pkg/table-dependency/table-dependency.go b/backend/pkg/table-dependency/table-dependency.go
@@ -65,23 +65,24 @@ func GetRunConfigs(
 		foreignKeyMap[table] = map[string][]string{}
 		foreignKeyColsMap[table] = map[string]*ConstraintColumns{}
 		for _, constraint := range constraints {
-			if _, exists := foreignKeyColsMap[table][constraint.ForeignKey.Table]; !exists {
-				foreignKeyColsMap[table][constraint.ForeignKey.Table] = &ConstraintColumns{
-					NullableColumns:    []string{},
-					NonNullableColumns: []string{},
-				}
-			}
 			for idx, col := range constraint.ForeignKey.Columns {
+				if !checkTableHasCols([]string{table, constraint.ForeignKey.Table}, tableColumnsMap) {
+					continue
+				}
+				if _, exists := foreignKeyColsMap[table][constraint.ForeignKey.Table]; !exists {
+					foreignKeyColsMap[table][constraint.ForeignKey.Table] = &ConstraintColumns{
+						NullableColumns:    []string{},
+						NonNullableColumns: []string{},
+					}
+				}
 				notNullable := constraint.NotNullable[idx]
 				if notNullable {
 					foreignKeyColsMap[table][constraint.ForeignKey.Table].NonNullableColumns = append(foreignKeyColsMap[table][constraint.ForeignKey.Table].NonNullableColumns, col)
 				} else {
 					foreignKeyColsMap[table][constraint.ForeignKey.Table].NullableColumns = append(foreignKeyColsMap[table][constraint.ForeignKey.Table].NullableColumns, col)
 				}
 				foreignKeyMap[table][constraint.ForeignKey.Table] = append(foreignKeyMap[table][constraint.ForeignKey.Table], col)
-				if checkTableHasCols([]string{table, constraint.ForeignKey.Table}, tableColumnsMap) {
-					filteredDepsMap[table] = append(filteredDepsMap[table], constraint.ForeignKey.Table)
-				}
+				filteredDepsMap[table] = append(filteredDepsMap[table], constraint.ForeignKey.Table)
 			}
 		}
 	}

diff --git a/backend/pkg/table-dependency/table-dependency_test.go b/backend/pkg/table-dependency/table-dependency_test.go
@@ -1111,6 +1111,65 @@ func Test_GetRunConfigs_HumanResources(t *testing.T) {
 	}
 }
 
+func Test_GetRunConfigs_SingleTable_WithFks(t *testing.T) {
+	emptyWhere := ""
+	dependencies := map[string][]*sqlmanager_shared.ForeignConstraint{
+		"public.countries": {
+			{Columns: []string{"region_id"}, NotNullable: []bool{true}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.regions", Columns: []string{"region_id"}}},
+		},
+		"public.departments": {
+			{Columns: []string{"location_id"}, NotNullable: []bool{false}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.locations", Columns: []string{"location_id"}}},
+		},
+		"public.dependents": {
+			{Columns: []string{"employee_id"}, NotNullable: []bool{true}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.employees", Columns: []string{"employee_id"}}},
+		},
+		"public.employees": {
+			{Columns: []string{"job_id"}, NotNullable: []bool{true}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.jobs", Columns: []string{"job_id"}}},
+			{Columns: []string{"department_id"}, NotNullable: []bool{false}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.departments", Columns: []string{"department_id"}}},
+			{Columns: []string{"manager_id"}, NotNullable: []bool{false}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.employees", Columns: []string{"employee_id"}}},
+		},
+		"public.locations": {
+			{Columns: []string{"country_id"}, NotNullable: []bool{true}, ForeignKey: &sqlmanager_shared.ForeignKey{Table: "public.countries", Columns: []string{"country_id"}}},
+		},
+	}
+	primaryKeyMap := map[string][]string{
+		"public.regions":     {"region_id"},
+		"public.countries":   {"country_id"},
+		"public.locations":   {"location_id"},
+		"public.jobs":        {"job_id"},
+		"public.departments": {"department_id"},
+		"public.employees":   {"employee_id"},
+		"public.dependents":  {"dependent_id"},
+	}
+	tablesColMap := map[string][]string{
+		"public.employees": {
+			"employee_id",
+			"email",
+			"name",
+			"job_id",
+			"manager_id",
+			"department_id",
+		},
+	}
+
+	expect := []*RunConfig{
+		{Table: "public.employees", RunType: RunTypeInsert, PrimaryKeys: []string{"employee_id"}, WhereClause: &emptyWhere, SelectColumns: []string{"employee_id", "email", "name", "job_id", "manager_id", "department_id"}, InsertColumns: []string{"employee_id", "email", "name", "job_id", "department_id"}, DependsOn: []*DependsOn{}},
+		{Table: "public.employees", RunType: RunTypeUpdate, PrimaryKeys: []string{"employee_id"}, WhereClause: &emptyWhere, SelectColumns: []string{"employee_id", "manager_id"}, InsertColumns: []string{"manager_id"}, DependsOn: []*DependsOn{{Table: "public.employees", Columns: []string{"employee_id"}}}},
+	}
+
+	actual, err := GetRunConfigs(dependencies, map[string]string{}, primaryKeyMap, tablesColMap)
+	require.NoError(t, err)
+	for _, e := range expect {
+		acutalConfig := getConfigByTableAndType(e.Table, e.RunType, actual)
+		require.NotNil(t, acutalConfig)
+		require.ElementsMatch(t, e.InsertColumns, acutalConfig.InsertColumns)
+		require.ElementsMatch(t, e.SelectColumns, acutalConfig.SelectColumns)
+		require.ElementsMatch(t, e.DependsOn, acutalConfig.DependsOn)
+		require.ElementsMatch(t, e.PrimaryKeys, acutalConfig.PrimaryKeys)
+		require.Equal(t, e.WhereClause, e.WhereClause)
+	}
+}
+
 func Test_GetRunConfigs_Complex_CircularDependency(t *testing.T) {
 	emptyWhere := ""
 	dependencies := map[string][]*sqlmanager_shared.ForeignConstraint{