Skip to content

fix: Cleanup code #710

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
merged 3 commits into from
Feb 24, 2023
Merged

fix: Cleanup code #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5463a0
go fmt warning
bbernays Feb 24, 2023
6dee44b
more go fmt warnings
bbernays Feb 24, 2023
1df75d9
Code has bugs and is unused
bbernays Feb 24, 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
2 changes: 1 addition & 1 deletion schema/array.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func findDimensionsFromValue(value reflect.Value, dimensions []ArrayDimension, e
fallthrough
case reflect.Slice:
length := value.Len()
if 0 == elementsLength {
if elementsLength == 0 {
elementsLength = length
} else {
elementsLength *= length
Expand Down
3 changes: 1 addition & 2 deletions schema/inet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ func TestInetMarshalUnmarshal(t *testing.T) {
if !bytes.Equal(r.IPNet.Mask, r2.IPNet.Mask) {
t.Errorf("%v != %v", r.IPNet.Mask, r2.IPNet.Mask)
}
//nolint:all
if !bytes.Equal(r.IPNet.IP, r2.IPNet.IP) {
if !net.IP.Equal(r.IPNet.IP, r2.IPNet.IP) {
t.Errorf("%v != %v", r.IPNet.IP, r2.IPNet.IP)
}
}
17 changes: 0 additions & 17 deletions schema/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package schema

import (
"fmt"

"github.com/google/uuid"
)

type Resources []*Resource
Expand Down Expand Up @@ -89,14 +87,6 @@ func (r *Resource) GetValues() CQTypes {
return r.data
}

func (r *Resource) ID() uuid.UUID {
index := r.Table.Columns.Index(CqIDColumn.Name)
if index == -1 {
return uuid.UUID{}
}
return uuid.UUID{}
}

func (r *Resource) Columns() []string {
return r.Table.Columns.Names()
}
Expand All @@ -117,13 +107,6 @@ func (r *Resource) Validate() error {
return nil
}

func (rr Resources) GetIds() []uuid.UUID {
rids := make([]uuid.UUID, len(rr))
for i, r := range rr {
rids[i] = r.ID()
}
return rids
}
func (rr Resources) TableName() string {
if len(rr) == 0 {
return ""
Expand Down