PLIN-5811-Fixed lookups by ForeignKey (#105)

* PLIN-5811-Fixed lookups by ForeignKey * PLIN-5811 - Cleanup warnings and fixed foreign lookup order * Fix typo * Keep existing logic for skipping foreign keys without lookup data * Make foreignKeysToLookup more readable --------- Co-authored-by: German Zapata <[email protected]> Co-authored-by: German Zapata <[email protected]> Co-authored-by: acofer <[email protected]>
skuid · Aug 21, 2024 · b977fe3 · b977fe3
1 parent c4eacf8
commit b977fe3
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 77 deletions.
diff --git a/picard.go b/picard.go
@@ -555,7 +555,7 @@ func getLookupsForDeploy(data interface{}, tableMetadata *tags.TableMetadata, fo
 
 	// Create a new slice of all the foreign keys for this type
 	foreignKeysToCheck := tableMetadata.GetForeignKeys()[:]
-
+	foreignKeysToLookup := []tags.ForeignKey{}
 	hasValidPK := false
 	// Determine which lookups are necessary based on whether keys exist in the data
 	s := reflect.ValueOf(data)
@@ -613,8 +613,9 @@ func getLookupsForDeploy(data interface{}, tableMetadata *tags.TableMetadata, fo
 				})
 			} else {
 				// We don't have the id value for this foreign key so it does need a lookup
-				// But we should only pass on the ones where the original data has the values to lookup
-				if !hasForeignKeyData(item, foreignKeyToCheck) {
+				if hasForeignKeyData(item, foreignKeyToCheck) {
+					// Let's keep the order
+					foreignKeysToLookup = append([]tags.ForeignKey{foreignKeyToCheck}, foreignKeysToLookup...)
 					foreignKeysToCheck = append(foreignKeysToCheck[:i], foreignKeysToCheck[i+1:]...)
 				}
 			}
@@ -625,7 +626,7 @@ func getLookupsForDeploy(data interface{}, tableMetadata *tags.TableMetadata, fo
 		lookupsToUse = append(lookups, lookupsToUse...)
 	}
 
-	lookupsToUse = append(lookupsToUse, getLookupsFromForeignKeys(foreignKeysToCheck, "", "", tableAliasCache)...)
+	lookupsToUse = append(lookupsToUse, getLookupsFromForeignKeys(foreignKeysToLookup, "", "", tableAliasCache)...)
 
 	return lookupsToUse
 }