Move pattern matching to another package

kyleconroy · kyleconroy · commit 64c2e4de226b · 2022-01-31T21:21:20.000-08:00
diff --git a/internal/codegen/python/gen.go b/internal/codegen/python/gen.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/kyleconroy/sqlc/internal/codegen"
-	"github.com/kyleconroy/sqlc/internal/config"
 	"github.com/kyleconroy/sqlc/internal/inflection"
 	"github.com/kyleconroy/sqlc/internal/metadata"
+	"github.com/kyleconroy/sqlc/internal/pattern"
 	"github.com/kyleconroy/sqlc/internal/plugin"
 	pyast "github.com/kyleconroy/sqlc/internal/python/ast"
 	"github.com/kyleconroy/sqlc/internal/python/poet"
@@ -210,9 +210,8 @@ func pyInnerType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 	}
 }
 
-func matchString(pattern, target string) bool {
-	// TODO: Create a separate package for the matchers
-	matcher, err := config.MatchCompile(pattern)
+func matchString(pat, target string) bool {
+	matcher, err := pattern.MatchCompile(pat)
 	if err != nil {
 		panic(err)
 	}
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/kyleconroy/sqlc/internal/pattern"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
 
 	yaml "gopkg.in/yaml.v3"
@@ -169,10 +170,10 @@ type Override struct {
 	// fully qualified name of the column, e.g. `accounts.id`
 	Column string `json:"column" yaml:"column"`
 
-	ColumnName   *Match
-	TableCatalog *Match
-	TableSchema  *Match
-	TableRel     *Match
+	ColumnName   *pattern.Match
+	TableCatalog *pattern.Match
+	TableSchema  *pattern.Match
+	TableRel     *pattern.Match
 	GoImportPath string
 	GoPackage    string
 	GoTypeName   string
@@ -242,36 +243,36 @@ func (o *Override) Parse() (err error) {
 		colParts := strings.Split(o.Column, ".")
 		switch len(colParts) {
 		case 2:
-			if o.ColumnName, err = MatchCompile(colParts[1]); err != nil {
+			if o.ColumnName, err = pattern.MatchCompile(colParts[1]); err != nil {
 				return err
 			}
-			if o.TableRel, err = MatchCompile(colParts[0]); err != nil {
+			if o.TableRel, err = pattern.MatchCompile(colParts[0]); err != nil {
 				return err
 			}
-			if o.TableSchema, err = MatchCompile("public"); err != nil {
+			if o.TableSchema, err = pattern.MatchCompile("public"); err != nil {
 				return err
 			}
 		case 3:
-			if o.ColumnName, err = MatchCompile(colParts[2]); err != nil {
+			if o.ColumnName, err = pattern.MatchCompile(colParts[2]); err != nil {
 				return err
 			}
-			if o.TableRel, err = MatchCompile(colParts[1]); err != nil {
+			if o.TableRel, err = pattern.MatchCompile(colParts[1]); err != nil {
 				return err
 			}
-			if o.TableSchema, err = MatchCompile(colParts[0]); err != nil {
+			if o.TableSchema, err = pattern.MatchCompile(colParts[0]); err != nil {
 				return err
 			}
 		case 4:
-			if o.ColumnName, err = MatchCompile(colParts[3]); err != nil {
+			if o.ColumnName, err = pattern.MatchCompile(colParts[3]); err != nil {
 				return err
 			}
-			if o.TableRel, err = MatchCompile(colParts[2]); err != nil {
+			if o.TableRel, err = pattern.MatchCompile(colParts[2]); err != nil {
 				return err
 			}
-			if o.TableSchema, err = MatchCompile(colParts[1]); err != nil {
+			if o.TableSchema, err = pattern.MatchCompile(colParts[1]); err != nil {
 				return err
 			}
-			if o.TableCatalog, err = MatchCompile(colParts[0]); err != nil {
+			if o.TableCatalog, err = pattern.MatchCompile(colParts[0]); err != nil {
 				return err
 			}
 		default:
diff --git a/internal/pattern/match.go b/internal/pattern/match.go
@@ -1,4 +1,4 @@
-package config
+package pattern
 
 import (
 	"fmt"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package config`
	`1`	`+package pattern`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`