feat: add support for copyfrom queries (#6)

MrEhbr · web-flow · commit c6c12636dcd8 · 2024-02-19T11:50:39.000+09:00
copyfrom queries also included in runner pipline
goimports new files for correct imports
diff --git a/cmd/sqlc-restruct/separate_interface.go b/cmd/sqlc-restruct/separate_interface.go
@@ -57,6 +57,11 @@ var SeparateInterfaceCommand = &cli.Command{
 			Usage: "The file name for the sqlc-generated Querier file.",
 			Value: "querier.go",
 		},
+		&cli.StringSliceFlag{
+			Name:  "aditional-querier-files",
+			Usage: "A list of other files that contains querier impl. (e.g. copyfrom.go)",
+			Value: cli.NewStringSlice("copyfrom.go"),
+		},
 	},
 	Action: func(c *cli.Context) error {
 		iPkgName := c.String("iface-pkg-name")
@@ -77,16 +82,17 @@ var SeparateInterfaceCommand = &cli.Command{
 		}
 
 		return separateinterface.Action(c.Context, separateinterface.ActionInput{
-			IfacePkgName:    iPkgName,
-			IfacePkgURL:     iPkgURL,
-			IfaceDir:        iDir,
-			ModelsPkgName:   mPkgName,
-			ModelsPkgURL:    mPkgURL,
-			ModelsDir:       mDir,
-			ImplDir:         c.String("impl-dir"),
-			ImplSQLSuffix:   c.String("impl-sql-suffix"),
-			ModelsFileName:  c.String("models-file-name"),
-			QuerierFileName: c.String("querier-file-name"),
+			IfacePkgName:          iPkgName,
+			IfacePkgURL:           iPkgURL,
+			IfaceDir:              iDir,
+			ModelsPkgName:         mPkgName,
+			ModelsPkgURL:          mPkgURL,
+			ModelsDir:             mDir,
+			ImplDir:               c.String("impl-dir"),
+			ImplSQLSuffix:         c.String("impl-sql-suffix"),
+			ModelsFileName:        c.String("models-file-name"),
+			QuerierFileName:       c.String("querier-file-name"),
+			AditionalQuerierFiles: c.StringSlice("aditional-querier-files"),
 		})
 	},
 }
diff --git a/example/infra/db/query.articles.sql b/example/infra/db/query.articles.sql
@@ -17,3 +17,6 @@ SELECT * FROM articles WHERE user_id = $1 ORDER BY created_at DESC;
 
 -- name: ArticleListOfUserInCategory :many
 SELECT * FROM articles WHERE user_id = $1 AND category_id = $2 ORDER BY created_at DESC;
+
+-- name: ArticleInsertCopyFrom :copyfrom
+INSERT INTO articles(user_id, category_id, slug, title, body) VALUES ($1, $2, $3, $4, $5);
diff --git a/go.mod b/go.mod
@@ -3,17 +3,15 @@ module github.com/mpyw/sqlc-restruct
 go 1.20
 
 require (
-	github.com/jackc/pgx/v5 v5.4.1
 	github.com/urfave/cli/v2 v2.25.7
 	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
+	golang.org/x/tools v0.6.0
 )
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/mod v0.11.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,31 +1,16 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.4.1 h1:oKfB/FhuVtit1bBM3zNRRsZ925ZkMN3HXL+LgLUM9lE=
-github.com/jackc/pgx/v5 v5.4.1/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5qWFY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
 golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
diff --git a/pkg/actions/separate-interface/runner.go b/pkg/actions/separate-interface/runner.go
@@ -12,8 +12,10 @@ import (
 	"path"
 	"strings"
 
-	"github.com/mpyw/sqlc-restruct/pkg/internal/astutil"
 	"golang.org/x/exp/slices"
+	"golang.org/x/tools/imports"
+
+	"github.com/mpyw/sqlc-restruct/pkg/internal/astutil"
 )
 
 type runner struct {
@@ -43,19 +45,32 @@ func (r *runner) Run() error {
 			if newModelsContent, err = r.newModelsContent(); err != nil {
 				return err
 			}
+			newModelsContent, err = imports.Process("", newModelsContent, nil)
+			if err != nil {
+				return err
+			}
 			continue
 		}
 		if filename == r.input.QuerierFileName {
 			if newQuerierContent, err = r.newQuerierContent(); err != nil {
 				return err
 			}
+			newQuerierContent, err = imports.Process("", newQuerierContent, nil)
+			if err != nil {
+				return err
+			}
 			continue
 		}
-		if strings.HasSuffix(filename, r.input.ImplSQLSuffix) {
+		if r.isImplFile(filename) {
 			var newQueriesContent []byte
 			if newQueriesContent, err = r.newQueriesContent(filename); err != nil {
 				return err
 			}
+			newQueriesContent, err = imports.Process("", newQueriesContent, nil)
+			if err != nil {
+				return err
+			}
+
 			if newQueriesContents == nil {
 				newQueriesContents = make(map[string][]byte)
 			}
@@ -66,21 +81,21 @@ func (r *runner) Run() error {
 
 	if newModelsContent != nil {
 		_ = os.Remove(path.Join(r.input.ModelsDir, r.input.ModelsFileName))
-		if err := os.WriteFile(path.Join(r.input.ModelsDir, r.input.ModelsFileName), newModelsContent, 0644); err != nil {
+		if err := os.WriteFile(path.Join(r.input.ModelsDir, r.input.ModelsFileName), newModelsContent, 0o644); err != nil {
 			return fmt.Errorf("runner.Run() failed: %w", err)
 		}
 		_ = os.Remove(path.Join(r.input.ImplDir, r.input.ModelsFileName))
 	}
 	if newQuerierContent != nil {
 		_ = os.Remove(path.Join(r.input.IfaceDir, r.input.QuerierFileName))
-		if err := os.WriteFile(path.Join(r.input.IfaceDir, r.input.QuerierFileName), newQuerierContent, 0644); err != nil {
+		if err := os.WriteFile(path.Join(r.input.IfaceDir, r.input.QuerierFileName), newQuerierContent, 0o644); err != nil {
 			return fmt.Errorf("runner.Run() failed: %w", err)
 		}
 		_ = os.Remove(path.Join(r.input.ImplDir, r.input.QuerierFileName))
 	}
 	for filename, content := range newQueriesContents {
 		_ = os.Remove(path.Join(r.input.ImplDir, filename))
-		if err := os.WriteFile(path.Join(r.input.ImplDir, filename), content, 0644); err != nil {
+		if err := os.WriteFile(path.Join(r.input.ImplDir, filename), content, 0o644); err != nil {
 			return fmt.Errorf("runner.Run() failed: %w", err)
 		}
 	}
@@ -168,7 +183,7 @@ func (r *runner) newQuerierContent() ([]byte, error) {
 	}
 
 	for _, dirEntry := range dirEntries {
-		if !strings.HasSuffix(dirEntry.Name(), r.input.ImplSQLSuffix) {
+		if !r.isImplFile(dirEntry.Name()) {
 			continue
 		}
 
@@ -273,3 +288,16 @@ func (r *runner) newQueriesContent(filename string) ([]byte, error) {
 	}
 	return byt, nil
 }
+
+func (r *runner) isImplFile(filename string) bool {
+	return strings.HasSuffix(filename, r.input.ImplSQLSuffix) || inStrings(filename, r.input.AditionalQuerierFiles)
+}
+
+func inStrings(s string, slice []string) bool {
+	for _, v := range slice {
+		if v == s {
+			return true
+		}
+	}
+	return false
+}
diff --git a/pkg/actions/separate-interface/separate_interface.go b/pkg/actions/separate-interface/separate_interface.go
@@ -28,6 +28,8 @@ type ActionInput struct {
 	ModelsFileName string
 	// QuerierFileName The file name for the sqlc-generated Querier file.
 	QuerierFileName string
+	// AditionalQuerierFiles A list of other files that contains querier impl.
+	AditionalQuerierFiles []string
 }
 
 func Action(_ context.Context, input ActionInput) error {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,10 @@ import (`
`12`	`12`	`"path"`
`13`	`13`	`"strings"`
`14`	`14`
`15`		`- "github.com/mpyw/sqlc-restruct/pkg/internal/astutil"`
`16`	`15`	`"golang.org/x/exp/slices"`
	`16`	`+ "golang.org/x/tools/imports"`
	`17`	`+`
	`18`	`+ "github.com/mpyw/sqlc-restruct/pkg/internal/astutil"`
`17`	`19`	`)`
`18`	`20`
`19`	`21`	`type runner struct {`
`@@ -43,19 +45,32 @@ func (r *runner) Run() error {`
`43`	`45`	`if newModelsContent, err = r.newModelsContent(); err != nil {`
`44`	`46`	`return err`
`45`	`47`	`}`
	`48`	`+ newModelsContent, err = imports.Process("", newModelsContent, nil)`
	`49`	`+ if err != nil {`
	`50`	`+ return err`
	`51`	`+ }`
`46`	`52`	`continue`
`47`	`53`	`}`
`48`	`54`	`if filename == r.input.QuerierFileName {`
`49`	`55`	`if newQuerierContent, err = r.newQuerierContent(); err != nil {`
`50`	`56`	`return err`
`51`	`57`	`}`
	`58`	`+ newQuerierContent, err = imports.Process("", newQuerierContent, nil)`
	`59`	`+ if err != nil {`
	`60`	`+ return err`
	`61`	`+ }`
`52`	`62`	`continue`
`53`	`63`	`}`
`54`		`- if strings.HasSuffix(filename, r.input.ImplSQLSuffix) {`
	`64`	`+ if r.isImplFile(filename) {`
`55`	`65`	`var newQueriesContent []byte`
`56`	`66`	`if newQueriesContent, err = r.newQueriesContent(filename); err != nil {`
`57`	`67`	`return err`
`58`	`68`	`}`
	`69`	`+ newQueriesContent, err = imports.Process("", newQueriesContent, nil)`
	`70`	`+ if err != nil {`
	`71`	`+ return err`
	`72`	`+ }`
	`73`	`+`
`59`	`74`	`if newQueriesContents == nil {`
`60`	`75`	`newQueriesContents = make(map[string][]byte)`
`61`	`76`	`}`
`@@ -66,21 +81,21 @@ func (r *runner) Run() error {`
`66`	`81`
`67`	`82`	`if newModelsContent != nil {`
`68`	`83`	`_ = os.Remove(path.Join(r.input.ModelsDir, r.input.ModelsFileName))`
`69`		`- if err := os.WriteFile(path.Join(r.input.ModelsDir, r.input.ModelsFileName), newModelsContent, 0644); err != nil {`
	`84`	`+ if err := os.WriteFile(path.Join(r.input.ModelsDir, r.input.ModelsFileName), newModelsContent, 0o644); err != nil {`
`70`	`85`	`return fmt.Errorf("runner.Run() failed: %w", err)`
`71`	`86`	`}`
`72`	`87`	`_ = os.Remove(path.Join(r.input.ImplDir, r.input.ModelsFileName))`
`73`	`88`	`}`
`74`	`89`	`if newQuerierContent != nil {`
`75`	`90`	`_ = os.Remove(path.Join(r.input.IfaceDir, r.input.QuerierFileName))`
`76`		`- if err := os.WriteFile(path.Join(r.input.IfaceDir, r.input.QuerierFileName), newQuerierContent, 0644); err != nil {`
	`91`	`+ if err := os.WriteFile(path.Join(r.input.IfaceDir, r.input.QuerierFileName), newQuerierContent, 0o644); err != nil {`
`77`	`92`	`return fmt.Errorf("runner.Run() failed: %w", err)`
`78`	`93`	`}`
`79`	`94`	`_ = os.Remove(path.Join(r.input.ImplDir, r.input.QuerierFileName))`
`80`	`95`	`}`
`81`	`96`	`for filename, content := range newQueriesContents {`
`82`	`97`	`_ = os.Remove(path.Join(r.input.ImplDir, filename))`
`83`		`- if err := os.WriteFile(path.Join(r.input.ImplDir, filename), content, 0644); err != nil {`
	`98`	`+ if err := os.WriteFile(path.Join(r.input.ImplDir, filename), content, 0o644); err != nil {`
`84`	`99`	`return fmt.Errorf("runner.Run() failed: %w", err)`
`85`	`100`	`}`
`86`	`101`	`}`
`@@ -168,7 +183,7 @@ func (r *runner) newQuerierContent() ([]byte, error) {`
`168`	`183`	`}`
`169`	`184`
`170`	`185`	`for _, dirEntry := range dirEntries {`
`171`		`- if !strings.HasSuffix(dirEntry.Name(), r.input.ImplSQLSuffix) {`
	`186`	`+ if !r.isImplFile(dirEntry.Name()) {`
`172`	`187`	`continue`
`173`	`188`	`}`
`174`	`189`
`@@ -273,3 +288,16 @@ func (r *runner) newQueriesContent(filename string) ([]byte, error) {`
`273`	`288`	`}`
`274`	`289`	`return byt, nil`
`275`	`290`	`}`
	`291`	`+`
	`292`	`+func (r *runner) isImplFile(filename string) bool {`
	`293`	`+ return strings.HasSuffix(filename, r.input.ImplSQLSuffix) \|\| inStrings(filename, r.input.AditionalQuerierFiles)`
	`294`	`+}`
	`295`	`+`
	`296`	`+func inStrings(s string, slice []string) bool {`
	`297`	`+ for _, v := range slice {`
	`298`	`+ if v == s {`
	`299`	`+ return true`
	`300`	`+ }`
	`301`	`+ }`
	`302`	`+ return false`
	`303`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ type ActionInput struct {`
`28`	`28`	`ModelsFileName string`
`29`	`29`	`// QuerierFileName The file name for the sqlc-generated Querier file.`
`30`	`30`	`QuerierFileName string`
	`31`	`+ // AditionalQuerierFiles A list of other files that contains querier impl.`
	`32`	`+ AditionalQuerierFiles []string`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`func Action(_ context.Context, input ActionInput) error {`