From b2ef43eca8e9552470a411356dfe32bde01705e9 Mon Sep 17 00:00:00 2001
From: Jannik C <github@masseelch.de>
Date: Mon, 21 Feb 2022 19:33:56 +0100
Subject: [PATCH] entc/gen: singularize feature flag name for versioned
 migrations

---
 doc/md/migrate_versioned.md                    | 6 +++---
 entc/gen/feature.go                            | 6 +++---
 entc/gen/template/migrate/migrate.tmpl         | 2 +-
 entc/integration/migrate/versioned/generate.go | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/md/migrate_versioned.md b/doc/md/migrate_versioned.md
index 39a73d038d..d7e1a2068a 100644
--- a/doc/md/migrate_versioned.md
+++ b/doc/md/migrate_versioned.md
@@ -15,13 +15,13 @@ tool you like (like golang-migrate, Flyway, liquibase).
 In order to have Ent make the necessary changes to your code, you have to enable this feature with one of the two
 options:
 
-1. If you are using the default go generate configuration, simply add the `--feature sql/versioned-migrations` to
+1. If you are using the default go generate configuration, simply add the `--feature sql/versioned-migration` to
    the `ent/generate.go` file as follows:
 
 ```go
 package ent
 
-//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate --feature sql/versioned-migrations ./schema
+//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate --feature sql/versioned-migration ./schema
 ```
 
 2. If you are using the code generation package (e.g. if you are using an Ent extension), add the feature flag as
@@ -40,7 +40,7 @@ import (
 )
 
 func main() {
-	err := entc.Generate("./schema", &gen.Config{}, entc.FeatureNames("sql/versioned-migrations"))
+	err := entc.Generate("./schema", &gen.Config{}, entc.FeatureNames("sql/versioned-migration"))
 	if err != nil {
 		log.Fatalf("running ent codegen: %v", err)
 	}
diff --git a/entc/gen/feature.go b/entc/gen/feature.go
index c50964c075..357b93e16f 100644
--- a/entc/gen/feature.go
+++ b/entc/gen/feature.go
@@ -92,8 +92,8 @@ var (
 		Description: "Allows users to configure the `ON CONFLICT`/`ON DUPLICATE KEY` clause for `INSERT` statements",
 	}
 
-	FeatureVersionedMigrations = Feature{
-		Name:        "sql/versioned-migrations",
+	FeatureVersionedMigration = Feature{
+		Name:        "sql/versioned-migration",
 		Stage:       Experimental,
 		Default:     false,
 		Description: "Allows users to work with versioned migrations / migration files",
@@ -108,7 +108,7 @@ var (
 		FeatureLock,
 		FeatureModifier,
 		FeatureUpsert,
-		FeatureVersionedMigrations,
+		FeatureVersionedMigration,
 	}
 )
 
diff --git a/entc/gen/template/migrate/migrate.tmpl b/entc/gen/template/migrate/migrate.tmpl
index c9fb5b4a42..d608e92f20 100644
--- a/entc/gen/template/migrate/migrate.tmpl
+++ b/entc/gen/template/migrate/migrate.tmpl
@@ -61,7 +61,7 @@ func (s *Schema) Create(ctx context.Context, opts ...schema.MigrateOption) error
 	return migrate.Create(ctx, Tables...)
 }
 
-{{ if $.Config.FeatureEnabled "sql/versioned-migrations" }}{{ template "migrate/diff" $ }}{{ end }}
+{{ if $.Config.FeatureEnabled "sql/versioned-migration" }}{{ template "migrate/diff" $ }}{{ end }}
 
 // WriteTo writes the schema changes to w instead of running them against the database.
 //
diff --git a/entc/integration/migrate/versioned/generate.go b/entc/integration/migrate/versioned/generate.go
index 60ded724ce..96351032d6 100644
--- a/entc/integration/migrate/versioned/generate.go
+++ b/entc/integration/migrate/versioned/generate.go
@@ -4,4 +4,4 @@
 
 package versioned
 
-//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate --feature sql/versioned-migrations --header "// Copyright 2019-present Facebook Inc. All rights reserved.\n// This source code is licensed under the Apache 2.0 license found\n// in the LICENSE file in the root directory of this source tree.\n\n// Code generated by entc, DO NOT EDIT." ./schema
+//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate --feature sql/versioned-migration --header "// Copyright 2019-present Facebook Inc. All rights reserved.\n// This source code is licensed under the Apache 2.0 license found\n// in the LICENSE file in the root directory of this source tree.\n\n// Code generated by entc, DO NOT EDIT." ./schema