Skip to content

Easier API for FieldString builder #27

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

Closed
adamdickmeiss wants to merge 1 commit into from
Closed

Easier API for FieldString builder #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions cmd/pgcql-cli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ func main() {
flag.StringVar(&serverChoiceColumn, "s", "text", "column for cql.serverChoice")
def := pgcql.NewPgDefinition()
if serverChoiceColumn != "" {
serverChoice := &pgcql.FieldString{}
serverChoice.WithFullText("english").SetColumn(serverChoiceColumn)
serverChoice := pgcql.NewFieldString().WithFullText("english").WithColumn(serverChoiceColumn)
def.AddField("cql.serverChoice", serverChoice)
}
flag.Parse()
Expand All @@ -26,8 +25,7 @@ func main() {
}
for i := 0; i < len(flag.Args()); i++ {
if i < len(flag.Args())-1 {
field := &pgcql.FieldString{}
field.WithLikeOps()
field := pgcql.NewFieldString().WithLikeOps()
def.AddField(flag.Args()[i], field)
continue
}
Expand Down
15 changes: 12 additions & 3 deletions pgcql/pg_field_string.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ type FieldString struct {
enableExact bool
}

func (f *FieldString) WithFullText(language string) Field {
func NewFieldString() *FieldString {
return &FieldString{}
}

func (f *FieldString) WithColumn(column string) *FieldString {
f.column = column
return f
}

func (f *FieldString) WithFullText(language string) *FieldString {
if language == "" {
f.language = "simple"
} else {
Expand All @@ -22,13 +31,13 @@ func (f *FieldString) WithFullText(language string) Field {
return f
}

func (f *FieldString) WithLikeOps() Field {
func (f *FieldString) WithLikeOps() *FieldString {
f.enableExact = true
f.enableLike = true
return f
}

func (f *FieldString) WithExact() Field {
func (f *FieldString) WithExact() *FieldString {
f.enableExact = true
return f
}
Expand Down
3 changes: 1 addition & 2 deletions pgcql/pgcql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ func TestParsing(t *testing.T) {

assert.Equal(t, title.GetColumn(), "Title", "GetColumn() should return the column name")

author := &FieldString{}
author.WithLikeOps().SetColumn("Author")
author := NewFieldString().WithLikeOps().WithColumn("Author")

serverChoice := &FieldString{}
serverChoice.WithExact().SetColumn("T")
Expand Down