Undo the breaking changes to New()

Author: aarondl

boilingcore/boilingcore.go

@@ -15,19 +15,10 @@ import (
 	"github.com/friendsofgo/errors"
 	"github.com/volatiletech/sqlboiler/v4/drivers"
 	"github.com/volatiletech/sqlboiler/v4/importers"
+	boiltemplates "github.com/volatiletech/sqlboiler/v4/templates"
 	"github.com/volatiletech/strmangle"
 )
 
-const (
-	templatesDirectory          = "templates"
-	templatesSingletonDirectory = "templates/singleton"
-
-	templatesTestDirectory          = "templates_test"
-	templatesSingletonTestDirectory = "templates_test/singleton"
-
-	templatesTestMainDirectory = "templates_test/main_test"
-)
-
 var (
 	// Tags must be in a format like: json, xml, etc.
 	rgxValidTag = regexp.MustCompile(`[a-zA-Z_\.]+`)
@@ -49,7 +40,7 @@ type State struct {
 }
 
 // New creates a new state based off of the config
-func New(config *Config, templatesBuiltin fs.FS) (*State, error) {
+func New(config *Config) (*State, error) {
 	s := &State{
 		Config: config,
 	}
@@ -108,7 +99,7 @@ func New(config *Config, templatesBuiltin fs.FS) (*State, error) {
 		return nil, err
 	}
 
-	templates, err = s.initTemplates(templatesBuiltin)
+	templates, err = s.initTemplates(boiltemplates.Builtin)
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to initialize templates")
 	}

boilingcore/boilingcore_test.go

@@ -90,11 +90,7 @@ func testNew(t *testing.T, aliases Aliases) {
 		Aliases:   aliases,
 	}
 
-	templatesBuiltin := os.DirFS("../templates")
-	if err != nil {
-		t.Fatal(err)
-	}
-	state, err = New(config, templatesBuiltin)
+	state, err = New(config)
 	if err != nil {
 		t.Fatalf("Unable to create State using config: %s", err)
 	}

main.go

@@ -2,7 +2,6 @@
 package main
 
 import (
-	"embed"
 	"fmt"
 	"os"
 	"os/exec"
@@ -17,9 +16,6 @@ import (
 	"github.com/volatiletech/sqlboiler/v4/importers"
 )
 
-//go:embed templates templates_test
-var templatesBuiltin embed.FS
-
 const sqlBoilerVersion = "4.7.0"
 
 var (
@@ -220,7 +216,7 @@ func preRun(cmd *cobra.Command, args []string) error {
 
 	cmdConfig.Imports = configureImports()
 
-	cmdState, err = boilingcore.New(cmdConfig, templatesBuiltin)
+	cmdState, err = boilingcore.New(cmdConfig)
 	return err
 }