Finish MySQL support and fix type bugs

vultr · Aug 15, 2024 · 753eec3 · 753eec3
1 parent dcc3d31
commit 753eec3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/cmd/database/database.go b/cmd/database/database.go
@@ -2207,7 +2207,7 @@ func NewCmdDatabase(base *cli.Base) *cobra.Command { //nolint:funlen,gocyclo
 				o.AdvancedOptionsReq.InnoDBLockWaitTimeout = innoDBLockWaitTimeout
 			}
 
-			iif cmd.Flags().Changed("innodb-log-buffer-size") {
+			if cmd.Flags().Changed("innodb-log-buffer-size") {
 				o.AdvancedOptionsReq.InnoDBLogBufferSize = innoDBLogBufferSize
 			}
 
@@ -2216,15 +2216,15 @@ func NewCmdDatabase(base *cli.Base) *cobra.Command { //nolint:funlen,gocyclo
 			}
 
 			if cmd.Flags().Changed("innodb-print-all-deadlocks") {
-				o.AdvancedOptionsReq.InnoDBPrintAllDeadlocks = innoDBPrintAllDeadlocks
+				o.AdvancedOptionsReq.InnoDBPrintAllDeadlocks = nil
 			}
 
 			if cmd.Flags().Changed("innodb-read-io-threads") {
 				o.AdvancedOptionsReq.InnoDBReadIOThreads = innoDBReadIOThreads
 			}
 
 			if cmd.Flags().Changed("innodb-rollback-on-timeout") {
-				o.AdvancedOptionsReq.InnoDBRollbackOnTimeout = innoDBRollbackOnTimeout
+				o.AdvancedOptionsReq.InnoDBRollbackOnTimeout = nil
 			}
 
 			if cmd.Flags().Changed("innodb-thread-concurrency") {
@@ -2391,6 +2391,14 @@ func NewCmdDatabase(base *cli.Base) *cobra.Command { //nolint:funlen,gocyclo
 				o.AdvancedOptionsReq.Jit = &jit
 			}
 
+			if cmd.Flags().Changed("innodb-print-all-deadlocks") {
+				o.AdvancedOptionsReq.InnoDBPrintAllDeadlocks = &innoDBPrintAllDeadlocks
+			}
+
+			if cmd.Flags().Changed("innodb-rollback-on-timeout") {
+				o.AdvancedOptionsReq.InnoDBRollbackOnTimeout = &innoDBRollbackOnTimeout
+			}
+
 			cur, avail, err := o.updateAdvancedOptions()
 			if err != nil {
 				return fmt.Errorf("error updating database advanced options : %v", err)

diff --git a/cmd/database/printer.go b/cmd/database/printer.go
@@ -1226,9 +1226,19 @@ func (a *AdvancedOptionsPrinter) Data() [][]string {
 		v := reflect.ValueOf(*a.Configured)
 		for i := 0; i < v.NumField(); i++ {
 			if !v.Field(i).IsZero() {
-				if v.Field(i).Kind() == reflect.Pointer {
-					data = append(data, []string{v.Type().Field(i).Name, v.Field(i).Elem().Interface().(string)})
-				} else {
+				switch v.Field(i).Kind() {
+				case reflect.Pointer:
+					data = append(data, []string{v.Type().Field(i).Name, strconv.FormatBool(v.Field(i).Elem().Interface().(bool))})
+				case reflect.Int:
+					data = append(data, []string{v.Type().Field(i).Name, strconv.Itoa(v.Field(i).Interface().(int))})
+				case reflect.Float64:
+					data = append(data,
+						[]string{
+							v.Type().Field(i).Name,
+							strconv.FormatFloat(float64(v.Field(i).Interface().(float64)), 'f', utils.FloatPrecision, 32),
+						},
+					)
+				default:
 					data = append(data, []string{v.Type().Field(i).Name, v.Field(i).Interface().(string)})
 				}
 			}