Move all debugging stuff to debug.go, move context keys out of hooks.go into a new file

Author: zikaeroh

boil/context_keys.go

@@ -0,0 +1,10 @@
+package boil
+
+type contextType int
+
+const (
+	ctxSkipHooks contextType = iota
+	ctxSkipTimestamps
+	ctxDebug
+	ctxDebugWriter
+)

boil/debug.go

@@ -3,9 +3,21 @@ package boil
 import (
 	"context"
 	"io"
+	"os"
 )
 
-// WithDebug modifies a context to configure debug writing.
+// DebugMode is a flag controlling whether generated sql statements and
+// debug information is outputted to the DebugWriter handle
+//
+// NOTE: This should be disabled in production to avoid leaking sensitive data
+var DebugMode = false
+
+// DebugWriter is where the debug output will be sent if DebugMode is true
+var DebugWriter io.Writer = os.Stdout
+
+// WithDebug modifies a context to configure debug writing. If true,
+// all queries made using this context will be outputted to the io.Writer
+// returned by DebugWriterFrom.
 func WithDebug(ctx context.Context, debug bool) context.Context {
 	return context.WithValue(ctx, ctxDebug, debug)
 }
@@ -26,7 +38,7 @@ func WithDebugWriter(ctx context.Context, writer io.Writer) context.Context {
 	return context.WithValue(ctx, ctxDebugWriter, writer)
 }
 
-// DebugWriterFrom returns the debug writer for the contexts, or DebugWriter
+// DebugWriterFrom returns the debug writer for the context, or DebugWriter
 // if not set.
 func DebugWriterFrom(ctx context.Context) io.Writer {
 	writer, ok := ctx.Value(ctxDebugWriter).(io.Writer)

boil/global.go

@@ -1,8 +1,6 @@
 package boil
 
 import (
-	"io"
-	"os"
 	"time"
 )
 
@@ -15,15 +13,6 @@ var (
 	timestampLocation = time.UTC
 )
 
-// DebugMode is a flag controlling whether generated sql statements and
-// debug information is outputted to the DebugWriter handle
-//
-// NOTE: This should be disabled in production to avoid leaking sensitive data
-var DebugMode = false
-
-// DebugWriter is where the debug output will be sent if DebugMode is true
-var DebugWriter io.Writer = os.Stdout
-
 // SetDB initializes the database handle for all template db interactions
 func SetDB(db Executor) {
 	currentDB = db

boil/hooks.go

@@ -2,15 +2,6 @@ package boil
 
 import "context"
 
-type contextType int
-
-const (
-	ctxSkipHooks contextType = iota
-	ctxSkipTimestamps
-	ctxDebug
-	ctxDebugWriter
-)
-
 // SkipHooks modifies a context to prevent hooks from running for any query
 // it encounters.
 func SkipHooks(ctx context.Context) context.Context {