support changing amount of pk cols

Author: BrianLeishman

columns.go

@@ -3,7 +3,7 @@ package main
 import (
 	"strings"
 
-	cool "github.com/StirlingMarketingGroup/cool-mysql"
+	mysql "github.com/StirlingMarketingGroup/cool-mysql"
 )
 
 // the mysql lib we're using, cool mysql, lets us define a
@@ -18,8 +18,8 @@ type column struct {
 	PrimaryKey           bool
 }
 
-func getTableColumns(db *cool.Database, tableName string) ([]*column, error) {
-	var columns []*column
+func getTableColumns(db *mysql.Database, tableName string) ([]column, error) {
+	var columns []column
 
 	// we need to check to see if the db supports generated columns
 	// if it doesn't, our query to get column info will fail
@@ -47,7 +47,7 @@ func getTableColumns(db *cool.Database, tableName string) ([]*column, error) {
 		return nil, err
 	}
 
-	var primaryKeys []*struct {
+	var primaryKeys []struct {
 		ColumnName string `mysql:"Column_name"`
 	}
 	err = db.Select(&primaryKeys, "show index from`"+tableName+"`where`Key_name`='PRIMARY'", 0)
@@ -60,7 +60,8 @@ func getTableColumns(db *cool.Database, tableName string) ([]*column, error) {
 		primaryKeysSet[pk.ColumnName] = struct{}{}
 	}
 
-	for _, c := range columns {
+	for i := range columns {
+		c := &columns[i]
 		if _, ok := primaryKeysSet[c.ColumnName]; ok {
 			c.PrimaryKey = true
 		}
@@ -69,11 +70,11 @@ func getTableColumns(db *cool.Database, tableName string) ([]*column, error) {
 	return columns, nil
 }
 
-func quoteColumns(columns []*column) string {
+func quoteColumns(columns []column) string {
 	return quoteColumnsPrefix(columns, "")
 }
 
-func quoteColumnsPrefix(columns []*column, prefix string) string {
+func quoteColumnsPrefix(columns []column, prefix string) string {
 	// this is our string builder for quoted column names,
 	// which will be used in our select statement
 	columnsQuotedBld := new(strings.Builder)
@@ -92,10 +93,18 @@ func quoteColumnsPrefix(columns []*column, prefix string) string {
 	return columnsQuotedBld.String()
 }
 
-func columnsSet(columns []*column) map[string]struct{} {
+func columnsSet(columns []column) map[string]struct{} {
 	set := make(map[string]struct{}, len(columns))
 	for _, c := range columns {
 		set[c.ColumnName] = struct{}{}
 	}
 	return set
 }
+
+func columnNames(columns []column) []string {
+	names := make([]string, len(columns))
+	for i, c := range columns {
+		names[i] = c.ColumnName
+	}
+	return names
+}

go.mod

@@ -1,12 +1,13 @@
 module github.com/StirlingMarketingGroup/smg-live-alter/v2
 
-go 1.19
+go 1.21
 
 require (
 	github.com/Ompluscator/dynamic-struct v1.3.0
-	github.com/StirlingMarketingGroup/cool-mysql v0.0.0-20221123151840-d6d3d1f1e306
+	github.com/StirlingMarketingGroup/cool-mysql v0.0.0-20230825201905-be1f02aab9f2
 	github.com/fatih/color v1.13.0
-	github.com/go-sql-driver/mysql v1.6.0
+	github.com/go-sql-driver/mysql v1.7.1
+	github.com/juliangruber/go-intersect/v2 v2.0.1
 	github.com/posener/cmd v1.3.4
 	github.com/vbauerster/mpb/v8 v8.0.2
 	gopkg.in/yaml.v2 v2.4.0
@@ -15,30 +16,25 @@ require (
 require (
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
-	github.com/go-redis/redis/v8 v8.11.5 // indirect
-	github.com/go-redsync/redsync/v4 v4.6.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/go-redsync/redsync/v4 v4.8.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/jinzhu/copier v0.3.5 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/posener/complete/v2 v2.0.1-alpha.13 // indirect
 	github.com/posener/formatter v1.0.0 // indirect
 	github.com/posener/script v1.1.5 // indirect
+	github.com/redis/go-redis/v9 v9.1.0 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect
 )