Bugfix for wrong graphql type when using custom scalars in gqlgen

web-ridge · May 20, 2020 · 5b986ef · 5b986ef
1 parent 66c3f47
commit 5b986ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/convert.go b/convert.go
@@ -457,7 +457,7 @@ func enhanceModelsWithFields(enums []*Enum, schema *ast.Schema, cfg *config.Conf
 	}
 }
 
-var ignoreTypePrefixes = []string{"graphql_models", "models"}
+var ignoreTypePrefixes = []string{"graphql_models", "models", "boilergql"}
 
 func getShortType(longType string) string {
 

diff --git a/convert_test.go b/convert_test.go
@@ -6,8 +6,11 @@ package gqlgen_sqlboiler
 import "testing"
 
 func TestShortType(t *testing.T) {
-	testShortType(t, "gitlab.com/decicify/app/backend/graphql_models.FlowWhere", "FlowWhere")
-	testShortType(t, "*gitlab.com/decicify/app/backend/graphql_models.FlowWhere", "*FlowWhere")
+	testShortType(t, "gitlab.com/product/app/backend/graphql_models.FlowWhere", "FlowWhere")
+	testShortType(t, "*gitlab.com/product/app/backend/graphql_models.FlowWhere", "*FlowWhere")
+	testShortType(t, "*github.com/web-ridge/go-utils/boilergql/boilergql.GeoPoint", "*GeoPoint")
+	testShortType(t, "github.com/web-ridge/go-utils/boilergql/boilergql.GeoPoint", "GeoPoint")
+
 	testShortType(t, "*string", "*string")
 	testShortType(t, "string", "string")
 	testShortType(t, "*time.Time", "*time.Time")
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     }
-    var ignoreTypePrefixes = []string{"graphql_models", "models"}
+    var ignoreTypePrefixes = []string{"graphql_models", "models", "boilergql"}
     func getShortType(longType string) string {
@@ Expand Down @@