Simplify tests. Add hazards

Author: bplunkett-stripe

cmd/pg-schema-diff/main_test.go

@@ -34,6 +34,8 @@ type runCmdWithAssertionsParams struct {
 	// saving schemas to a randomly generated temporary directory.
 	dynamicArgs []dArgGenerator
 
+	// outputEquals is the exact string that stdout should equal.
+	outputEquals string
 	// outputContains is a list of substrings that are expected to be contained in the stdout output of the command.
 	outputContains []string
 	// expectErrContains is a list of substrings that are expected to be contained in the error returned by
@@ -72,6 +74,9 @@ func (suite *cmdTestSuite) runCmdWithAssertions(tc runCmdWithAssertionsParams) {
 			suite.Contains(stdOutStr, o)
 		}
 	}
+	if len(tc.outputEquals) > 0 {
+		suite.Equal(tc.outputEquals, stdOutStr)
+	}
 }
 
 // dArgGenerator generates argument at the run-time of the test case...

cmd/pg-schema-diff/plan_cmd.go

@@ -174,7 +174,7 @@ var (
 
 	outputFormatSql = outputFormat{
 		identifier:            "sql",
-		convertToOutputString: planToSqlS,
+		convertToOutputString: planToSql,
 	}
 
 	outputFormats = []outputFormat{
@@ -590,6 +590,7 @@ func hazardToPrettyS(hazard diff.MigrationHazard) string {
 	}
 }
 
+// planToJsonS converts the plan to JSON.
 func planToJsonS(plan diff.Plan) string {
 	jsonData, err := json.MarshalIndent(plan, "", "  ")
 	if err != nil {
@@ -598,18 +599,21 @@ func planToJsonS(plan diff.Plan) string {
 	return string(jsonData)
 }
 
-func planToSqlS(plan diff.Plan) string {
+// planToSql converts the plan to one large runnable SQL script.
+func planToSql(plan diff.Plan) string {
 	sb := strings.Builder{}
-
-	if len(plan.Statements) == 0 {
-		return ""
-	}
-
-	var stmtStrs []string
-	for _, stmt := range plan.Statements {
-		stmtStrs = append(stmtStrs, statementToPrettyS(stmt))
+	for i, stmt := range plan.Statements {
+		if len(stmt.Hazards) > 0 {
+			for _, hazard := range stmt.Hazards {
+				sb.WriteString(fmt.Sprintf("-- Hazard %s\n", hazardToPrettyS(hazard)))
+			}
+		}
+		sb.WriteString(fmt.Sprintf("SET SESSION statement_timeout = %d;\n", stmt.Timeout.Milliseconds()))
+		sb.WriteString(fmt.Sprintf("SET SESSION lock_timeout = %d;\n", stmt.LockTimeout.Milliseconds()))
+		sb.WriteString(fmt.Sprintf("%s;", stmt.DDL))
+		if i < len(plan.Statements)-1 {
+			sb.WriteString("\n\n")
+		}
 	}
-	sb.WriteString(strings.Join(stmtStrs, "\n\n"))
-
 	return sb.String()
 }