Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid dumping sqlite system tables into schema #735

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Avoid dumping sqlite system tables into schema #735

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0a3365
Avoid dumping sqlite system tables into schema
mattbnz Jun 30, 2022
c21ba46
Improve error reporting of sqlite3 LoadSchema
mattbnz Jun 30, 2022
89593a7
Add missing logs in the assoc eager creation path
mattbnz Jul 2, 2022
d9fd9bf
Merge remote-tracking branch 'upstream/main'
mattbnz Jan 29, 2023
7f904a8
Add testcase for sqlite dump with -nosys
mattbnz Jan 29, 2023
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
9 changes: 5 additions & 4 deletions dialect_sqlite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,16 @@ func (m *sqlite) FizzTranslator() fizz.Translator {
}

func (m *sqlite) DumpSchema(w io.Writer) error {
cmd := exec.Command("sqlite3", m.Details().Database, ".schema")
cmd := exec.Command("sqlite3", m.Details().Database, ".schema --nosys")
mattbnz marked this conversation as resolved.
Show resolved Hide resolved
return genericDumpSchema(m.Details(), cmd, w)
}

func (m *sqlite) LoadSchema(r io.Reader) error {
cmd := exec.Command("sqlite3", m.ConnectionDetails.Database)
cmd.Stderr = os.Stderr
in, err := cmd.StdinPipe()
if err != nil {
return err
return fmt.Errorf("could not open stdin to SQLite database %s: %w", m.ConnectionDetails.Database, err)
}
go func() {
defer in.Close()
Expand All @@ -246,12 +247,12 @@ func (m *sqlite) LoadSchema(r io.Reader) error {
log(logging.SQL, strings.Join(cmd.Args, " "))
err = cmd.Start()
if err != nil {
return err
return fmt.Errorf("could not load schema to SQLite database %s: %w", m.ConnectionDetails.Database, err)
}

err = cmd.Wait()
if err != nil {
return err
return fmt.Errorf("command failure loading schema to SQLite database %s: %w", m.ConnectionDetails.Database, err)
}

log(logging.Info, "loaded schema for %s", m.Details().Database)
Expand Down
2 changes: 2 additions & 0 deletions executors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ func (c *Connection) Create(model interface{}, excludeColumns ...string) error {
}
stm := after[index].AfterProcess()
if c.TX != nil && !stm.Empty() {
log(logging.SQL, stm.Statement, stm.Args)
mattbnz marked this conversation as resolved.
Show resolved Hide resolved
_, err := c.TX.Exec(c.Dialect.TranslateSQL(stm.Statement), stm.Args...)
if err != nil {
return err
Expand All @@ -297,6 +298,7 @@ func (c *Connection) Create(model interface{}, excludeColumns ...string) error {
for index := range stms {
statements := stms[index].Statements()
for _, stm := range statements {
log(logging.SQL, stm.Statement, stm.Args)
if c.TX != nil {
_, err := c.TX.Exec(c.Dialect.TranslateSQL(stm.Statement), stm.Args...)
if err != nil {
Expand Down