Skip to content

Commit

Permalink
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
Browse files Browse the repository at this point in the history
…te.sh
  • Loading branch information
zachmu authored and reltuk committed Feb 6, 2025
1 parent 5540495 commit 4424772
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions go/libraries/doltcore/schema/schema_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -497,15 +497,15 @@ func (si *schemaImpl) getKeyColumnsDescriptor(convertAddressColumns bool) val.Tu
queryType := sqlType.Type()
var t val.Type

_, contentHashedField := contentHashedFields[tag];
extendedType, isExtendedType := sqlType.(gmstypes.ExtendedType);
_, contentHashedField := contentHashedFields[tag]
extendedType, isExtendedType := sqlType.(gmstypes.ExtendedType)

if isExtendedType {
t = val.Type{
Enc: val.Encoding(EncodingFromSqlType(sqlType)),
Nullable: columnMissingNotNullConstraint(col),
}
} else {
} else {
if convertAddressColumns && !contentHashedField && queryType == query.Type_BLOB {
t = val.Type{
Enc: val.Encoding(EncodingFromQueryType(query.Type_VARBINARY)),
Expand All @@ -528,7 +528,7 @@ func (si *schemaImpl) getKeyColumnsDescriptor(convertAddressColumns bool) val.Tu
}
}
}

tt = append(tt, t)
stringType, isStringType := sqlType.(sql.StringType)
if isStringType && (queryType == query.Type_CHAR || queryType == query.Type_VARCHAR || queryType == query.Type_TEXT) {
Expand All @@ -539,7 +539,7 @@ func (si *schemaImpl) getKeyColumnsDescriptor(convertAddressColumns bool) val.Tu
}

handlers = append(handlers, extendedType)

return
})

Expand Down

0 comments on commit 4424772

Please sign in to comment.