make builders exported (#6)

Author: sxwebdev

.golangci.yml

@@ -0,0 +1,109 @@
+version: "2"
+run:
+  modules-download-mode: readonly
+  tests: false
+  allow-parallel-runners: true
+linters:
+  default: all
+  disable:
+    - depguard
+    - err113
+    - exhaustive
+    - exhaustruct
+    - gochecknoglobals
+    - godox
+    - mnd
+    - nlreturn
+    - recvcheck
+    - tagalign
+    - varnamelen
+    - wrapcheck
+    - wsl
+    - ireturn
+  settings:
+    cyclop:
+      max-complexity: 25
+    funlen:
+      lines: 190
+      statements: -1
+      ignore-comments: true
+    gocognit:
+      min-complexity: 80
+    gocyclo:
+      min-complexity: 45
+    interfacebloat:
+      max: 20
+    lll:
+      line-length: 170
+      tab-width: 2
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+          yaml: snake
+        use-field-name: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - funlen
+          - misspell
+        path: _test\.go
+      - path: (.+)\.go$
+        text: missing type in composite literal
+      - path: (.+)\.go$
+        text: "var-naming: don't use an underscore in package name"
+      - path: (.+)\.go$
+        text: should not use underscores in package names
+    paths:
+      - .*\.sql\.go
+      - .*\.pb\.go
+      - .*\.connect\.go
+      - bin
+      - api
+      - schema
+      - sql
+      - internal/templates
+      - pb
+      - schema
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  fix: true
+severity:
+  default: error
+  rules:
+    - linters:
+        - godox
+      severity: warning
+    - linters:
+        - dupl
+      severity: info
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - .*\.sql\.go
+      - .*\.pb\.go
+      - .*\.connect\.go
+      - bin
+      - api
+      - schema
+      - sql
+      - internal/templates
+      - pb
+      - schema
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -1,2 +1,5 @@
 tests:
 	go test -v ./...
+
+lint:
+	golangci-lint run

cast_types.go

@@ -2,6 +2,7 @@ package tsbuilder
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/tkcrm/tsbuilder/tsfuncs"
 )
@@ -13,9 +14,9 @@ func castType(value any) (string, error) {
 	case float32, float64:
 		return fmt.Sprintf("%f", v), nil
 	case string:
-		return fmt.Sprint("'" + v + "'"), nil
+		return "'" + v + "'", nil
 	case bool:
-		return fmt.Sprintf("%v", v), nil
+		return strconv.FormatBool(v), nil
 	case tsfuncs.TDEngineFunc:
 		return v.String(), nil
 	case nil:

common.go

@@ -1,5 +1,5 @@
 package tsbuilder
 
-type tdEngineSqlBuilder interface {
+type TdEngineSQLBuilder interface {
 	Build() (sql string, err error)
 }

database.go

@@ -6,30 +6,30 @@ import (
 	"strings"
 )
 
-var _ tdEngineSqlBuilder = (*databaseBuilder)(nil)
+var _ TdEngineSQLBuilder = (*DatabaseBuilder)(nil)
 
-type databaseBuilder struct {
+type DatabaseBuilder struct {
 	name    string
 	options []string
 }
 
-func NewDatabaseBuilder() *databaseBuilder {
-	return &databaseBuilder{
+func NewDatabaseBuilder() *DatabaseBuilder {
+	return &DatabaseBuilder{
 		options: make([]string, 0),
 	}
 }
 
-func (s *databaseBuilder) Name(name string) *databaseBuilder {
+func (s *DatabaseBuilder) Name(name string) *DatabaseBuilder {
 	s.name = name
 	return s
 }
 
-func (s *databaseBuilder) Options(options ...string) *databaseBuilder {
+func (s *DatabaseBuilder) Options(options ...string) *DatabaseBuilder {
 	s.options = append(s.options, options...)
 	return s
 }
 
-func (s *databaseBuilder) Build() (string, error) {
+func (s *DatabaseBuilder) Build() (string, error) {
 	if err := s.validate(); err != nil {
 		return "", fmt.Errorf("validate error: %w", err)
 	}
@@ -48,7 +48,7 @@ func (s *databaseBuilder) Build() (string, error) {
 	return b.String(), nil
 }
 
-func (s databaseBuilder) validate() error {
+func (s DatabaseBuilder) validate() error {
 	if s.name == "" {
 		return ErrEmptyDatabaseName
 	}

delete.go

@@ -6,30 +6,30 @@ import (
 	"strings"
 )
 
-var _ tdEngineSqlBuilder = (*deleteBuilder)(nil)
+var _ TdEngineSQLBuilder = (*DeleteBuilder)(nil)
 
-type deleteBuilder struct {
+type DeleteBuilder struct {
 	from            string
 	whereConditions []string
 }
 
-func NewDeleteBuilder() *deleteBuilder {
-	return &deleteBuilder{
+func NewDeleteBuilder() *DeleteBuilder {
+	return &DeleteBuilder{
 		whereConditions: make([]string, 0),
 	}
 }
 
-func (s *deleteBuilder) From(from string) *deleteBuilder {
+func (s *DeleteBuilder) From(from string) *DeleteBuilder {
 	s.from = from
 	return s
 }
 
-func (s *deleteBuilder) Where(conditions ...string) *deleteBuilder {
+func (s *DeleteBuilder) Where(conditions ...string) *DeleteBuilder {
 	s.whereConditions = append(s.whereConditions, conditions...)
 	return s
 }
 
-func (s *deleteBuilder) Build() (string, error) {
+func (s *DeleteBuilder) Build() (string, error) {
 	if err := s.validate(); err != nil {
 		return "", fmt.Errorf("validate error: %w", err)
 	}
@@ -51,7 +51,7 @@ func (s *deleteBuilder) Build() (string, error) {
 	return b.String(), nil
 }
 
-func (s *deleteBuilder) validate() error {
+func (s *DeleteBuilder) validate() error {
 	if s.from == "" {
 		return ErrEmptyTableName
 	}

drop_table.go

@@ -2,28 +2,29 @@ package tsbuilder
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"strings"
 )
 
-var _ tdEngineSqlBuilder = (*dropTableBuilder)(nil)
+var _ TdEngineSQLBuilder = (*DropTableBuilder)(nil)
 
-type dropTableBuilder struct {
+type DropTableBuilder struct {
 	tables []string
 }
 
-func NewDropTableBuilder() *dropTableBuilder {
-	return &dropTableBuilder{
+func NewDropTableBuilder() *DropTableBuilder {
+	return &DropTableBuilder{
 		tables: make([]string, 0),
 	}
 }
 
-func (s *dropTableBuilder) Tables(tables ...string) *dropTableBuilder {
+func (s *DropTableBuilder) Tables(tables ...string) *DropTableBuilder {
 	s.tables = append(s.tables, tables...)
 	return s
 }
 
-func (s *dropTableBuilder) Build() (string, error) {
+func (s *DropTableBuilder) Build() (string, error) {
 	if err := s.validate(); err != nil {
 		return "", fmt.Errorf("validate error: %w", err)
 	}
@@ -42,9 +43,9 @@ func (s *dropTableBuilder) Build() (string, error) {
 	return b.String(), nil
 }
 
-func (s *dropTableBuilder) validate() error {
+func (s *DropTableBuilder) validate() error {
 	if len(s.tables) == 0 {
-		return fmt.Errorf("tables are required")
+		return errors.New("tables are required")
 	}
 
 	return nil

go.mod

@@ -1,8 +1,8 @@
 module github.com/tkcrm/tsbuilder
 
-go 1.18
+go 1.22
 
-require github.com/stretchr/testify v1.9.0
+require github.com/stretchr/testify v1.10.0
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect

go.sum

@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

insert.go

@@ -7,34 +7,34 @@ import (
 	"strings"
 )
 
-var _ tdEngineSqlBuilder = (*insertBuilder)(nil)
+var _ TdEngineSQLBuilder = (*InsertBuilder)(nil)
 
-type insertTableData struct {
+type InsertTableData struct {
 	tableName string
 	using     string
 	columns   []string
 	values    [][]any
 	tags      map[string]any
 }
 
-type insertBuilder struct {
-	tablesData []*insertTableData
+type InsertBuilder struct {
+	tablesData []*InsertTableData
 }
 
-func NewInsertBuilder() *insertBuilder {
-	return &insertBuilder{
-		tablesData: make([]*insertTableData, 0),
+func NewInsertBuilder() *InsertBuilder {
+	return &InsertBuilder{
+		tablesData: make([]*InsertTableData, 0),
 	}
 }
 
-func (s *insertBuilder) AddTable(tableName string) *insertTableData {
+func (s *InsertBuilder) AddTable(tableName string) *InsertTableData {
 	for idx, table := range s.tablesData {
 		if table.tableName == tableName {
 			s.tablesData = append(s.tablesData[:idx], s.tablesData[idx+1:]...)
 		}
 	}
 
-	tData := &insertTableData{
+	tData := &InsertTableData{
 		tableName: tableName,
 		tags:      make(map[string]any),
 		columns:   make([]string, 0),
@@ -46,22 +46,22 @@ func (s *insertBuilder) AddTable(tableName string) *insertTableData {
 	return tData
 }
 
-func (s *insertTableData) Using(v string) *insertTableData {
+func (s *InsertTableData) Using(v string) *InsertTableData {
 	s.using = v
 	return s
 }
 
-func (s *insertTableData) Columns(columns ...string) *insertTableData {
+func (s *InsertTableData) Columns(columns ...string) *InsertTableData {
 	s.columns = columns
 	return s
 }
 
-func (s *insertTableData) Values(values ...any) *insertTableData {
+func (s *InsertTableData) Values(values ...any) *InsertTableData {
 	s.values = append(s.values, values)
 	return s
 }
 
-func (s *insertTableData) Tags(tags map[string]any) *insertTableData {
+func (s *InsertTableData) Tags(tags map[string]any) *InsertTableData {
 	if tags == nil {
 		return s
 	}
@@ -70,7 +70,7 @@ func (s *insertTableData) Tags(tags map[string]any) *insertTableData {
 	return s
 }
 
-func (s *insertBuilder) Build() (string, error) {
+func (s *InsertBuilder) Build() (string, error) {
 	b := bytes.NewBuffer([]byte{})
 	b.WriteString("INSERT INTO ")
 
@@ -160,7 +160,7 @@ func (s *insertBuilder) Build() (string, error) {
 	return b.String(), nil
 }
 
-func (s *insertTableData) validate() error {
+func (s *InsertTableData) validate() error {
 	if s.tableName == "" {
 		return ErrEmptyTableName
 	}