Updating the enabled linters

.golangci.yaml

@@ -13,6 +13,8 @@ linters:
     - thelper
     - tparallel
     - intrange
+    - testifylint
+    - perfsprint
 issues:
   exclude-rules:
     - path: (.+)_test.go
@@ -142,3 +144,5 @@ linters-settings:
     enable:
       - identical # Identifies interfaces in the same package that have identical method sets.
       - unused # Identifies interfaces that are not used anywhere in the same package where the interface is defined.
+  testifylint:
+    enable-all: true

cmd_create.go

@@ -79,8 +79,8 @@ func (c *createCmd) Execute(_ context.Context, _ *flag.FlagSet, _ ...any) subcom
 	name := fmt.Sprintf("%s_%s", now.Format(migrations.FilePrefix), strings.TrimSpace(c.name))
 	name = strings.ReplaceAll(name, " ", "_")
 
-	upName := fmt.Sprintf("%s.up.sql", name)
-	downName := fmt.Sprintf("%s.down.sql", name)
+	upName := name + ".up.sql"
+	downName := name + "%s.down.sql"
 
 	upPath := fmt.Sprintf("%s/%s", c.outputLocation, upName)
 	downPath := fmt.Sprintf("%s/%s", c.outputLocation, downName)

cmd_status.go

@@ -3,9 +3,9 @@ package main
 import (
 	"context"
 	"flag"
-	"fmt"
 	"log/slog"
 	"os"
+	"strconv"
 
 	"github.com/google/subcommands"
 	"github.com/jacobbrewer1/goschema/pkg/logging"
@@ -55,7 +55,7 @@ func (c *statusCmd) Execute(_ context.Context, _ *flag.FlagSet, _ ...any) subcom
 	tableDataStr := make([][]string, 0)
 	tableDataStr = append(tableDataStr, []string{"Version", "Current", "Created At"})
 	for _, v := range versions {
-		tableDataStr = append(tableDataStr, []string{v.Version, fmt.Sprintf("%t", v.IsCurrent == 1), v.CreatedAt.String()})
+		tableDataStr = append(tableDataStr, []string{v.Version, strconv.FormatBool(v.IsCurrent), v.CreatedAt.String()})
 	}
 
 	var tableData pterm.TableData = tableDataStr

pkg/generation/template_helpers.go

@@ -267,7 +267,7 @@ func getType(col *entities.Column) string {
 }
 
 func getTags(col *entities.Column) string {
-	tags := fmt.Sprintf("`db:\"%s", col.Name)
+	tags := "`db:\"" + col.Name
 	if col.InPrimaryKey {
 		tags += ",pk"
 	}

pkg/migrations/connect.go

@@ -31,5 +31,5 @@ func getConnectionStr() string {
 	if strings.Contains(connStr, "?") {
 		connStr = strings.Split(connStr, "?")[0]
 	}
-	return fmt.Sprintf("%s?timeout=90s&multiStatements=true&parseTime=true", connStr)
+	return connStr + "?timeout=90s&multiStatements=true&parseTime=true"
 }

pkg/migrations/status.go

@@ -8,7 +8,7 @@ import (
 )
 
 func (v *versioning) GetStatus() ([]*models.GoschemaMigrationVersion, error) {
-	versions, err := models.GetAllGoschemaMigrationVersion(v.db)
+	versions, err := models.GetAllGoschemaMigrationVersions(v.db)
 	if err != nil {
 		return nil, fmt.Errorf("error getting goschema migration versions: %w", err)
 	}

pkg/migrations/versioning.go

@@ -193,7 +193,7 @@ func (v *versioning) setCurrentVersion(version string) error {
 
 	newVersion := &models.GoschemaMigrationVersion{
 		Version:   version,
-		IsCurrent: 1,
+		IsCurrent: true,
 		CreatedAt: time.Now().UTC(),
 	}
 

pkg/models/db.xo.go

@@ -23,8 +23,8 @@ type DB interface {
 	Exec(string, ...any) (sql.Result, error)
 	Query(string, ...any) (*sql.Rows, error)
 	QueryRow(string, ...any) *sql.Row
-	Get(dest any, query string, args ...any) error
-	Select(dest any, query string, args ...any) error
+	Get(dest any, query string, args ...interface{}) error
+	Select(dest any, query string, args ...interface{}) error
 }
 
 // Transactioner is the interface that a database connection that can start

pkg/models/goschema_migration_history.xo.go

@@ -6,6 +6,7 @@ package models
 import (
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/jacobbrewer1/goschema/usql"
@@ -199,10 +200,10 @@ func GoschemaMigrationHistoryById(db DB, id int) (*GoschemaMigrationHistory, err
 }
 
 type goschemaMigrationHistoryPKWherer struct {
-	ids []any
+	ids []interface{}
 }
 
-func (m goschemaMigrationHistoryPKWherer) Where() (string, []any) {
+func (m goschemaMigrationHistoryPKWherer) Where() (string, []interface{}) {
 	return "`id` = ?", m.ids
 }
 
@@ -222,8 +223,11 @@ func (m *GoschemaMigrationHistory) Patch(db DB, newT *GoschemaMigrationHistory)
 		newT,
 		patcher.WithTable(GoschemaMigrationHistoryTableName),
 		patcher.WithWhere(&goschemaMigrationHistoryPKWherer{
-			ids: []any{m.Id},
+			ids: []interface{}{m.Id},
 		}),
+		patcher.WithIgnoredFields(
+			"Id",
+		),
 	)
 	if err != nil {
 		switch {
@@ -248,19 +252,53 @@ func (m *GoschemaMigrationHistory) Patch(db DB, newT *GoschemaMigrationHistory)
 	return nil
 }
 
-// GetAllGoschemaMigrationHistory retrieves all rows from 'goschema_migration_history' as a slice of GoschemaMigrationHistory.
+// GetAllGoschemaMigrationHistorys retrieves all rows from 'goschema_migration_history' as a slice of GoschemaMigrationHistory.
 //
 // Generated from table 'goschema_migration_history'.
-func GetAllGoschemaMigrationHistory(db DB) ([]*GoschemaMigrationHistory, error) {
+func GetAllGoschemaMigrationHistorys(db DB, filters ...any) ([]*GoschemaMigrationHistory, error) {
 	t := prometheus.NewTimer(DatabaseLatency.WithLabelValues("get_all_" + GoschemaMigrationHistoryTableName))
 	defer t.ObserveDuration()
 
-	const sqlstr = "SELECT `id`, `version`, `action`, `created_at` " +
-		"FROM goschema_migration_history"
+	args := make([]any, 0)
+	builder := new(strings.Builder)
+	builder.WriteString("SELECT `t.id`, `t.version`, `t.action`, `t.created_at`")
+
+	if len(filters) > 0 {
+		for _, filter := range filters {
+			if joiner := filter.(patcher.Joiner); joiner != nil {
+				joinSql, joinArgs := joiner.Join()
+				builder.WriteString(joinSql)
+				args = append(args, joinArgs...)
+			}
+		}
+	}
+
+	builder.WriteString("\nFROM goschema_migration_history t")
+
+	if len(filters) > 0 {
+		builder.WriteString("\nWHERE\n")
+		for i, filter := range filters {
+			if where := filter.(patcher.Wherer); where != nil {
+				if i > 0 {
+					wtStr := patcher.WhereTypeAnd
+					if wt, ok := filter.(patcher.WhereTyper); ok {
+						wtStr = wt.WhereType()
+					}
+					builder.WriteString(string(" " + wtStr + " "))
+				}
+				whereSql, whereArgs := where.Where()
+				builder.WriteString(whereSql)
+				builder.WriteString("\n")
+				args = append(args, whereArgs...)
+			}
+		}
+	}
+
+	sqlstr := builder.String()
+	DBLog(sqlstr, args...)
 
-	DBLog(sqlstr)
 	m := make([]*GoschemaMigrationHistory, 0)
-	if err := db.Select(&m, sqlstr); err != nil {
+	if err := db.Select(&m, sqlstr, args...); err != nil {
 		return nil, fmt.Errorf("failed to get all GoschemaMigrationHistory: %w", err)
 	}
 

pkg/models/goschema_migration_version.xo.go

@@ -6,6 +6,7 @@ package models
 import (
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/jacobbrewer1/patcher"
@@ -21,7 +22,7 @@ const (
 // GoschemaMigrationVersion represents a row from 'goschema_migration_version'.
 type GoschemaMigrationVersion struct {
 	Version   string    `db:"version,pk"`
-	IsCurrent int       `db:"is_current"`
+	IsCurrent bool      `db:"is_current"`
 	CreatedAt time.Time `db:"created_at"`
 }
 
@@ -168,10 +169,10 @@ func GoschemaMigrationVersionByVersion(db DB, version string) (*GoschemaMigratio
 }
 
 type goschemaMigrationVersionPKWherer struct {
-	ids []any
+	ids []interface{}
 }
 
-func (m goschemaMigrationVersionPKWherer) Where() (string, []any) {
+func (m goschemaMigrationVersionPKWherer) Where() (string, []interface{}) {
 	return "`version` = ?", m.ids
 }
 
@@ -191,8 +192,11 @@ func (m *GoschemaMigrationVersion) Patch(db DB, newT *GoschemaMigrationVersion)
 		newT,
 		patcher.WithTable(GoschemaMigrationVersionTableName),
 		patcher.WithWhere(&goschemaMigrationVersionPKWherer{
-			ids: []any{m.Version},
+			ids: []interface{}{m.Version},
 		}),
+		patcher.WithIgnoredFields(
+			"Version",
+		),
 	)
 	if err != nil {
 		switch {
@@ -217,19 +221,53 @@ func (m *GoschemaMigrationVersion) Patch(db DB, newT *GoschemaMigrationVersion)
 	return nil
 }
 
-// GetAllGoschemaMigrationVersion retrieves all rows from 'goschema_migration_version' as a slice of GoschemaMigrationVersion.
+// GetAllGoschemaMigrationVersions retrieves all rows from 'goschema_migration_version' as a slice of GoschemaMigrationVersion.
 //
 // Generated from table 'goschema_migration_version'.
-func GetAllGoschemaMigrationVersion(db DB) ([]*GoschemaMigrationVersion, error) {
+func GetAllGoschemaMigrationVersions(db DB, filters ...any) ([]*GoschemaMigrationVersion, error) {
 	t := prometheus.NewTimer(DatabaseLatency.WithLabelValues("get_all_" + GoschemaMigrationVersionTableName))
 	defer t.ObserveDuration()
 
-	const sqlstr = "SELECT `version`, `is_current`, `created_at` " +
-		"FROM goschema_migration_version"
+	args := make([]any, 0)
+	builder := new(strings.Builder)
+	builder.WriteString("SELECT `t.version`, `t.is_current`, `t.created_at`")
+
+	if len(filters) > 0 {
+		for _, filter := range filters {
+			if joiner := filter.(patcher.Joiner); joiner != nil {
+				joinSql, joinArgs := joiner.Join()
+				builder.WriteString(joinSql)
+				args = append(args, joinArgs...)
+			}
+		}
+	}
+
+	builder.WriteString("\nFROM goschema_migration_version t")
+
+	if len(filters) > 0 {
+		builder.WriteString("\nWHERE\n")
+		for i, filter := range filters {
+			if where := filter.(patcher.Wherer); where != nil {
+				if i > 0 {
+					wtStr := patcher.WhereTypeAnd
+					if wt, ok := filter.(patcher.WhereTyper); ok {
+						wtStr = wt.WhereType()
+					}
+					builder.WriteString(string(" " + wtStr + " "))
+				}
+				whereSql, whereArgs := where.Where()
+				builder.WriteString(whereSql)
+				builder.WriteString("\n")
+				args = append(args, whereArgs...)
+			}
+		}
+	}
+
+	sqlstr := builder.String()
+	DBLog(sqlstr, args...)
 
-	DBLog(sqlstr)
 	m := make([]*GoschemaMigrationVersion, 0)
-	if err := db.Select(&m, sqlstr); err != nil {
+	if err := db.Select(&m, sqlstr, args...); err != nil {
 		return nil, fmt.Errorf("failed to get all GoschemaMigrationVersion: %w", err)
 	}
 

pkg/models/helpers.xo.go

@@ -97,7 +97,7 @@ func NewLoggableDBTransactionHandler(db Transactioner, l *slog.Logger) *Loggable
 // 1. x is an integer and greater than zero.
 // 2. x not an integer and is not the zero value.
 // Otherwise, returns false
-func IsKeySet(x any) bool {
+func IsKeySet(x interface{}) bool {
 	switch x := x.(type) {
 	case int:
 		return x > 0