#91: Change interface{} to any, version 1.17 -> 1.18 + test for TestNewConnectionFromDB (#92)

* #91: Change interface{} to any, version 1.17 -> 1.18 + test for TestNewConnectionFromDB

* #91: Change go version to 1.18 in github Actions

Author: arthurkushman

.github/workflows/go.yml

@@ -18,10 +18,10 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-    - name: Set up Go 1.14
+    - name: Set up Go 1.18
       uses: actions/setup-go@v1
       with:
-        go-version: 1.14
+        go-version: 1.18
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v1

builder.go

@@ -35,7 +35,7 @@ const (
 
 // inner type to build qualified sql
 type builder struct {
-	whereBindings   []map[string]interface{}
+	whereBindings   []map[string]any
 	startBindingsAt int
 	where           string
 	table           string
@@ -90,7 +90,7 @@ func (r *DB) reset() {
 	r.Builder.table = ""
 	r.Builder.columns = []string{"*"}
 	r.Builder.where = ""
-	r.Builder.whereBindings = make([]map[string]interface{}, 0)
+	r.Builder.whereBindings = make([]map[string]any, 0)
 	r.Builder.groupBy = ""
 	r.Builder.having = ""
 	r.Builder.orderBy = make([]map[string]string, 0)
@@ -140,7 +140,7 @@ func (r *DB) GroupBy(expr string) *DB {
 }
 
 // Having similar to Where but used with GroupBy to apply over the grouped results
-func (r *DB) Having(operand, operator string, val interface{}) *DB {
+func (r *DB) Having(operand, operator string, val any) *DB {
 	r.Builder.having = operand + " " + operator + " " + convertToStr(val)
 	return r
 }
@@ -237,61 +237,61 @@ func (r *DB) buildJoin(joinType, table, on string) *DB {
 }
 
 // Where accepts left operand-operator-right operand to apply them to where clause
-func (r *DB) Where(operand, operator string, val interface{}) *DB {
+func (r *DB) Where(operand, operator string, val any) *DB {
 	return r.buildWhere("", operand, operator, val)
 }
 
 // AndWhere accepts left operand-operator-right operand to apply them to where clause
 // with AND logical operator
-func (r *DB) AndWhere(operand, operator string, val interface{}) *DB {
+func (r *DB) AndWhere(operand, operator string, val any) *DB {
 	return r.buildWhere("AND", operand, operator, val)
 }
 
 // OrWhere accepts left operand-operator-right operand to apply them to where clause
 // with OR logical operator
-func (r *DB) OrWhere(operand, operator string, val interface{}) *DB {
+func (r *DB) OrWhere(operand, operator string, val any) *DB {
 	return r.buildWhere("OR", operand, operator, val)
 }
 
-func (r *DB) buildWhere(prefix, operand, operator string, val interface{}) *DB {
+func (r *DB) buildWhere(prefix, operand, operator string, val any) *DB {
 	if prefix != "" {
 		prefix = " " + prefix + " "
 	}
-	r.Builder.whereBindings = append(r.Builder.whereBindings, map[string]interface{}{prefix + operand + " " + operator: val})
+	r.Builder.whereBindings = append(r.Builder.whereBindings, map[string]any{prefix + operand + " " + operator: val})
 	return r
 }
 
 // WhereBetween sets the clause BETWEEN 2 values
-func (r *DB) WhereBetween(col string, val1, val2 interface{}) *DB {
+func (r *DB) WhereBetween(col string, val1, val2 any) *DB {
 	return r.buildWhere("", col, sqlOperatorBetween, convertToStr(val1)+and+convertToStr(val2))
 }
 
 // OrWhereBetween sets the clause OR BETWEEN 2 values
-func (r *DB) OrWhereBetween(col string, val1, val2 interface{}) *DB {
+func (r *DB) OrWhereBetween(col string, val1, val2 any) *DB {
 	return r.buildWhere(sqlOperatorOr, col, sqlOperatorBetween, convertToStr(val1)+and+convertToStr(val2))
 }
 
 // AndWhereBetween sets the clause AND BETWEEN 2 values
-func (r *DB) AndWhereBetween(col string, val1, val2 interface{}) *DB {
+func (r *DB) AndWhereBetween(col string, val1, val2 any) *DB {
 	return r.buildWhere(sqlOperatorAnd, col, sqlOperatorBetween, convertToStr(val1)+and+convertToStr(val2))
 }
 
 // WhereNotBetween sets the clause NOT BETWEEN 2 values
-func (r *DB) WhereNotBetween(col string, val1, val2 interface{}) *DB {
+func (r *DB) WhereNotBetween(col string, val1, val2 any) *DB {
 	return r.buildWhere("", col, sqlOperatorNotBetween, convertToStr(val1)+and+convertToStr(val2))
 }
 
 // OrWhereNotBetween sets the clause OR BETWEEN 2 values
-func (r *DB) OrWhereNotBetween(col string, val1, val2 interface{}) *DB {
+func (r *DB) OrWhereNotBetween(col string, val1, val2 any) *DB {
 	return r.buildWhere(sqlOperatorOr, col, sqlOperatorNotBetween, convertToStr(val1)+and+convertToStr(val2))
 }
 
 // AndWhereNotBetween sets the clause AND BETWEEN 2 values
-func (r *DB) AndWhereNotBetween(col string, val1, val2 interface{}) *DB {
+func (r *DB) AndWhereNotBetween(col string, val1, val2 any) *DB {
 	return r.buildWhere(sqlOperatorAnd, col, sqlOperatorNotBetween, convertToStr(val1)+and+convertToStr(val2))
 }
 
-func convertToStr(val interface{}) string {
+func convertToStr(val any) string {
 	switch v := val.(type) {
 	case string:
 		return "'" + v + "'"
@@ -363,7 +363,7 @@ func (r *DB) Rename(from, to string) (sql.Result, error) {
 }
 
 // WhereIn appends IN (val1, val2, val3...) stmt to WHERE clause
-func (r *DB) WhereIn(field string, in interface{}) *DB {
+func (r *DB) WhereIn(field string, in any) *DB {
 	ins, err := interfaceToSlice(in)
 	if err != nil {
 		return nil
@@ -373,7 +373,7 @@ func (r *DB) WhereIn(field string, in interface{}) *DB {
 }
 
 // WhereNotIn appends NOT IN (val1, val2, val3...) stmt to WHERE clause
-func (r *DB) WhereNotIn(field string, in interface{}) *DB {
+func (r *DB) WhereNotIn(field string, in any) *DB {
 	ins, err := interfaceToSlice(in)
 	if err != nil {
 		return nil
@@ -383,7 +383,7 @@ func (r *DB) WhereNotIn(field string, in interface{}) *DB {
 }
 
 // OrWhereIn appends OR IN (val1, val2, val3...) stmt to WHERE clause
-func (r *DB) OrWhereIn(field string, in interface{}) *DB {
+func (r *DB) OrWhereIn(field string, in any) *DB {
 	ins, err := interfaceToSlice(in)
 	if err != nil {
 		return nil
@@ -393,7 +393,7 @@ func (r *DB) OrWhereIn(field string, in interface{}) *DB {
 }
 
 // OrWhereNotIn appends OR NOT IN (val1, val2, val3...) stmt to WHERE clause
-func (r *DB) OrWhereNotIn(field string, in interface{}) *DB {
+func (r *DB) OrWhereNotIn(field string, in any) *DB {
 	ins, err := interfaceToSlice(in)
 	if err != nil {
 		return nil
@@ -403,7 +403,7 @@ func (r *DB) OrWhereNotIn(field string, in interface{}) *DB {
 }
 
 // AndWhereIn appends OR IN (val1, val2, val3...) stmt to WHERE clause
-func (r *DB) AndWhereIn(field string, in interface{}) *DB {
+func (r *DB) AndWhereIn(field string, in any) *DB {
 	ins, err := interfaceToSlice(in)
 	if err != nil {
 		return nil
@@ -414,7 +414,7 @@ func (r *DB) AndWhereIn(field string, in interface{}) *DB {
 }
 
 // AndWhereNotIn appends OR NOT IN (val1, val2, val3...) stmt to WHERE clause
-func (r *DB) AndWhereNotIn(field string, in interface{}) *DB {
+func (r *DB) AndWhereNotIn(field string, in any) *DB {
 	ins, err := interfaceToSlice(in)
 	if err != nil {
 		return nil
@@ -454,7 +454,7 @@ func (r *DB) AndWhereNotNull(field string) *DB {
 }
 
 // prepares slice for Where bindings, IN/NOT IN etc
-func prepareSlice(in []interface{}) (out []string) {
+func prepareSlice(in []any) (out []string) {
 	for _, value := range in {
 		switch v := value.(type) {
 		case string:

builder_test.go

@@ -1,13 +1,15 @@
 package buildsqlx
 
 import (
+	"database/sql"
 	"errors"
 	"fmt"
 	"os"
 	"testing"
 
 	_ "github.com/lib/pq"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -46,6 +48,11 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
+func TestNewConnectionFromDB(t *testing.T) {
+	conn := NewConnectionFromDb(&sql.DB{})
+	require.Equal(t, conn.db, &sql.DB{})
+}
+
 func TestSelectAndLimit(t *testing.T) {
 	_, err := db.Truncate(TestTable)
 	assert.NoError(t, err)

factory.go

@@ -20,7 +20,7 @@ var (
 )
 
 // Get builds all sql statements chained before and executes query collecting data to the slice
-func (r *DB) Get() ([]map[string]interface{}, error) {
+func (r *DB) Get() ([]map[string]any, error) {
 	builder := r.Builder
 	if builder.table == "" {
 		return nil, errTableCallBeforeOp
@@ -51,14 +51,14 @@ func (r *DB) Get() ([]map[string]interface{}, error) {
 
 	columns, _ := rows.Columns()
 	count := len(columns)
-	values := make([]interface{}, count)
-	valuePtrs := make([]interface{}, count)
+	values := make([]any, count)
+	valuePtrs := make([]any, count)
 
 	// collecting data from struct with fields
-	var res []map[string]interface{}
+	var res []map[string]any
 
 	for rows.Next() {
-		collect := make(map[string]interface{}, count)
+		collect := make(map[string]any, count)
 
 		for i := range columns {
 			valuePtrs[i] = &values[i]
@@ -87,8 +87,8 @@ func (r *DB) Get() ([]map[string]interface{}, error) {
 	return res, nil
 }
 
-func prepareValues(values []map[string]interface{}) []interface{} {
-	var vls []interface{}
+func prepareValues(values []map[string]any) []any {
+	var vls []any
 	for _, v := range values {
 		_, vals, _ := prepareBindings(v)
 		vls = append(vls, vals...)
@@ -143,14 +143,14 @@ func (r *builder) buildClauses() string {
 }
 
 // composes WHERE clause string for particular query stmt
-func composeWhere(whereBindings []map[string]interface{}, startedAt int) string {
+func composeWhere(whereBindings []map[string]any, startedAt int) string {
 	where := " WHERE "
 	i := startedAt
 	for _, m := range whereBindings {
 		for k, v := range m {
 			// operand >= $i
 			switch vi := v.(type) {
-			case []interface{}:
+			case []any:
 				placeholders := make([]string, 0, len(vi))
 				for range vi {
 					placeholders = append(placeholders, "$"+strconv.Itoa(i))
@@ -192,7 +192,7 @@ func composeOrderBy(orderBy []map[string]string, orderByRaw *string) string {
 }
 
 // Insert inserts one row with param bindings
-func (r *DB) Insert(data map[string]interface{}) error {
+func (r *DB) Insert(data map[string]any) error {
 	builder := r.Builder
 	if builder.table == "" {
 		return errTableCallBeforeOp
@@ -212,7 +212,7 @@ func (r *DB) Insert(data map[string]interface{}) error {
 }
 
 // InsertGetId inserts one row with param bindings and returning id
-func (r *DB) InsertGetId(data map[string]interface{}) (uint64, error) {
+func (r *DB) InsertGetId(data map[string]any) (uint64, error) {
 	builder := r.Builder
 	if builder.table == "" {
 		return 0, errTableCallBeforeOp
@@ -232,8 +232,8 @@ func (r *DB) InsertGetId(data map[string]interface{}) (uint64, error) {
 	return id, nil
 }
 
-func prepareValue(value interface{}) []interface{} {
-	values := []interface{}{}
+func prepareValue(value any) []any {
+	var values []any
 	switch v := value.(type) {
 	case string:
 		//if where { // todo: left comments for further exploration, probably incorrect behaviour for pg driver
@@ -249,7 +249,7 @@ func prepareValue(value interface{}) []interface{} {
 		values = append(values, strconv.FormatInt(v, 10))
 	case uint64:
 		values = append(values, strconv.FormatUint(v, 10))
-	case []interface{}:
+	case []any:
 		for _, vi := range v {
 			values = append(values, prepareValue(vi)...)
 		}
@@ -261,7 +261,7 @@ func prepareValue(value interface{}) []interface{} {
 }
 
 // prepareBindings prepares slices to split in favor of INSERT sql statement
-func prepareBindings(data map[string]interface{}) (columns []string, values []interface{}, bindings []string) {
+func prepareBindings(data map[string]any) (columns []string, values []any, bindings []string) {
 	i := 1
 	for column, value := range data {
 		if strings.Contains(column, sqlOperatorIs) || strings.Contains(column, sqlOperatorBetween) {
@@ -284,7 +284,7 @@ func prepareBindings(data map[string]interface{}) (columns []string, values []in
 }
 
 // InsertBatch inserts multiple rows based on transaction
-func (r *DB) InsertBatch(data []map[string]interface{}) error {
+func (r *DB) InsertBatch(data []map[string]any) error {
 	builder := r.Builder
 	if builder.table == "" {
 		return errTableCallBeforeOp
@@ -328,13 +328,13 @@ func (r *DB) InsertBatch(data []map[string]interface{}) error {
 }
 
 // prepareInsertBatch prepares slices to split in favor of INSERT sql statement
-func prepareInsertBatch(data []map[string]interface{}) (columns []string, values [][]interface{}) {
-	values = make([][]interface{}, len(data))
+func prepareInsertBatch(data []map[string]any) (columns []string, values [][]any) {
+	values = make([][]any, len(data))
 	colToIdx := make(map[string]int)
 
 	i := 0
 	for k, v := range data {
-		values[k] = make([]interface{}, len(v))
+		values[k] = make([]any, len(v))
 
 		for column, value := range v {
 			if k == 0 {
@@ -364,7 +364,7 @@ func prepareInsertBatch(data []map[string]interface{}) (columns []string, values
 
 // Update builds an UPDATE sql stmt with corresponding where/from clauses if stated
 // returning affected rows
-func (r *DB) Update(data map[string]interface{}) (int64, error) {
+func (r *DB) Update(data map[string]any) (int64, error) {
 	builder := r.Builder
 	if builder.table == "" {
 		return 0, errTableCallBeforeOp
@@ -414,7 +414,7 @@ func (r *DB) Delete() (int64, error) {
 }
 
 // Replace inserts data if conflicting row hasn't been found, else it will update an existing one
-func (r *DB) Replace(data map[string]interface{}, conflict string) (int64, error) {
+func (r *DB) Replace(data map[string]any, conflict string) (int64, error) {
 	builder := r.Builder
 	if builder.table == "" {
 		return 0, errTableCallBeforeOp
@@ -436,7 +436,7 @@ func (r *DB) Replace(data map[string]interface{}, conflict string) (int64, error
 
 // InTransaction executes fn passed as an argument in transaction mode
 // if there are no results returned - txn will be rolled back, otherwise committed and returned
-func (r *DB) InTransaction(fn func() (interface{}, error)) error {
+func (r *DB) InTransaction(fn func() (any, error)) error {
 	txn, err := r.Sql().Begin()
 	if err != nil {
 		return err
@@ -465,11 +465,11 @@ func (r *DB) InTransaction(fn func() (interface{}, error)) error {
 		if v > 0 {
 			isOk = true
 		}
-	case []map[string]interface{}:
+	case []map[string]any:
 		if len(v) > 0 {
 			isOk = true
 		}
-	case map[string]interface{}:
+	case map[string]any:
 		if len(v) > 0 {
 			isOk = true
 		}

go.mod

@@ -1,6 +1,6 @@
 module github.com/arthurkushman/buildsqlx
 
-go 1.17
+go 1.18
 
 require (
 	github.com/lib/pq v1.2.0