Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ func (s *sqliteTester) setup() error {
if len(s.dbName) == 0 {
return errors.New("no dbname specified")
}
if !filepath.IsAbs(s.dbName) {
if configFile := viper.ConfigFileUsed(); configFile != "" {
s.dbName = filepath.Join(filepath.Dir(configFile), s.dbName)
}
}

s.testDBName = filepath.Join(os.TempDir(), fmt.Sprintf("boil-sqlite3-%d.sql", rand.Int()))

Expand Down
62 changes: 62 additions & 0 deletions drivers/sqlboiler-sqlite3/driver/sqlite3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package driver

import (
"bytes"
"database/sql"
"database/sql/driver"
"encoding/json"
"flag"
Expand All @@ -14,7 +15,9 @@ import (
"time"

"github.com/DATA-DOG/go-sqlmock"
"github.com/aarondl/sqlboiler/v4/boilingcore"
"github.com/aarondl/sqlboiler/v4/drivers"
"github.com/aarondl/sqlboiler/v4/importers"
"github.com/stretchr/testify/require"
_ "modernc.org/sqlite"
)
Expand Down Expand Up @@ -91,6 +94,65 @@ func TestDriver(t *testing.T) {

}

func TestGeneratedTestsWithRelativeDatabasePath(t *testing.T) {
repoRoot, err := filepath.Abs("../../..")
require.NoError(t, err)

projectRoot, err := os.MkdirTemp(filepath.Join(repoRoot, "testdata"), "sqlite-relative-")
require.NoError(t, err)
t.Cleanup(func() {
if t.Failed() {
t.Log("generated test project:", projectRoot)
return
}
require.NoError(t, os.RemoveAll(projectRoot))
})
t.Chdir(projectRoot)

db, err := sql.Open("sqlite", "database.sqlite")
require.NoError(t, err)
_, err = db.Exec("CREATE TABLE users (id INTEGER PRIMARY KEY, name TEXT NOT NULL)")
require.NoError(t, err)
require.NoError(t, db.Close())

err = os.WriteFile("sqlboiler.toml", []byte("[sqlite3]\n"+`dbname = "database.sqlite"`+"\n"), 0o600)
require.NoError(t, err)
goMod := fmt.Sprintf(`module example.com/sqlboiler-relative-test

go 1.24.0

require github.com/aarondl/sqlboiler/v4 v4.0.0

replace github.com/aarondl/sqlboiler/v4 => %s
`, repoRoot)
require.NoError(t, os.WriteFile("go.mod", []byte(goMod), 0o600))

state, err := boilingcore.New(&boilingcore.Config{
DriverName: "sqlite3",
PkgName: "models",
OutFolder: "models",
RelationTag: "-",
Version: "4.0.0",
DriverConfig: drivers.Config{
drivers.ConfigDBName: "database.sqlite",
drivers.ConfigConcurrency: 1,
},
Imports: importers.NewDefaultImports(),
})
require.NoError(t, err)
require.NoError(t, state.Run())

cmd := exec.Command("go", "mod", "tidy")
cmd.Dir = projectRoot
output, err := cmd.CombinedOutput()
require.NoErrorf(t, err, "go mod tidy failed:\n%s", output)

cmd = exec.Command("go", "test", "-count=1", ".")
cmd.Dir = filepath.Join(projectRoot, "models")
output, err = cmd.CombinedOutput()
require.NoErrorf(t, err, "generated model tests failed:\n%s", output)
}

// TestTableNames_RowsErr verifies that TableNames propagates errors surfaced
// by rows.Err() after iterating the result set from sqlite_master. Without the
// rows.Err() check the function would silently return partial results when the
Expand Down