Add support of preload gorm option (#117)

infobloxopen · Sep 20, 2018 · d3c2230 · d3c2230
1 parent ce4cb89
commit d3c2230
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/gorm/fields.go b/gorm/fields.go
@@ -54,6 +54,9 @@ fields:
 			}
 		}
 		if isModel(fType) {
+			if ok, flag := gormTag(&sf, "preload"); ok && flag == "false" {
+				continue
+			}
 			subPreload, err := preloadEverything(fType, append(path, objType))
 			if err != nil {
 				return nil, err

diff --git a/gorm/fields_test.go b/gorm/fields_test.go
@@ -8,10 +8,12 @@ import (
 )
 
 type Model struct {
-	Property   string
-	SubModel   SubModel
-	SubModels  []SubModel
-	CycleModel *CycleModel
+	Property      string
+	SubModel      SubModel
+	SubModels     []SubModel
+	CycleModel    *CycleModel
+	NotPreloadObj SubModel `gorm:"preload:false"`
+	PreloadObj    SubModel `gorm:"preload:true"`
 }
 
 type CycleModel struct {
@@ -69,9 +71,14 @@ func TestGormFieldSelection(t *testing.T) {
 			nil,
 			false,
 		},
+		{
+			"not_preload_obj,preload_obj",
+			[]string{"NotPreloadObj", "PreloadObj"},
+			false,
+		},
 		{
 			"",
-			[]string{"SubModel.SubSubModel", "SubModel", "SubModels.SubSubModel", "SubModels", "CycleModel"},
+			[]string{"SubModel.SubSubModel", "SubModel", "SubModels.SubSubModel", "SubModels", "CycleModel", "PreloadObj.SubSubModel", "PreloadObj"},
 			false,
 		},
 	}