From f5158dce55a09b28d5e8461c8b16734bfab7e048 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki <7413593+a8m@users.noreply.github.com> Date: Tue, 26 Jan 2021 23:13:33 +0200 Subject: [PATCH] entc/gen: move schema/snapshot template to its feature-flag (#1211) --- entc/gen/feature.go | 6 ++++++ entc/gen/template.go | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/entc/gen/feature.go b/entc/gen/feature.go index 6626913da..a75fbc135 100644 --- a/entc/gen/feature.go +++ b/entc/gen/feature.go @@ -39,6 +39,12 @@ var ( Stage: Experimental, Default: false, Description: "Schema snapshot stores a snapshot of ent/schema and auto-solve merge-conflict (issue #852)", + GraphTemplates: []GraphTemplate{ + { + Name: "internal/schema", + Format: "internal/schema.go", + }, + }, cleanup: func(c *Config) error { return remove(filepath.Join(c.Target, "internal"), "schema.go") }, diff --git a/entc/gen/template.go b/entc/gen/template.go index 66787b151..f19d2e7c1 100644 --- a/entc/gen/template.go +++ b/entc/gen/template.go @@ -155,13 +155,6 @@ var ( Name: "runtime/pkg", Format: "runtime/runtime.go", }, - { - Name: "internal/schema", - Format: "internal/schema.go", - Skip: func(g *Graph) bool { - return !g.featureEnabled(FeatureSnapshot) - }, - }, } // patterns for extending partial-templates (included by other templates). partialPatterns = [...]string{