Skip to content

refactor(compiler): remove some duplicate code #2546

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

Merged
kyleconroy merged 2 commits into from
Jul 30, 2023
Merged

refactor(compiler): remove some duplicate code #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e05213
refactor(compiler): remove some duplicate code
andrewmbenton Jul 30, 2023
0bc7472
fix(compiler): remove duplicate code
andrewmbenton Jul 30, 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
5 changes: 0 additions & 5 deletions internal/compiler/compat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions internal/compiler/to_column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
}
}