Rename Path to more specific SourcePath

Make it easier to distinguish between a generated path and a source path.

generate.go

@@ -190,7 +190,11 @@ func connectPostgres(
 func parseQueryFiles(queryFiles []string, inferrer *pginfer.Inferrer) ([]codegen.QueryFile, error) {
 	files := make([]codegen.QueryFile, len(queryFiles))
 	for i, file := range queryFiles {
-		queryFile, err := parseQueries(file, inferrer)
+		srcPath, err := filepath.Abs(file)
+		if err != nil {
+			return nil, fmt.Errorf("resovle absolute path for %q: %w", file, err)
+		}
+		queryFile, err := parseQueries(srcPath, inferrer)
 		if err != nil {
 			return nil, fmt.Errorf("parse template query file %q: %w", file, err)
 		}
@@ -199,10 +203,10 @@ func parseQueryFiles(queryFiles []string, inferrer *pginfer.Inferrer) ([]codegen
 	return files, nil
 }
 
-func parseQueries(file string, inferrer *pginfer.Inferrer) (codegen.QueryFile, error) {
-	astFile, err := parser.ParseFile(gotok.NewFileSet(), file, nil, 0)
+func parseQueries(srcPath string, inferrer *pginfer.Inferrer) (codegen.QueryFile, error) {
+	astFile, err := parser.ParseFile(gotok.NewFileSet(), srcPath, nil, 0)
 	if err != nil {
-		return codegen.QueryFile{}, fmt.Errorf("parse query file %q: %w", file, err)
+		return codegen.QueryFile{}, fmt.Errorf("parse query file %q: %w", srcPath, err)
 	}
 
 	// Check for duplicate query names and bad queries.
@@ -233,7 +237,7 @@ func parseQueries(file string, inferrer *pginfer.Inferrer) (codegen.QueryFile, e
 		queries = append(queries, typedQuery)
 	}
 	return codegen.QueryFile{
-		Path:    file,
-		Queries: queries,
+		SourcePath: srcPath,
+		Queries:    queries,
 	}, nil
 }

internal/codegen/common.go

@@ -8,6 +8,6 @@ import (
 
 // QueryFile represents all of the SQL queries from a single file.
 type QueryFile struct {
-	Path    string               // the path to the source SQL query file
-	Queries []pginfer.TypedQuery // the typed queries
+	SourcePath string               // absolute path to the source SQL query file
+	Queries    []pginfer.TypedQuery // the typed queries
 }

internal/codegen/golang/emitter.go

@@ -20,7 +20,7 @@ func NewEmitter(outDir string, tmpl *template.Template) Emitter {
 
 // EmitQueryFile emits a single query file.
 func (em Emitter) EmitQueryFile(tf TemplatedFile) (mErr error) {
-	base := filepath.Base(tf.Path)
+	base := filepath.Base(tf.SourcePath)
 	out := filepath.Join(em.outDir, base+".go")
 	file, err := os.OpenFile(out, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
 	defer errs.Capture(&mErr, file.Close, "close emit query file")

internal/codegen/golang/generate.go

@@ -41,7 +41,7 @@ func Generate(opts GenerateOptions, queryFiles []codegen.QueryFile) error {
 
 	// Order for reproducible results.
 	sort.Slice(templatedFiles, func(i, j int) bool {
-		return templatedFiles[i].Path < templatedFiles[j].Path
+		return templatedFiles[i].SourcePath < templatedFiles[j].SourcePath
 	})
 
 	// Link each child to the package. Necessary so the leader can define all

internal/codegen/golang/templated_file.go

@@ -18,12 +18,12 @@ type TemplatedPackage struct {
 // TemplatedFile is the Go version of a SQL query file with all information
 // needed to execute the codegen template.
 type TemplatedFile struct {
-	Pkg     TemplatedPackage // the parent package containing this file
-	PkgPath string           // full package path, like "github.com/foo/bar"
-	GoPkg   string           // the name of the Go package to use for the generated file
-	Path    string           // the path to source SQL file
-	Queries []TemplatedQuery // the queries with all template information
-	Imports []string         // Go imports
+	Pkg        TemplatedPackage // the parent package containing this file
+	PkgPath    string           // full package path, like "github.com/foo/bar"
+	GoPkg      string           // the name of the Go package to use for the generated file
+	SourcePath string           // absolute path to source SQL file
+	Queries    []TemplatedQuery // the queries with all template information
+	Imports    []string         // Go imports
 	// True if this file is the leader file. The leader defines common code used
 	// by by all queries in the same directory. Only one leader per directory.
 	IsLeader bool

internal/codegen/golang/templater.go

@@ -42,7 +42,7 @@ func (tm Templater) TemplateAll(files []codegen.QueryFile) ([]TemplatedFile, err
 	for _, queryFile := range files {
 		goFile, decls, err := tm.templateFile(queryFile)
 		if err != nil {
-			return nil, fmt.Errorf("template query file %s for go: %w", queryFile.Path, err)
+			return nil, fmt.Errorf("template query file %s for go: %w", queryFile.SourcePath, err)
 		}
 		goQueryFiles = append(goQueryFiles, goFile)
 		declarers = append(declarers, decls...)
@@ -52,9 +52,9 @@ func (tm Templater) TemplateAll(files []codegen.QueryFile) ([]TemplatedFile, err
 	firstIndex := -1
 	firstName := string(unicode.MaxRune)
 	for i, goFile := range goQueryFiles {
-		if goFile.Path < firstName {
+		if goFile.SourcePath < firstName {
 			firstIndex = i
-			firstName = goFile.Path
+			firstName = goFile.SourcePath
 		}
 	}
 	goQueryFiles[firstIndex].IsLeader = true
@@ -94,7 +94,7 @@ func (tm Templater) TemplateAll(files []codegen.QueryFile) ([]TemplatedFile, err
 
 	// Remove self imports.
 	for i, file := range goQueryFiles {
-		selfPkg, err := gomod.GuessPackage(file.Path)
+		selfPkg, err := gomod.GuessPackage(file.SourcePath)
 		if err != nil || selfPkg == "" {
 			continue // ignore error, assume it's not a self import
 		}
@@ -130,7 +130,7 @@ func (tm Templater) templateFile(file codegen.QueryFile) (TemplatedFile, []Decla
 	// resolving the package isn't perfect. We'll fallback to an unqualified
 	// type which will likely work since the type is probably declared in this
 	// package.
-	if pkg, err := gomod.GuessPackage(file.Path); err == nil {
+	if pkg, err := gomod.GuessPackage(file.SourcePath); err == nil {
 		pkgPath = pkg
 	}
 
@@ -210,11 +210,11 @@ func (tm Templater) templateFile(file codegen.QueryFile) (TemplatedFile, []Decla
 	}
 
 	return TemplatedFile{
-		PkgPath: pkgPath,
-		GoPkg:   tm.pkg,
-		Path:    file.Path,
-		Queries: queries,
-		Imports: imports.SortedPackages(),
+		PkgPath:    pkgPath,
+		GoPkg:      tm.pkg,
+		SourcePath: file.SourcePath,
+		Queries:    queries,
+		Imports:    imports.SortedPackages(),
 	}, declarers, nil
 }
 

internal/pginfer/pginfer.go

@@ -36,7 +36,7 @@ type TypedQuery struct {
 	// The output columns of the query.
 	Outputs []OutputColumn
 	// Qualified protocol buffer message type to use for each output row, like
-	//"erp.api.Product". If empty, generate our own Row type.
+	// "erp.api.Product". If empty, generate our own Row type.
 	ProtobufType string
 }