Misc tweaks

Author: bplunkett-stripe

cmd/pg-schema-diff/plan_cmd.go

@@ -112,9 +112,9 @@ type (
 		includeSchemas []string
 		excludeSchemas []string
 
-		dataPackNewTables         bool
-		disablePlanValidation     bool
-		disableConcurrentIndexOps bool
+		dataPackNewTables     bool
+		disablePlanValidation bool
+		noConcurrentIndexOps  bool
 
 		statementTimeoutModifiers []string
 		lockTimeoutModifiers      []string
@@ -223,7 +223,7 @@ func createPlanOptionsFlags(cmd *cobra.Command) *planOptionsFlags {
 	cmd.Flags().BoolVar(&flags.dataPackNewTables, "data-pack-new-tables", true, "If set, will data pack new tables in the plan to minimize table size (re-arranges columns).")
 	cmd.Flags().BoolVar(&flags.disablePlanValidation, "disable-plan-validation", false, "If set, will disable plan validation. Plan validation runs the migration against a temporary"+
 		"database with an identical schema to the original, asserting that the generated plan actually migrates the schema to the desired target.")
-	cmd.Flags().BoolVar(&flags.disableConcurrentIndexOps, "disable-concurrent-index-ops", false, "If set, will disable the use of CONCURRENTLY in CREATE INDEX and DROP INDEX statements. "+
+	cmd.Flags().BoolVar(&flags.noConcurrentIndexOps, "no-concurrent-index-ops", false, "If set, will disable the use of CONCURRENTLY in CREATE INDEX and DROP INDEX statements. "+
 		"This may result in longer lock times and potential downtime during migrations.")
 
 	timeoutModifierFlagVar(cmd, &flags.statementTimeoutModifiers, "statement", "t")
@@ -324,8 +324,8 @@ func parsePlanOptions(p planOptionsFlags) (planOptions, error) {
 	if p.disablePlanValidation {
 		opts = append(opts, diff.WithDoNotValidatePlan())
 	}
-	if p.disableConcurrentIndexOps {
-		opts = append(opts, diff.WithDisableConcurrentIndexOps())
+	if p.noConcurrentIndexOps {
+		opts = append(opts, diff.WithNoConcurrentIndexOps())
 	}
 
 	var statementTimeoutModifiers []timeoutModifier

internal/migration_acceptance_tests/index_no_concurrent_cases_test.go

@@ -0,0 +1,62 @@
+package migration_acceptance_tests
+
+import (
+	"testing"
+
+	"github.com/stripe/pg-schema-diff/pkg/diff"
+)
+
+var indexNoConcurrentAcceptanceTestCases = []acceptanceTestCase{
+	{
+		name: "Add",
+		oldSchemaDDL: []string{
+			`
+            CREATE TABLE "Foobar"(
+                id INT PRIMARY KEY,
+                "Foo" VARCHAR(255)
+            );
+			`,
+		},
+		newSchemaDDL: []string{
+			`
+            CREATE TABLE "Foobar"(
+                id INT PRIMARY KEY,
+                "Foo" VARCHAR(255)
+            );
+            CREATE INDEX "Some_idx" ON "Foobar"(id, "Foo");
+			`,
+		},
+		expectedHazardTypes: []diff.MigrationHazardType{
+			diff.MigrationHazardTypeAcquiresAccessExclusiveLock,
+		},
+		planOpts: []diff.PlanOpt{diff.WithNoConcurrentIndexOps()},
+	},
+	{
+		name: "Delete",
+		oldSchemaDDL: []string{
+			`
+            CREATE TABLE "Foobar"(
+                id INT PRIMARY KEY,
+                "Foo" VARCHAR(255)
+            );
+            CREATE INDEX "Some_idx" ON "Foobar"(id, "Foo");
+			`,
+		},
+		newSchemaDDL: []string{
+			`
+            CREATE TABLE "Foobar"(
+                id INT PRIMARY KEY,
+                "Foo" VARCHAR(255) NOT NULL
+            );
+			`,
+		},
+		expectedHazardTypes: []diff.MigrationHazardType{
+			diff.MigrationHazardTypeAcquiresAccessExclusiveLock,
+		},
+		planOpts: []diff.PlanOpt{diff.WithNoConcurrentIndexOps()},
+	},
+}
+
+func TestIndexNoConcurrentTestCases(t *testing.T) {
+	runTestCases(t, indexNoConcurrentAcceptanceTestCases)
+}

internal/pgengine/engine.go

@@ -64,6 +64,7 @@ const (
 var (
 	defaultServerConfiguration = map[string]string{
 		"log_checkpoints": "false",
+		"max_connections": "1000",
 	}
 )
 

pkg/diff/plan_generator.go

@@ -35,7 +35,7 @@ type (
 		validatePlan            bool
 		getSchemaOpts           []schema.GetSchemaOpt
 		randReader              io.Reader
-		disableConcurrentIndexOps bool
+		noConcurrentIndexOps    bool
 	}
 
 	PlanOpt func(opts *planOptions)
@@ -103,13 +103,13 @@ func WithRandReader(randReader io.Reader) PlanOpt {
 	}
 }
 
-// WithDisableConcurrentIndexOps disables the use of CONCURRENTLY in CREATE INDEX and DROP INDEX statements.
+// WithNoConcurrentIndexOps disables the use of CONCURRENTLY in CREATE INDEX and DROP INDEX statements.
 // This can be useful when you need simpler DDL statements or when working in environments that don't support
 // concurrent index operations. Note that disabling concurrent operations may result in longer lock times
 // and potential downtime during migrations.
-func WithDisableConcurrentIndexOps() PlanOpt {
+func WithNoConcurrentIndexOps() PlanOpt {
 	return func(opts *planOptions) {
-		opts.disableConcurrentIndexOps = true
+		opts.noConcurrentIndexOps = true
 	}
 }