diff --git a/format/format.go b/format/format.go
index 03ad0b3..dc6b149 100644
--- a/format/format.go
+++ b/format/format.go
@@ -50,18 +50,38 @@ func CreateTableMarkdown(tableName string, comment string, columns []ColumnDescr
 	// format the indexes
 	tableMarkdown.WriteString("#### INDEXES\n")
 	indexesTable := tablewriter.NewWriter(tableMarkdown)
-	indexesTable.SetHeader([]string{"KEY NAME", "UNIQUE", "COLUMNS", "COMMENT"})
+
+	// EXPRESSION is a new column type introduced in MySQL 8.0.
+	// Only include this header if one of the indexes has an expression.
+	hasExpression := false
+	for _, idx := range indexes {
+		if idx.Expression != "" {
+			hasExpression = true
+			break
+		}
+	}
+	header := []string{"KEY NAME", "UNIQUE", "COLUMNS", "COMMENT"}
+	if hasExpression {
+		header = []string{"KEY NAME", "UNIQUE", "COLUMNS", "COMMENT", "EXPRESSION"}
+	}
+
+	indexesTable.SetHeader(header)
 	indexesTable.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
 	indexesTable.SetAutoWrapText(false)
 	indexesTable.SetCenterSeparator("|")
 
 	for _, idx := range indexes {
-		indexesTable.Append([]string{
+		indexRow := []string{
 			wrapBackTicks(idx.KeyName),
 			wrapBackTicks(fmt.Sprintf("%t", !idx.NonUnique)),
 			wrapBackTicks(fmt.Sprintf(`(%s)`, strings.Join(idx.IndexedColumnNamesOrdered, ", "))),
 			wrapBackTicks(idx.Comment),
-		})
+		}
+		// Only include this if one of the indexes in the table has an expression.
+		if hasExpression {
+			indexRow = append(indexRow, wrapBackTicks(idx.Expression))
+		}
+		indexesTable.Append(indexRow)
 	}
 
 	// write the indexes table to the buf
diff --git a/format/index_description.go b/format/index_description.go
index ed46abb..ca476cb 100644
--- a/format/index_description.go
+++ b/format/index_description.go
@@ -12,8 +12,9 @@ type IndexDescription struct {
 	NonUnique  bool           `db:"Non_unique"`
 	KeyName    string         `db:"Key_name"`
 	SeqInIndex int            `db:"Seq_in_index"`
-	ColumnName string         `db:"Column_name"`
+	ColumnName sql.NullString `db:"Column_name"`
 	Comment    sql.NullString `db:"Comment"`
+	Expression sql.NullString `db:"Expression"`
 
 	// Not used (yet)
 	Collation    sql.NullString `db:"Collation"`
@@ -24,7 +25,6 @@ type IndexDescription struct {
 	IndexType    sql.NullString `db:"Index_type"`
 	IndexComment sql.NullString `db:"Index_comment"`
 	Visible      sql.NullString `db:"Visible"`
-	Expression   sql.NullString `db:"Expression"`
 }
 
 // IndexDescriptions is a set of index descriptions
@@ -40,14 +40,15 @@ func (descs IndexDescriptions) ConvertToLogicalIndexes() ([]LogicalIndex, error)
 		var ok bool
 		if li, ok = indices[description.KeyName]; !ok {
 			li = LogicalIndex{
-				Table:     description.Table,
-				NonUnique: description.NonUnique,
-				KeyName:   description.KeyName,
-				Comment:   description.Comment.String,
+				Table:      description.Table,
+				NonUnique:  description.NonUnique,
+				KeyName:    description.KeyName,
+				Comment:    description.Comment.String,
+				Expression: description.Expression.String,
 			}
 		}
 
-		li.IndexedColumnNamesOrdered = append(li.IndexedColumnNamesOrdered, description.ColumnName)
+		li.IndexedColumnNamesOrdered = append(li.IndexedColumnNamesOrdered, description.ColumnName.String)
 
 		if len(li.IndexedColumnNamesOrdered) != description.SeqInIndex {
 			return nil, fmt.Errorf("internal logic error: expecting for indexed columns to always be returned in sequence")
@@ -80,4 +81,5 @@ type LogicalIndex struct {
 	KeyName                   string
 	IndexedColumnNamesOrdered []string
 	Comment                   string
+	Expression                string
 }