Clean.

artie-labs · Jan 13, 2025 · f755154 · f755154
1 parent 8638a30
commit f755154
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/mysql/table.go b/lib/mysql/table.go
@@ -43,13 +43,8 @@ func LoadTable(db *sql.DB, name string, sqlMode []string) (*Table, error) {
 	}
 
 	for _, col := range createTableResult.GetColumns() {
-<<<<<<< HEAD
-		// TODO: Pass in sql mode
-		dataType, opts, err := schema.ParseColumnDataType(col.DataType, col.DefaultValue, nil)
-=======
 		dataType, opts, err := schema.ParseColumnDataType(col.DataType, sqlMode)
 
->>>>>>> master
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse column data type: %w", err)
 		}