From d21bf4fef91c684265c15cca9597eab8217b2a78 Mon Sep 17 00:00:00 2001
From: Michael Fridman <mf192@icloud.com>
Date: Thu, 29 Jun 2023 12:04:32 -0400
Subject: [PATCH] chore: add changelog and update goose version (#544)

---
 CHANGELOG.md      | 9 +++++++++
 Makefile          | 8 ++++----
 cmd/goose/main.go | 7 ++++---
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..ea9e4be
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changelog
+
+## [Unreleased]
+
+- Fix `up` and `up -allowing-missing` behavior
+- Fix empty version in log output
+- Add new `context.Context`-aware functions and methods
+
+[Unreleased]: https://github.com/pressly/goose/compare/v3.11.2...HEAD
diff --git a/Makefile b/Makefile
index a41d259..eda49a8 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ docker-cleanup:
 
 docker-start-postgres:
 	docker run --rm -d \
-		-e POSTGRES_USER=${GOOSE_POSTGRES_DB_USER} \
-		-e POSTGRES_PASSWORD=${GOOSE_POSTGRES_PASSWORD} \
-		-e POSTGRES_DB=${GOOSE_POSTGRES_DBNAME} \
-		-p ${GOOSE_POSTGRES_PORT}:5432 \
+		-e POSTGRES_USER=${POSTGRES_DB_USER} \
+		-e POSTGRES_PASSWORD=${POSTGRES_PASSWORD} \
+		-e POSTGRES_DB=${POSTGRES_DBNAME} \
+		-p ${POSTGRES_PORT}:5432 \
 		-l goose_test \
 		postgres:14-alpine -c log_statement=all
diff --git a/cmd/goose/main.go b/cmd/goose/main.go
index 913e07c..2cf4c0a 100644
--- a/cmd/goose/main.go
+++ b/cmd/goose/main.go
@@ -37,7 +37,7 @@ var (
 	noColor      = flags.Bool("no-color", false, "disable color output (NO_COLOR env variable supported)")
 )
 var (
-	gooseVersion = ""
+	gooseVersion = "v3.12.0-dev"
 )
 
 func main() {
@@ -48,10 +48,11 @@ func main() {
 	}
 
 	if *version {
-		if buildInfo, ok := debug.ReadBuildInfo(); ok && buildInfo != nil && gooseVersion == "" {
+		buildInfo, ok := debug.ReadBuildInfo()
+		if ok && buildInfo != nil && buildInfo.Main.Version != "(devel)" {
 			gooseVersion = buildInfo.Main.Version
 		}
-		fmt.Printf("goose version:%s\n", gooseVersion)
+		fmt.Printf("goose version: %s\n", gooseVersion)
 		return
 	}
 	if *verbose {