refactor(compiler): remove some duplicate code (#2546)

andrewmbenton · web-flow · commit b131f0237028 · 2023-07-30T15:03:01.000-07:00
* refactor(compiler): remove some duplicate code

* fix(compiler): remove duplicate code
diff --git a/internal/compiler/compat.go b/internal/compiler/compat.go
@@ -14,11 +14,6 @@ func stringSlice(list *ast.List) []string {
 	for _, item := range list.Items {
 		if n, ok := item.(*ast.String); ok {
 			items = append(items, n.Str)
-			continue
-		}
-		if n, ok := item.(*ast.String); ok {
-			items = append(items, n.Str)
-			continue
 		}
 	}
 	return items
diff --git a/internal/compiler/to_column.go b/internal/compiler/to_column.go
@@ -7,13 +7,6 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
-func isArray(n *ast.TypeName) bool {
-	if n == nil || n.ArrayBounds == nil {
-		return false
-	}
-	return len(n.ArrayBounds.Items) > 0
-}
-
 func arrayDims(n *ast.TypeName) int {
 	if n == nil || n.ArrayBounds == nil {
 		return 0
@@ -29,11 +22,12 @@ func toColumn(n *ast.TypeName) *Column {
 	if err != nil {
 		panic("toColumn: " + err.Error())
 	}
+	arrayDims := arrayDims(n)
 	return &Column{
 		Type:      typ,
 		DataType:  strings.TrimPrefix(astutils.Join(n.Names, "."), "."),
 		NotNull:   true, // XXX: How do we know if this should be null?
-		IsArray:   isArray(n),
-		ArrayDims: arrayDims(n),
+		IsArray:   arrayDims > 0,
+		ArrayDims: arrayDims,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,6 @@ func stringSlice(list *ast.List) []string {`
`14`	`14`	`for _, item := range list.Items {`
`15`	`15`	`if n, ok := item.(*ast.String); ok {`
`16`	`16`	`items = append(items, n.Str)`
`17`		`- continue`
`18`		`- }`
`19`		`- if n, ok := item.(*ast.String); ok {`
`20`		`- items = append(items, n.Str)`
`21`		`- continue`
`22`	`17`	`}`
`23`	`18`	`}`
`24`	`19`	`return items`