Switch from volatiletech to aarondl

Author: stephenafamo

README.md

@@ -1,15 +1,15 @@
 # BoilingSeed
 
-This is a CLI tool that helps generate database seeding helpers with [`sqlboiler`](https://github.com/volatiletech/sqlboiler).
+This is a CLI tool that helps generate database seeding helpers with [`sqlboiler`](https://github.com/aarondl/sqlboiler).
 
 This is a really early release, so while it works (I use it for my projects), it is not super stable YET.
 
 ## Installation
 
-* Install [`sqlboiler`](https://github.com/volatiletech/sqlboiler)
-* Install your database driver for [`sqlboiler`](https://github.com/volatiletech/sqlboiler#supported-databases).
-* Generate your models. [Link](https://github.com/volatiletech/sqlboiler#initial-generation)
-* Install boilingseed: `go get github.com/stephenafamo/boilingseed`
+- Install [`sqlboiler`](https://github.com/aarondl/sqlboiler)
+- Install your database driver for [`sqlboiler`](https://github.com/aarondl/sqlboiler#supported-databases).
+- Generate your models. [Link](https://github.com/aarondl/sqlboiler#initial-generation)
+- Install boilingseed: `go get github.com/stephenafamo/boilingseed`
 
 ## Usage
 
@@ -54,14 +54,14 @@ Apart from the standard configuration for SQLBoiler, the only other added config
 
 The program accepts these flags to overwrite any configuration.
 
-* `--sqlboiler-models`: The package of your generated models. Needed to import them properly in the seeder. DEFAULT: `current/go/module/models`.
-* `--config`: Configuration file path. DEFAULT: `sqlboiler.toml`
-* `--output` or `-o`: The name of the folder to output to. DEFAULT: `seeds`
-* `--pkgname` or `-p`: The name you wish to assign to your generated package. DEFAULT: `seeds`
-* `--no-context`: Were the models generated with no context?. DEFAULT `false`
-* `--wipe`: Delete the output folder (rm -rf) before generation to ensure sanity. DEFAULT `false`
-* `--version`: Print the version
-* `debug` or `d`: Debug mode prints stack traces on error. DEFAULT `false`
+- `--sqlboiler-models`: The package of your generated models. Needed to import them properly in the seeder. DEFAULT: `current/go/module/models`.
+- `--config`: Configuration file path. DEFAULT: `sqlboiler.toml`
+- `--output` or `-o`: The name of the folder to output to. DEFAULT: `seeds`
+- `--pkgname` or `-p`: The name you wish to assign to your generated package. DEFAULT: `seeds`
+- `--no-context`: Were the models generated with no context?. DEFAULT `false`
+- `--wipe`: Delete the output folder (rm -rf) before generation to ensure sanity. DEFAULT `false`
+- `--version`: Print the version
+- `debug` or `d`: Debug mode prints stack traces on error. DEFAULT `false`
 
 They can also be set in the config file, or as environment variables
 
@@ -109,8 +109,6 @@ ALTER TABLE pilot_languages ADD CONSTRAINT pilot_language_pilots_fkey FOREIGN KE
 ALTER TABLE pilot_languages ADD CONSTRAINT pilot_language_languages_fkey FOREIGN KEY (language_id) REFERENCES languages(id);
 ```
 
-
-
 The generated package will define a Seeder struct whose fields control seeding.
 The comments help understand what each field does.
 
@@ -178,7 +176,7 @@ seeder.JetsPerPilot = 2
 
 ### `MinRelsPerXXX`
 
-The `MinRelsPerXXX` fields are control how many `many-to-many` relationships are added. In this example, it will **try** to give each Pilot *at least* 3 Languages and each Language *at least* 3 pilots.
+The `MinRelsPerXXX` fields are control how many `many-to-many` relationships are added. In this example, it will **try** to give each Pilot _at least_ 3 Languages and each Language _at least_ 3 pilots.
 
 Naturally, if there are more pilots than languages, each language will likely have more than 3 pilots.
 
@@ -188,7 +186,7 @@ seeder.MinRelsPerPilotLanguages = 3
 
 ### `RandomXXX`
 
-The package has `defaultRandomXXX` functions that use `github.com/volatiletech/randomize`. However, for better control you can set custom `RandomXXX` functions. A single function that randomly generates a model.
+The package has `defaultRandomXXX` functions that use `github.com/aarondl/randomize`. However, for better control you can set custom `RandomXXX` functions. A single function that randomly generates a model.
 
 The `RandomXXX` functions do not need to add any relationships to the models.
 
@@ -322,9 +320,10 @@ CREATE TABLE book_tags (
 The integration tests require:
 
 1. **SQLBoiler** - Must be installed and available in your PATH
+
    ```bash
-   go install github.com/volatiletech/sqlboiler/v4@latest
-   go install github.com/volatiletech/sqlboiler/v4/drivers/sqlboiler-sqlite3@latest
+   go install github.com/aarondl/sqlboiler/v4@latest
+   go install github.com/aarondl/sqlboiler/v4/drivers/sqlboiler-sqlite3@latest
    ```
 
 2. **Go environment** - The tests create temporary Go modules and build executables
@@ -334,6 +333,7 @@ The integration tests require:
 ### Test Output
 
 The integration tests provide detailed output showing:
+
 - Database setup and schema creation
 - SQLBoiler model generation
 - BoilingSeed seeder generation
@@ -342,6 +342,7 @@ The integration tests provide detailed output showing:
 - Foreign key relationship validation
 
 Example successful test output:
+
 ```
 === RUN   TestBoilingSeedIntegration
 === RUN   TestBoilingSeedIntegration/DatabaseSetup

go.mod

@@ -3,9 +3,9 @@ module github.com/stephenafamo/boilingseed
 go 1.23.0
 
 require (
+	github.com/aarondl/sqlboiler/v4 v4.19.5
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/viper v1.20.1
-	github.com/volatiletech/sqlboiler/v4 v4.19.1
 	golang.org/x/mod v0.24.0
 	modernc.org/sqlite v1.18.1
 )
@@ -15,6 +15,8 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.3.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
+	github.com/aarondl/inflect v0.0.2 // indirect
+	github.com/aarondl/strmangle v0.0.9 // indirect
 	github.com/friendsofgo/errors v0.9.2 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
@@ -36,8 +38,6 @@ require (
 	github.com/spf13/cast v1.8.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/volatiletech/inflect v0.0.1 // indirect
-	github.com/volatiletech/strmangle v0.0.8 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.38.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect

go.sum

@@ -6,6 +6,12 @@ github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7r
 github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
 github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
+github.com/aarondl/inflect v0.0.2 h1:XvH8K5g1wKS921tMmDOUsZ3zS1Eo8WwK5RHC0IGGT2s=
+github.com/aarondl/inflect v0.0.2/go.mod h1:zjmCfdXHUDQ9jFOV6SeHknpo0Au6rQhV8GchS4Vzv/0=
+github.com/aarondl/sqlboiler/v4 v4.19.5 h1:/UW1qvOA+ytXjhDg85E7fDW6iqIGP9xDdqFbtqZ3xL8=
+github.com/aarondl/sqlboiler/v4 v4.19.5/go.mod h1:PqsFMK0K44NPrqcO24fnft2ePqK2avLvbqxWqsTXXHk=
+github.com/aarondl/strmangle v0.0.9 h1:VCT+O1FqRSE9DTK3qR0zRHtB384fdRzuyKfx2ux2xms=
+github.com/aarondl/strmangle v0.0.9/go.mod h1:ezNIwvvnuVGuKedP5qt2T+wvzPD8yuOoMzamifXNMlk=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -76,12 +82,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/volatiletech/inflect v0.0.1 h1:2a6FcMQyhmPZcLa+uet3VJ8gLn/9svWhJxJYwvE8KsU=
-github.com/volatiletech/inflect v0.0.1/go.mod h1:IBti31tG6phkHitLlr5j7shC5SOo//x0AjDzaJU1PLA=
-github.com/volatiletech/sqlboiler/v4 v4.19.1 h1:MA1cUQBAUNJ6dezS11GFlbQ9LvtlwuEAsIaUx9WyfNA=
-github.com/volatiletech/sqlboiler/v4 v4.19.1/go.mod h1:q10x7FF/cR86pf8VT/0L0FTnLchi8EDhWu/SO55tl9A=
-github.com/volatiletech/strmangle v0.0.8 h1:UZkTDFIjZcL1Lk4BXhGsxcyXxNcWuM5ZwdzZc0sJcWg=
-github.com/volatiletech/strmangle v0.0.8/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

integration_test.go

@@ -138,7 +138,7 @@ func (s *IntegrationTestSuite) Setup(t *testing.T) error {
 	s.binPath = filepath.Join(s.tempDir, "boilingseed")
 
 	// Create project directory
-	if err := os.MkdirAll(s.projectDir, 0755); err != nil {
+	if err := os.MkdirAll(s.projectDir, 0o755); err != nil {
 		return fmt.Errorf("failed to create project directory: %w", err)
 	}
 
@@ -262,7 +262,7 @@ func (s *IntegrationTestSuite) TestProjectStructure(t *testing.T) {
 	// Create sqlboiler config
 	configContent := fmt.Sprintf(sqlBoilerConfig, s.dbPath)
 	configPath := filepath.Join(s.projectDir, "sqlboiler.toml")
-	if err := os.WriteFile(configPath, []byte(configContent), 0644); err != nil {
+	if err := os.WriteFile(configPath, []byte(configContent), 0o644); err != nil {
 		t.Fatalf("Failed to create config file: %v", err)
 	}
 
@@ -279,11 +279,11 @@ func (s *IntegrationTestSuite) TestProjectStructure(t *testing.T) {
 
 func (s *IntegrationTestSuite) TestSQLBoilerGeneration(t *testing.T) {
 	// Add sqlboiler dependencies
-	if err := s.runCommand("go", "get", "github.com/volatiletech/sqlboiler/v4"); err != nil {
+	if err := s.runCommand("go", "get", "github.com/aarondl/sqlboiler/v4"); err != nil {
 		t.Fatalf("Failed to get sqlboiler dependency: %v", err)
 	}
 
-	if err := s.runCommand("go", "get", "github.com/volatiletech/sqlboiler/v4/drivers/sqlboiler-sqlite3"); err != nil {
+	if err := s.runCommand("go", "get", "github.com/aarondl/sqlboiler/v4/drivers/sqlboiler-sqlite3"); err != nil {
 		t.Fatalf("Failed to get sqlite driver: %v", err)
 	}
 
@@ -352,7 +352,7 @@ func (s *IntegrationTestSuite) TestBoilingSeedGeneration(t *testing.T) {
 func (s *IntegrationTestSuite) TestGeneratedCodeCompilation(t *testing.T) {
 	// Add required dependencies for seeds
 	dependencies := []string{
-		"github.com/volatiletech/randomize",
+		"github.com/aarondl/randomize",
 		"github.com/lib/pq", // for database drivers in tests
 	}
 
@@ -401,7 +401,7 @@ func main() {
 `
 
 	testPath := filepath.Join(s.projectDir, "test_seeder.go")
-	if err := os.WriteFile(testPath, []byte(testProgram), 0644); err != nil {
+	if err := os.WriteFile(testPath, []byte(testProgram), 0o644); err != nil {
 		t.Fatalf("Failed to create test program: %v", err)
 	}
 
@@ -425,7 +425,7 @@ import (
 	_ "modernc.org/sqlite"
 	"testproject/seeds"
 	"testproject/models"
-	"github.com/volatiletech/sqlboiler/v4/boil"
+	"github.com/aarondl/sqlboiler/v4/boil"
 )
 
 func main() {
@@ -522,12 +522,12 @@ func main() {
 `
 
 	testPath := filepath.Join(s.projectDir, "run_seeder.go")
-	if err := os.WriteFile(testPath, []byte(testProgram), 0644); err != nil {
+	if err := os.WriteFile(testPath, []byte(testProgram), 0o644); err != nil {
 		t.Fatalf("Failed to create seeder test program: %v", err)
 	}
 
 	// Get additional dependencies
-	if err := s.runCommand("go", "get", "github.com/volatiletech/null/v8"); err != nil {
+	if err := s.runCommand("go", "get", "github.com/aarondl/null/v8"); err != nil {
 		t.Errorf("Failed to get null dependency: %v", err)
 	}
 
@@ -577,7 +577,7 @@ import (
 	_ "modernc.org/sqlite"
 	"testproject/seeds"
 	"testproject/models"
-	"github.com/volatiletech/null/v8"
+	"github.com/aarondl/null/v8"
 )
 
 func main() {
@@ -663,7 +663,7 @@ func randomInt() int {
 `
 
 	testPath := filepath.Join(s.projectDir, "custom_seeder.go")
-	if err := os.WriteFile(testPath, []byte(testProgram), 0644); err != nil {
+	if err := os.WriteFile(testPath, []byte(testProgram), 0o644); err != nil {
 		t.Fatalf("Failed to create custom seeder test: %v", err)
 	}
 
@@ -700,7 +700,7 @@ import (
 	_ "modernc.org/sqlite"
 	"testproject/seeds"
 	"testproject/models"
-	"github.com/volatiletech/null/v8"
+	"github.com/aarondl/null/v8"
 )
 
 func main() {
@@ -801,7 +801,7 @@ func main() {
 `
 
 	testPath := filepath.Join(s.projectDir, "fk_demo.go")
-	if err := os.WriteFile(testPath, []byte(testProgram), 0644); err != nil {
+	if err := os.WriteFile(testPath, []byte(testProgram), 0o644); err != nil {
 		t.Fatalf("Failed to create FK test: %v", err)
 	}
 
@@ -866,7 +866,7 @@ func (s *IntegrationTestSuite) TestConfigurationOptions(t *testing.T) {
 	// Test wipe option
 	// First create a dummy file in the directory
 	dummyFile := filepath.Join(customOutputDir, "dummy.txt")
-	if err := os.WriteFile(dummyFile, []byte("dummy"), 0644); err != nil {
+	if err := os.WriteFile(dummyFile, []byte("dummy"), 0o644); err != nil {
 		t.Fatalf("Failed to create dummy file: %v", err)
 	}
 

main.go

@@ -10,11 +10,11 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"github.com/aarondl/sqlboiler/v4/boilingcore"
+	"github.com/aarondl/sqlboiler/v4/drivers"
+	"github.com/aarondl/sqlboiler/v4/importers"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/volatiletech/sqlboiler/v4/boilingcore"
-	"github.com/volatiletech/sqlboiler/v4/drivers"
-	"github.com/volatiletech/sqlboiler/v4/importers"
 )
 
 //go:embed templates
@@ -293,15 +293,15 @@ func configureImports() importers.Collection {
 	imports.All.Standard = []string{`"fmt"`, `"math"`}
 	imports.All.ThirdParty = []string{
 		fmt.Sprintf(`models "%s"`, modelsPkg),
-		`"github.com/volatiletech/sqlboiler/v4/boil"`,
-		`"github.com/volatiletech/sqlboiler/v4/queries"`,
-		`"github.com/volatiletech/randomize"`,
+		`"github.com/aarondl/sqlboiler/v4/boil"`,
+		`"github.com/aarondl/sqlboiler/v4/queries"`,
+		`"github.com/aarondl/randomize"`,
 	}
 	imports.Singleton["boilingseed_main"] = importers.Set{
 		Standard: []string{`"fmt"`, `"sync"`, `"time"`, `"context"`, `"math/rand"`},
 		ThirdParty: []string{
 			fmt.Sprintf(`models "%s"`, modelsPkg),
-			`"github.com/volatiletech/sqlboiler/v4/boil"`,
+			`"github.com/aarondl/sqlboiler/v4/boil"`,
 		},
 	}