diff --git a/pkg/sql/logictest/testdata/logic_test/table b/pkg/sql/logictest/testdata/logic_test/table
index 05d3e448c5b6..8075d883e504 100644
--- a/pkg/sql/logictest/testdata/logic_test/table
+++ b/pkg/sql/logictest/testdata/logic_test/table
@@ -352,8 +352,8 @@ SHOW COLUMNS FROM test.alltypes
 Field  Type                      Null   Default         Indices
 a      BOOL                      true   NULL            {}
 b      INT                       true   NULL			{}
-c      INT                       true   NULL			{}
-d      INT                       true   NULL			{}
+c      INT8                      true   NULL			{}
+d      INT64                     true   NULL			{}
 e      INT                       true   NULL			{}
 f      INT                       true   NULL			{}
 g      INT                       true   NULL			{}
diff --git a/pkg/sql/sqlbase/structured.go b/pkg/sql/sqlbase/structured.go
index f89501577a69..1b2ea49d8c79 100644
--- a/pkg/sql/sqlbase/structured.go
+++ b/pkg/sql/sqlbase/structured.go
@@ -1742,6 +1742,9 @@ func (c *ColumnType) SQLString() string {
 	case ColumnType_INT_ARRAY:
 		return "INT[]"
 	}
+	if c.Alias != ColumnType_NONE {
+		return c.Alias.String()
+	}
 	return c.Kind.String()
 }
 
diff --git a/pkg/sql/sqlbase/structured.pb.go b/pkg/sql/sqlbase/structured.pb.go
index c258bde68998..96a4d9cb7407 100644
--- a/pkg/sql/sqlbase/structured.pb.go
+++ b/pkg/sql/sqlbase/structured.pb.go
@@ -143,6 +143,45 @@ func (x *ColumnType_Kind) UnmarshalJSON(data []byte) error {
 }
 func (ColumnType_Kind) EnumDescriptor() ([]byte, []int) { return fileDescriptorStructured, []int{0, 0} }
 
+type ColumnType_SubKind int32
+
+const (
+	ColumnType_NONE  ColumnType_SubKind = 0
+	ColumnType_INT8  ColumnType_SubKind = 1
+	ColumnType_INT64 ColumnType_SubKind = 2
+)
+
+var ColumnType_SubKind_name = map[int32]string{
+	0: "NONE",
+	1: "INT8",
+	2: "INT64",
+}
+var ColumnType_SubKind_value = map[string]int32{
+	"NONE":  0,
+	"INT8":  1,
+	"INT64": 2,
+}
+
+func (x ColumnType_SubKind) Enum() *ColumnType_SubKind {
+	p := new(ColumnType_SubKind)
+	*p = x
+	return p
+}
+func (x ColumnType_SubKind) String() string {
+	return proto.EnumName(ColumnType_SubKind_name, int32(x))
+}
+func (x *ColumnType_SubKind) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(ColumnType_SubKind_value, data, "ColumnType_SubKind")
+	if err != nil {
+		return err
+	}
+	*x = ColumnType_SubKind(value)
+	return nil
+}
+func (ColumnType_SubKind) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptorStructured, []int{0, 1}
+}
+
 // The direction of a column in the index.
 type IndexDescriptor_Direction int32
 
@@ -346,6 +385,10 @@ type ColumnType struct {
 	ArrayDimensions []int32 `protobuf:"varint,4,rep,name=array_dimensions,json=arrayDimensions" json:"array_dimensions,omitempty"`
 	// Collated STRING, CHAR, and VARCHAR
 	Locale *string `protobuf:"bytes,5,opt,name=locale" json:"locale,omitempty"`
+	// Alias for any types where our internal representation is different than
+	// the user specification. Examples are INT4, FLOAT4, etc. Mostly for Postgres
+	// compatibility.
+	Alias ColumnType_SubKind `protobuf:"varint,6,opt,name=alias,enum=cockroach.sql.sqlbase.ColumnType_SubKind" json:"alias"`
 }
 
 func (m *ColumnType) Reset()                    { *m = ColumnType{} }
@@ -1242,6 +1285,7 @@ func init() {
 	proto.RegisterType((*Descriptor)(nil), "cockroach.sql.sqlbase.Descriptor")
 	proto.RegisterEnum("cockroach.sql.sqlbase.ConstraintValidity", ConstraintValidity_name, ConstraintValidity_value)
 	proto.RegisterEnum("cockroach.sql.sqlbase.ColumnType_Kind", ColumnType_Kind_name, ColumnType_Kind_value)
+	proto.RegisterEnum("cockroach.sql.sqlbase.ColumnType_SubKind", ColumnType_SubKind_name, ColumnType_SubKind_value)
 	proto.RegisterEnum("cockroach.sql.sqlbase.IndexDescriptor_Direction", IndexDescriptor_Direction_name, IndexDescriptor_Direction_value)
 	proto.RegisterEnum("cockroach.sql.sqlbase.DescriptorMutation_State", DescriptorMutation_State_name, DescriptorMutation_State_value)
 	proto.RegisterEnum("cockroach.sql.sqlbase.DescriptorMutation_Direction", DescriptorMutation_Direction_name, DescriptorMutation_Direction_value)
@@ -1284,6 +1328,9 @@ func (m *ColumnType) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintStructured(dAtA, i, uint64(len(*m.Locale)))
 		i += copy(dAtA[i:], *m.Locale)
 	}
+	dAtA[i] = 0x30
+	i++
+	i = encodeVarintStructured(dAtA, i, uint64(m.Alias))
 	return i, nil
 }
 
@@ -2180,6 +2227,7 @@ func (m *ColumnType) Size() (n int) {
 		l = len(*m.Locale)
 		n += 1 + l + sovStructured(uint64(l))
 	}
+	n += 1 + sovStructured(uint64(m.Alias))
 	return n
 }
 
@@ -2719,6 +2767,25 @@ func (m *ColumnType) Unmarshal(dAtA []byte) error {
 			s := string(dAtA[iNdEx:postIndex])
 			m.Locale = &s
 			iNdEx = postIndex
+		case 6:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Alias", wireType)
+			}
+			m.Alias = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowStructured
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Alias |= (ColumnType_SubKind(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipStructured(dAtA[iNdEx:])
@@ -5940,148 +6007,151 @@ func init() {
 }
 
 var fileDescriptorStructured = []byte{
-	// 2282 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4b, 0x6f, 0xdb, 0xd8,
-	0x15, 0x36, 0xf5, 0xd6, 0xd1, 0x8b, 0xbe, 0x79, 0x31, 0xee, 0xd4, 0x56, 0x34, 0x33, 0xa9, 0x93,
-	0xce, 0xc8, 0x19, 0x67, 0x5a, 0x0c, 0xfa, 0x18, 0x44, 0x2f, 0x27, 0x74, 0x64, 0xc9, 0xa1, 0xe5,
-	0xa4, 0x19, 0xb4, 0x15, 0x68, 0xdd, 0x6b, 0x9b, 0x09, 0x45, 0x2a, 0x24, 0xe5, 0xb1, 0xfe, 0x40,
-	0x31, 0xcb, 0xa2, 0x3f, 0x60, 0x50, 0xcc, 0xb6, 0x8b, 0x6e, 0xba, 0x28, 0x8a, 0xfe, 0x80, 0x2c,
-	0xbb, 0x2c, 0x50, 0xc0, 0x68, 0xdd, 0x1f, 0x51, 0x20, 0xab, 0xe2, 0x5e, 0xde, 0x4b, 0x52, 0x96,
-	0x95, 0xb1, 0x93, 0x85, 0x00, 0xf1, 0x3c, 0x3e, 0x9e, 0x7b, 0xee, 0x79, 0x12, 0xee, 0x0e, 0xec,
-	0xc1, 0x4b, 0xc7, 0xd6, 0x07, 0x87, 0x6b, 0xa3, 0x97, 0x07, 0x6b, 0xee, 0x2b, 0x93, 0xfe, 0xf6,
-	0x74, 0x97, 0xac, 0xb9, 0x9e, 0x33, 0x1e, 0x78, 0x63, 0x87, 0xe0, 0xea, 0xc8, 0xb1, 0x3d, 0x1b,
-	0x5d, 0x0b, 0x64, 0xab, 0xee, 0x2b, 0xb3, 0xca, 0xe5, 0x96, 0xca, 0xd3, 0x10, 0xec, 0xdf, 0x68,
-	0x6f, 0x0d, 0xeb, 0x9e, 0xee, 0x2b, 0x2e, 0xdd, 0x9e, 0x96, 0x18, 0x7b, 0x86, 0xb9, 0x76, 0x68,
-	0x0e, 0xd6, 0x3c, 0x63, 0x48, 0x5c, 0x4f, 0x1f, 0x8e, 0xb8, 0xdc, 0x9d, 0xf9, 0xc6, 0x8c, 0x1c,
-	0xe3, 0xc8, 0x30, 0xc9, 0x01, 0xe1, 0xa2, 0x57, 0x0f, 0xec, 0x03, 0x9b, 0xfd, 0x5d, 0xa3, 0xff,
-	0x7c, 0x6a, 0xe5, 0xcf, 0x71, 0x80, 0x86, 0x6d, 0x8e, 0x87, 0x56, 0x6f, 0x32, 0x22, 0xe8, 0x01,
-	0x24, 0x5e, 0x1a, 0x16, 0x56, 0xa4, 0xb2, 0xb4, 0x5a, 0x5c, 0xbf, 0x5d, 0x3d, 0xd7, 0xfe, 0x6a,
-	0xa8, 0x50, 0x7d, 0x6c, 0x58, 0xb8, 0x9e, 0x78, 0x7d, 0xb2, 0xb2, 0xa0, 0x31, 0x4d, 0xb4, 0x04,
-	0xc9, 0xaf, 0x0d, 0xec, 0x1d, 0x2a, 0xb1, 0xb2, 0xb4, 0x9a, 0xe4, 0x2c, 0x9f, 0x84, 0x2a, 0x90,
-	0x1d, 0x39, 0x64, 0x60, 0xb8, 0x86, 0x6d, 0x29, 0xf1, 0x08, 0x3f, 0x24, 0xa3, 0x3b, 0x20, 0xeb,
-	0x8e, 0xa3, 0x4f, 0xfa, 0xd8, 0x18, 0x12, 0x8b, 0x92, 0x5c, 0x25, 0x51, 0x8e, 0xaf, 0x26, 0xb5,
-	0x12, 0xa3, 0x37, 0x03, 0x32, 0xba, 0x0e, 0x29, 0xd3, 0x1e, 0xe8, 0x26, 0x51, 0x92, 0x65, 0x69,
-	0x35, 0xab, 0xf1, 0xa7, 0xca, 0xbf, 0x24, 0x48, 0x50, 0xbb, 0x50, 0x06, 0x12, 0xf5, 0x6e, 0xb7,
-	0x2d, 0x2f, 0xa0, 0x34, 0xc4, 0xd5, 0x4e, 0x4f, 0x96, 0x50, 0x16, 0x92, 0x1b, 0xed, 0x6e, 0xad,
-	0x27, 0xc7, 0x50, 0x0e, 0xd2, 0xcd, 0x56, 0x43, 0xdd, 0xaa, 0xb5, 0xe5, 0x38, 0x15, 0x6d, 0xd6,
-	0x7a, 0x2d, 0x39, 0x81, 0x0a, 0x90, 0xed, 0xa9, 0x5b, 0xad, 0x9d, 0x5e, 0x6d, 0x6b, 0x5b, 0x4e,
-	0xa2, 0x3c, 0x64, 0xd4, 0x4e, 0xaf, 0xa5, 0x3d, 0xad, 0xb5, 0xe5, 0x14, 0x02, 0x48, 0xed, 0xf4,
-	0x34, 0xb5, 0xf3, 0x50, 0x4e, 0x53, 0xa8, 0xfa, 0xf3, 0x5e, 0x6b, 0x47, 0xce, 0xa0, 0x12, 0xe4,
-	0x02, 0x9d, 0xde, 0x57, 0x72, 0x16, 0x21, 0x28, 0x36, 0xba, 0xed, 0x76, 0xad, 0xd7, 0x6a, 0x72,
-	0x79, 0xa0, 0xaf, 0xe8, 0xd4, 0xb6, 0x5a, 0x72, 0x8e, 0x5a, 0xd3, 0x55, 0x9b, 0x72, 0x9e, 0x91,
-	0x76, 0xdb, 0x6d, 0xb9, 0x40, 0xff, 0xed, 0xee, 0xaa, 0x4d, 0xb9, 0x48, 0xdf, 0xaf, 0x76, 0x7a,
-	0xfd, 0x9a, 0xa6, 0xd5, 0x9e, 0xcb, 0x18, 0x95, 0x00, 0xd4, 0x4e, 0x6f, 0xfd, 0x69, 0xab, 0xd1,
-	0xeb, 0x6a, 0xf2, 0x6b, 0xa9, 0xf2, 0x3f, 0x09, 0xae, 0x6c, 0xd8, 0x0e, 0x31, 0x0e, 0xac, 0xc7,
-	0x64, 0xa2, 0x91, 0x7d, 0xe2, 0x10, 0x6b, 0x40, 0x50, 0x19, 0x92, 0x9e, 0xbe, 0x67, 0x12, 0x76,
-	0x77, 0x85, 0x3a, 0x50, 0xc7, 0xbe, 0x39, 0x59, 0x89, 0xa9, 0x4d, 0xcd, 0x67, 0xa0, 0x8f, 0x21,
-	0x69, 0x58, 0x98, 0x1c, 0xb3, 0xab, 0x29, 0xd4, 0x4b, 0x5c, 0x22, 0xad, 0x52, 0x22, 0x15, 0x63,
-	0x5c, 0xa4, 0x40, 0xc2, 0xd2, 0x87, 0x84, 0x5d, 0x50, 0x56, 0xdc, 0x2d, 0xa5, 0xa0, 0xc7, 0x90,
-	0x39, 0xd2, 0x4d, 0x03, 0x1b, 0xde, 0x44, 0x49, 0xb0, 0x08, 0xb9, 0x33, 0x37, 0x42, 0x2c, 0xd7,
-	0x73, 0x74, 0xc3, 0xf2, 0x9e, 0x72, 0x05, 0x0e, 0x14, 0x00, 0xa0, 0x7b, 0xb0, 0xe8, 0x1e, 0xea,
-	0x0e, 0xc1, 0xfd, 0x91, 0x43, 0xf6, 0x8d, 0xe3, 0xbe, 0x49, 0x2c, 0x76, 0x91, 0x22, 0x28, 0x4a,
-	0x3e, 0x7b, 0x9b, 0x71, 0xdb, 0xc4, 0xaa, 0xfc, 0x2e, 0x06, 0xb2, 0x1f, 0x7a, 0x4d, 0xe2, 0x0e,
-	0x1c, 0x63, 0xe4, 0xd9, 0x4e, 0x60, 0xad, 0x34, 0x63, 0xed, 0x6d, 0x88, 0x19, 0x98, 0x9f, 0xf5,
-	0x3a, 0xa5, 0x9f, 0x32, 0x6f, 0xbc, 0x39, 0x59, 0xc9, 0xf8, 0x28, 0x6a, 0x53, 0x8b, 0x19, 0x18,
-	0xfd, 0x1c, 0x12, 0xde, 0x64, 0xe4, 0x9f, 0x37, 0xb7, 0x7e, 0xeb, 0x7b, 0x63, 0x5e, 0xbc, 0x84,
-	0x2a, 0xa1, 0x32, 0x64, 0xac, 0xb1, 0x69, 0x32, 0xc7, 0x53, 0x97, 0x64, 0xc4, 0x39, 0x05, 0x15,
-	0xdd, 0x82, 0x3c, 0x26, 0xfb, 0xfa, 0xd8, 0xf4, 0xfa, 0xe4, 0x78, 0xe4, 0xf0, 0x58, 0xcd, 0x71,
-	0x5a, 0xeb, 0x78, 0xe4, 0xa0, 0x0f, 0x20, 0x75, 0x68, 0x60, 0x4c, 0x2c, 0x25, 0x15, 0x81, 0xe0,
-	0xb4, 0xcd, 0x44, 0x26, 0x23, 0x67, 0x37, 0x13, 0x99, 0xac, 0x0c, 0x9b, 0x89, 0x4c, 0x5a, 0xce,
-	0x54, 0xbe, 0x89, 0xc1, 0x75, 0xdf, 0x9e, 0x0d, 0x7d, 0x68, 0x98, 0x93, 0xf7, 0x75, 0x87, 0x8f,
-	0xc2, 0xdd, 0x71, 0x0b, 0xf2, 0x03, 0x86, 0xdd, 0xa7, 0x6a, 0xae, 0x12, 0x2f, 0xc7, 0xa9, 0xbd,
-	0x3e, 0xad, 0x43, 0x49, 0xe8, 0x0b, 0x00, 0x2e, 0x62, 0x60, 0x3f, 0x3b, 0x0b, 0xf5, 0x9b, 0xa7,
-	0x27, 0x2b, 0x59, 0xe1, 0x57, 0x77, 0xca, 0xc9, 0x59, 0x5f, 0x58, 0xc5, 0x2e, 0xea, 0xc2, 0xa2,
-	0x70, 0x46, 0x80, 0xc0, 0x3c, 0x52, 0xa8, 0x7f, 0xc8, 0x6d, 0x2a, 0x35, 0x7d, 0x01, 0xa1, 0x3e,
-	0x05, 0x55, 0xc2, 0x53, 0x4c, 0x5c, 0xf9, 0x53, 0x0c, 0xae, 0xaa, 0x96, 0x47, 0x1c, 0x93, 0xe8,
-	0x47, 0x24, 0xe2, 0x88, 0x5f, 0x41, 0x56, 0xb7, 0x06, 0xc4, 0xf5, 0x6c, 0xc7, 0x55, 0xa4, 0x72,
-	0x7c, 0x35, 0xb7, 0xfe, 0xf9, 0x9c, 0xab, 0x3d, 0x4f, 0xbf, 0x5a, 0xe3, 0xca, 0xa2, 0x42, 0x05,
-	0x60, 0x4b, 0x7f, 0x95, 0x20, 0x23, 0xb8, 0xe8, 0x1e, 0x64, 0x58, 0x72, 0xd1, 0x73, 0xf8, 0x89,
-	0x77, 0x8d, 0x9f, 0x23, 0xdd, 0xa3, 0x74, 0x66, 0x3f, 0xcd, 0xc1, 0x34, 0x13, 0x53, 0x31, 0xfa,
-	0x09, 0x64, 0x58, 0x9e, 0xf5, 0x83, 0xdb, 0x58, 0x12, 0x1a, 0x3c, 0x11, 0xa3, 0x39, 0x99, 0x66,
-	0xb2, 0x2a, 0x46, 0x8d, 0xf3, 0xd2, 0x25, 0xce, 0xf4, 0x6f, 0x08, 0xcf, 0xed, 0x4c, 0x27, 0xcc,
-	0x6c, 0x06, 0xfd, 0x2d, 0x0d, 0x25, 0x86, 0x7c, 0xa1, 0x88, 0xf9, 0x38, 0x12, 0x31, 0xd7, 0xa6,
-	0x22, 0x26, 0x30, 0x8f, 0x06, 0xcc, 0x07, 0x90, 0x1a, 0x5b, 0xc6, 0xab, 0xb1, 0x9f, 0x41, 0x41,
-	0xf4, 0xfa, 0xb4, 0x99, 0x70, 0x4a, 0xcc, 0x86, 0xd3, 0x27, 0x80, 0xa8, 0x2f, 0x49, 0x7f, 0x4a,
-	0x30, 0xc9, 0x04, 0x65, 0xc6, 0x69, 0xcc, 0x0d, 0xbe, 0xd4, 0x25, 0x82, 0xef, 0x11, 0xc8, 0xe4,
-	0xd8, 0x73, 0xf4, 0x7e, 0x44, 0x3f, 0xcd, 0xf4, 0x97, 0x4f, 0x4f, 0x56, 0x8a, 0x2d, 0xca, 0x3b,
-	0x1f, 0xa4, 0x48, 0x22, 0x3c, 0xec, 0xa2, 0xdf, 0xc0, 0x22, 0xc7, 0xc0, 0x86, 0x43, 0x06, 0x1e,
-	0xeb, 0x52, 0x99, 0x72, 0x7c, 0xb5, 0xb8, 0x7e, 0x6f, 0x6e, 0x90, 0x4d, 0xb9, 0xbd, 0xda, 0x14,
-	0x8a, 0x9a, 0xec, 0x43, 0x05, 0x04, 0x17, 0x3d, 0x81, 0xdc, 0xbe, 0x5f, 0xe1, 0xfb, 0x2f, 0xc9,
-	0x44, 0xc9, 0xb2, 0xc2, 0x74, 0x77, 0x0e, 0xf0, 0x39, 0xbd, 0x80, 0x5f, 0x01, 0xec, 0x07, 0x2c,
-	0xb4, 0x0b, 0x05, 0x47, 0xb0, 0x71, 0x7f, 0x6f, 0xa2, 0x00, 0x4b, 0x89, 0xcb, 0x83, 0xe6, 0x43,
-	0x98, 0xfa, 0x04, 0x3d, 0x01, 0x30, 0x82, 0xec, 0x51, 0x72, 0xcc, 0xd0, 0x1f, 0x5f, 0x22, 0xcd,
-	0x84, 0xa5, 0x21, 0x08, 0x7a, 0x06, 0xc5, 0xf0, 0x89, 0x99, 0x9a, 0x7f, 0x47, 0x53, 0x0b, 0x11,
-	0x9c, 0xfa, 0x04, 0xf5, 0xe0, 0xea, 0xc0, 0x1e, 0x8e, 0x6c, 0xd7, 0xf0, 0x48, 0x34, 0x04, 0x0a,
-	0x2c, 0x04, 0x2a, 0xa7, 0x27, 0x2b, 0xa8, 0x21, 0xf8, 0xe7, 0x87, 0x01, 0x1a, 0x9c, 0xe1, 0xfb,
-	0x41, 0x35, 0x15, 0xbc, 0x14, 0xb1, 0x18, 0x06, 0xd5, 0x4e, 0x18, 0xbe, 0x33, 0x41, 0x15, 0x09,
-	0x6d, 0x15, 0xbb, 0x95, 0x65, 0xc8, 0x06, 0x31, 0x40, 0x47, 0x84, 0xda, 0x4e, 0x43, 0x5e, 0x60,
-	0x83, 0x49, 0x6b, 0xa7, 0x21, 0x4b, 0x95, 0xbf, 0x27, 0x00, 0x85, 0x9e, 0xdb, 0x1a, 0x7b, 0x3a,
-	0x93, 0xac, 0x41, 0xca, 0x7f, 0x35, 0xcb, 0xe0, 0xdc, 0xfa, 0x8f, 0xde, 0xda, 0xc0, 0x42, 0x80,
-	0x47, 0x0b, 0x1a, 0x57, 0x44, 0x5f, 0x46, 0x07, 0x83, 0xdc, 0xdc, 0xb1, 0xef, 0x4c, 0x08, 0x3f,
-	0x5a, 0x10, 0x13, 0xc3, 0x63, 0x48, 0xba, 0x9e, 0xee, 0xf9, 0x05, 0xa0, 0xb8, 0xbe, 0x36, 0x47,
-	0x7f, 0xd6, 0xf8, 0xea, 0x0e, 0x55, 0x13, 0x43, 0x22, 0xc3, 0x40, 0xcf, 0x20, 0x1b, 0x24, 0x15,
-	0x9f, 0x32, 0xee, 0x5f, 0x1c, 0x30, 0xf0, 0xa0, 0xa8, 0xdb, 0x01, 0x16, 0xaa, 0x41, 0x6e, 0xc8,
-	0xc5, 0xc2, 0xae, 0x53, 0xe6, 0x75, 0x0d, 0x04, 0x02, 0xab, 0x6f, 0x91, 0x27, 0x0d, 0x84, 0x92,
-	0x8a, 0xd1, 0x03, 0xc8, 0x3b, 0xc4, 0x1d, 0x0f, 0x49, 0xdf, 0x1d, 0xe9, 0x96, 0x5f, 0x7d, 0x72,
-	0xeb, 0x37, 0x22, 0xe6, 0xf1, 0x59, 0xbe, 0xba, 0x33, 0xd2, 0x85, 0x09, 0x39, 0x5f, 0x85, 0x52,
-	0xdc, 0xca, 0x03, 0x48, 0xb2, 0x33, 0xd3, 0xe9, 0x73, 0xb7, 0xf3, 0xb8, 0xd3, 0x7d, 0xd6, 0x91,
-	0x17, 0xe8, 0xfc, 0xd8, 0x6c, 0xb5, 0x5b, 0xbd, 0x56, 0xbf, 0xdb, 0x69, 0x3f, 0x97, 0x25, 0x74,
-	0x13, 0xae, 0x71, 0x42, 0xad, 0xd3, 0xec, 0x3f, 0xd3, 0x54, 0xc1, 0x8a, 0x55, 0x56, 0xa3, 0x61,
-	0x42, 0x07, 0xc8, 0x6e, 0xa7, 0xe5, 0x4f, 0xb8, 0xb5, 0x66, 0x53, 0x96, 0x58, 0xc0, 0x68, 0xdd,
-	0x6d, 0x39, 0x56, 0xcf, 0x03, 0xe0, 0xc0, 0x43, 0x95, 0xbf, 0x5c, 0x81, 0x12, 0x6b, 0x49, 0x17,
-	0xaa, 0xfd, 0x65, 0x56, 0xfb, 0xfd, 0xfe, 0x22, 0x4f, 0xd5, 0xfe, 0x18, 0x2f, 0xfb, 0xf7, 0x21,
-	0x3b, 0xd2, 0x1d, 0x62, 0x79, 0xd4, 0x99, 0x89, 0xa9, 0xb1, 0x22, 0xb3, 0xcd, 0x18, 0x81, 0x78,
-	0xc6, 0x17, 0x54, 0xa9, 0x52, 0xfa, 0x88, 0x38, 0x6c, 0xfe, 0xf7, 0xfd, 0x7f, 0x93, 0x0f, 0xa1,
-	0x8b, 0xa1, 0x55, 0x4f, 0x7d, 0x01, 0x4d, 0x48, 0xa2, 0x0f, 0x01, 0xc6, 0xa3, 0xbe, 0xd0, 0x8b,
-	0x8e, 0x48, 0xd9, 0xf1, 0x88, 0x4b, 0xa3, 0x6d, 0x58, 0x1c, 0xda, 0xd8, 0xd8, 0x37, 0x06, 0xfe,
-	0x0d, 0xd3, 0x4d, 0x49, 0x49, 0xb3, 0x78, 0xfe, 0x61, 0xe4, 0x7e, 0xe8, 0x26, 0x55, 0x3d, 0x34,
-	0x07, 0xd5, 0x9e, 0xd8, 0xa4, 0x38, 0x94, 0x1c, 0xd5, 0xa6, 0x4c, 0xf4, 0x10, 0xd2, 0x7e, 0x7e,
-	0xf8, 0xa5, 0xfd, 0xe2, 0x99, 0xc5, 0x11, 0x85, 0x36, 0xda, 0x80, 0xa2, 0x45, 0x8e, 0xa3, 0x13,
-	0x4f, 0x76, 0x2a, 0xf6, 0xf2, 0x1d, 0x72, 0x7c, 0xfe, 0xb8, 0x93, 0xb7, 0x42, 0x0e, 0x46, 0x4f,
-	0xa0, 0x30, 0x72, 0x8c, 0xa1, 0xee, 0x4c, 0xfa, 0x7e, 0xba, 0xc2, 0x65, 0xd2, 0x55, 0xd4, 0x6f,
-	0x0e, 0xc1, 0xb8, 0x68, 0x03, 0xfc, 0x01, 0x83, 0xb8, 0x4a, 0x8e, 0x9d, 0xf1, 0x72, 0x60, 0x42,
-	0x19, 0xd5, 0xa1, 0xc0, 0x8e, 0x18, 0x4c, 0x36, 0x79, 0x76, 0xc2, 0x65, 0x7e, 0xc2, 0x1c, 0x3d,
-	0xe1, 0x39, 0xd3, 0x4d, 0xce, 0x0a, 0xe8, 0x18, 0x6d, 0x02, 0x04, 0x3b, 0x2b, 0xad, 0xca, 0x6f,
-	0x6b, 0x7a, 0xdb, 0x42, 0x30, 0x34, 0x49, 0x8b, 0x68, 0xa3, 0x2d, 0xc8, 0x8a, 0xb4, 0xf5, 0xcb,
-	0x71, 0x6e, 0xee, 0xaa, 0x32, 0x5b, 0x44, 0x44, 0x70, 0x05, 0x08, 0xa8, 0x03, 0x49, 0x93, 0xe8,
-	0x2e, 0x51, 0x4a, 0xcc, 0xaa, 0x2f, 0xe6, 0x40, 0x9d, 0x49, 0xaf, 0xea, 0xce, 0xe0, 0x90, 0x0c,
-	0xf5, 0xc6, 0xa1, 0x6e, 0x1d, 0x90, 0x36, 0xd5, 0xd7, 0x7c, 0x18, 0xd4, 0x01, 0x99, 0xb9, 0x2b,
-	0x5a, 0x8f, 0x64, 0xe6, 0xb1, 0x8f, 0xb8, 0xc7, 0x8a, 0xd4, 0x63, 0x73, 0x6b, 0x12, 0x8b, 0xa7,
-	0xad, 0xb0, 0x2e, 0xfd, 0x02, 0x8a, 0xfb, 0xb6, 0x33, 0xd4, 0xbd, 0x20, 0x4b, 0x16, 0xc3, 0xa9,
-	0xed, 0xcd, 0xc9, 0x4a, 0x61, 0x83, 0x71, 0x45, 0x66, 0x15, 0xf6, 0xa3, 0x8f, 0xe8, 0x91, 0x28,
-	0xdf, 0x57, 0x58, 0xb5, 0xfd, 0xe4, 0xa2, 0xa7, 0x9b, 0xad, 0xdd, 0x1d, 0x48, 0x0d, 0x0e, 0xc9,
-	0xe0, 0xa5, 0xab, 0x5c, 0x65, 0x3e, 0xff, 0xe9, 0x05, 0xa1, 0x1a, 0x54, 0x29, 0xdc, 0x19, 0x35,
-	0x8e, 0x82, 0x9e, 0x40, 0xda, 0x21, 0xfe, 0x38, 0x78, 0x8d, 0x01, 0x7e, 0x76, 0x41, 0x40, 0x8d,
-	0x69, 0xa9, 0xd6, 0xbe, 0x2d, 0x22, 0x95, 0xe3, 0xa0, 0x2e, 0x64, 0xf6, 0xe9, 0xba, 0x63, 0x10,
-	0x57, 0xb9, 0xce, 0x30, 0x3f, 0x7d, 0x6b, 0x5a, 0x9f, 0xdd, 0xb0, 0xc4, 0x7e, 0x27, 0x40, 0x82,
-	0xec, 0x66, 0x84, 0x09, 0xbd, 0xc9, 0x1b, 0xb3, 0xd9, 0x2d, 0x36, 0xac, 0xa9, 0x6d, 0x8b, 0x65,
-	0x37, 0x7f, 0xc2, 0xb4, 0xca, 0x1d, 0x19, 0xe4, 0xeb, 0xfe, 0xab, 0x31, 0x71, 0x26, 0x8a, 0x12,
-	0xa9, 0xc8, 0x59, 0x4a, 0x7f, 0x42, 0xc9, 0xe8, 0x33, 0xc8, 0x62, 0x32, 0x22, 0x16, 0x76, 0xbb,
-	0x96, 0x72, 0x93, 0x8d, 0x19, 0x57, 0xe8, 0xec, 0xdb, 0x14, 0x44, 0x5e, 0x71, 0x43, 0x29, 0xf4,
-	0x82, 0xee, 0x9f, 0xf4, 0x81, 0xe0, 0xae, 0x55, 0x9f, 0x28, 0x4b, 0xec, 0xd0, 0xf7, 0x2e, 0xec,
-	0x48, 0x31, 0x53, 0x5d, 0x15, 0xe7, 0x69, 0x46, 0xd0, 0xb4, 0x29, 0x6c, 0xf4, 0x6b, 0xc8, 0x8b,
-	0x90, 0xde, 0xb4, 0xf7, 0x5c, 0xe5, 0x07, 0xec, 0x5d, 0xeb, 0x17, 0x7c, 0xd7, 0x56, 0xa8, 0x2a,
-	0x8a, 0x55, 0x14, 0x6d, 0xe9, 0x3b, 0x09, 0x16, 0x67, 0x52, 0x0a, 0xfd, 0x16, 0xd2, 0x96, 0x8d,
-	0x23, 0x0b, 0x58, 0x8b, 0x1b, 0x9a, 0xea, 0xd8, 0xd8, 0xdf, 0xbf, 0xee, 0x1f, 0x18, 0xde, 0xe1,
-	0x78, 0xaf, 0x3a, 0xb0, 0x87, 0x6b, 0x81, 0x29, 0x78, 0x6f, 0xed, 0xdc, 0xcf, 0x70, 0x55, 0x5f,
-	0x4d, 0x4b, 0x51, 0x54, 0x15, 0xa3, 0x4f, 0xa1, 0x44, 0x8e, 0x47, 0x86, 0x13, 0x69, 0x2b, 0x74,
-	0x4c, 0x8a, 0x73, 0x13, 0x8b, 0x21, 0x93, 0x76, 0x8d, 0xa5, 0x3f, 0x48, 0x50, 0x3a, 0x13, 0xce,
-	0xb4, 0xcd, 0xb2, 0xd5, 0x7f, 0xaa, 0xcd, 0x52, 0x4a, 0xd0, 0x80, 0x63, 0x6f, 0xfd, 0xd6, 0x12,
-	0x7f, 0xcf, 0x6f, 0x2d, 0x4b, 0x26, 0x40, 0x98, 0x11, 0xe8, 0x97, 0x50, 0xb0, 0x4d, 0xdc, 0x0f,
-	0xbb, 0xb7, 0x14, 0xb6, 0x62, 0x5a, 0xac, 0xbb, 0x26, 0x3e, 0xd3, 0xc0, 0x73, 0x76, 0x40, 0xc2,
-	0x68, 0x05, 0x32, 0x54, 0x7d, 0xc6, 0xee, 0xb4, 0x6d, 0x62, 0xba, 0xa2, 0x2d, 0x7d, 0x2b, 0x41,
-	0x36, 0xfa, 0x5d, 0x2a, 0x16, 0xbc, 0xe2, 0xfc, 0x49, 0xe2, 0x1d, 0x37, 0xe2, 0xe9, 0x45, 0x30,
-	0x7e, 0xf1, 0x45, 0x70, 0xe9, 0x08, 0x72, 0x91, 0x58, 0x3b, 0x3b, 0x18, 0x4a, 0xef, 0x30, 0x18,
-	0x7e, 0x04, 0xa9, 0x17, 0xf6, 0x9e, 0x38, 0x40, 0xbc, 0x5e, 0xe0, 0xda, 0xc9, 0x4d, 0x7b, 0x4f,
-	0x6d, 0x6a, 0xc9, 0x17, 0xf6, 0x9e, 0x8a, 0x2b, 0xb7, 0xc5, 0xf0, 0x07, 0x90, 0xda, 0xde, 0xad,
-	0xb7, 0xd5, 0xc6, 0xb9, 0x83, 0xdb, 0xcf, 0x12, 0xdf, 0xfc, 0x71, 0x45, 0xda, 0x4c, 0x64, 0x90,
-	0x7c, 0xa5, 0xf2, 0x9d, 0x04, 0xa8, 0xa9, 0x7b, 0x3a, 0xbd, 0xea, 0x4b, 0x4c, 0x6e, 0xb1, 0xb7,
-	0xf8, 0x7b, 0xba, 0xd1, 0xc6, 0xdf, 0xa7, 0xd1, 0xfa, 0xa6, 0x56, 0xbe, 0x95, 0x00, 0x22, 0xc6,
-	0x7d, 0x19, 0xfd, 0x14, 0x39, 0x7f, 0xa6, 0x38, 0x93, 0xff, 0x74, 0x9f, 0xf0, 0x3f, 0x54, 0x3e,
-	0x84, 0x0c, 0xe6, 0x47, 0xe6, 0x2b, 0xc9, 0xdc, 0xe6, 0x3d, 0xe3, 0x99, 0x47, 0x0b, 0x5a, 0xa0,
-	0x5c, 0x4f, 0x43, 0x72, 0x6c, 0x19, 0xb6, 0x75, 0xf7, 0x73, 0x40, 0xb3, 0x69, 0x82, 0x0a, 0x90,
-	0x65, 0xff, 0x75, 0x8f, 0x60, 0x7f, 0x0a, 0xdf, 0xb5, 0x8e, 0x02, 0x82, 0x54, 0xbf, 0xf5, 0xfa,
-	0x3f, 0xcb, 0x0b, 0xaf, 0x4f, 0x97, 0xa5, 0x7f, 0x9c, 0x2e, 0x4b, 0xff, 0x3c, 0x5d, 0x96, 0xfe,
-	0x7d, 0xba, 0x2c, 0xfd, 0xfe, 0xbf, 0xcb, 0x0b, 0x5f, 0xa5, 0xb9, 0x01, 0xff, 0x0f, 0x00, 0x00,
-	0xff, 0xff, 0x04, 0xf3, 0x7d, 0x3c, 0x0e, 0x18, 0x00, 0x00,
+	// 2323 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x5b, 0x6f, 0xdb, 0xd8,
+	0xf1, 0x37, 0x75, 0xd7, 0xe8, 0x46, 0x9f, 0x5c, 0x96, 0xf1, 0x7f, 0xff, 0xb6, 0xa2, 0xdd, 0x4d,
+	0xbd, 0xdb, 0x5d, 0x39, 0xeb, 0xa4, 0x8b, 0xa0, 0x97, 0x45, 0x74, 0x73, 0x42, 0x47, 0x96, 0x1c,
+	0x5a, 0x4e, 0x9a, 0x45, 0x5b, 0x81, 0xd6, 0x39, 0xb6, 0x99, 0x50, 0xa4, 0x42, 0x52, 0x5e, 0xeb,
+	0x0b, 0x14, 0xfb, 0x58, 0xf4, 0x03, 0x2c, 0x16, 0xfb, 0xda, 0xd7, 0x3e, 0x14, 0x45, 0x3f, 0x40,
+	0x1e, 0xfb, 0x58, 0xa0, 0x80, 0xd1, 0xba, 0x1f, 0xa2, 0x40, 0x9e, 0x8a, 0x73, 0x78, 0x0e, 0x49,
+	0x59, 0x56, 0x62, 0x27, 0x0f, 0x02, 0xc4, 0xb9, 0xfc, 0x38, 0x33, 0x67, 0x66, 0xce, 0x0c, 0xe1,
+	0xb3, 0x81, 0x3d, 0x78, 0xe1, 0xd8, 0xfa, 0xe0, 0x70, 0x6d, 0xf4, 0xe2, 0x60, 0xcd, 0x7d, 0x69,
+	0xd2, 0xdf, 0x9e, 0xee, 0x92, 0x35, 0xd7, 0x73, 0xc6, 0x03, 0x6f, 0xec, 0x10, 0x5c, 0x1d, 0x39,
+	0xb6, 0x67, 0xa3, 0x6b, 0x81, 0x6c, 0xd5, 0x7d, 0x69, 0x56, 0xb9, 0xdc, 0x52, 0x79, 0x1a, 0x82,
+	0xfd, 0x1b, 0xed, 0xad, 0x61, 0xdd, 0xd3, 0x7d, 0xc5, 0xa5, 0x5b, 0xd3, 0x12, 0x63, 0xcf, 0x30,
+	0xd7, 0x0e, 0xcd, 0xc1, 0x9a, 0x67, 0x0c, 0x89, 0xeb, 0xe9, 0xc3, 0x11, 0x97, 0xfb, 0x74, 0xbe,
+	0x31, 0x23, 0xc7, 0x38, 0x32, 0x4c, 0x72, 0x40, 0xb8, 0xe8, 0xd5, 0x03, 0xfb, 0xc0, 0x66, 0x7f,
+	0xd7, 0xe8, 0x3f, 0x9f, 0x5a, 0xf9, 0x21, 0x01, 0xd0, 0xb0, 0xcd, 0xf1, 0xd0, 0xea, 0x4d, 0x46,
+	0x04, 0xdd, 0x87, 0xc4, 0x0b, 0xc3, 0xc2, 0x8a, 0x54, 0x96, 0x56, 0x8b, 0xeb, 0xb7, 0xaa, 0xe7,
+	0xda, 0x5f, 0x0d, 0x15, 0xaa, 0x8f, 0x0c, 0x0b, 0xd7, 0x13, 0xaf, 0x4e, 0x56, 0x16, 0x34, 0xa6,
+	0x89, 0x96, 0x20, 0xf9, 0xad, 0x81, 0xbd, 0x43, 0x25, 0x56, 0x96, 0x56, 0x93, 0x9c, 0xe5, 0x93,
+	0x50, 0x05, 0xb2, 0x23, 0x87, 0x0c, 0x0c, 0xd7, 0xb0, 0x2d, 0x25, 0x1e, 0xe1, 0x87, 0x64, 0xf4,
+	0x29, 0xc8, 0xba, 0xe3, 0xe8, 0x93, 0x3e, 0x36, 0x86, 0xc4, 0xa2, 0x24, 0x57, 0x49, 0x94, 0xe3,
+	0xab, 0x49, 0xad, 0xc4, 0xe8, 0xcd, 0x80, 0x8c, 0xae, 0x43, 0xca, 0xb4, 0x07, 0xba, 0x49, 0x94,
+	0x64, 0x59, 0x5a, 0xcd, 0x6a, 0xfc, 0x09, 0xb5, 0x20, 0xa9, 0x9b, 0x86, 0xee, 0x2a, 0x29, 0xe6,
+	0xc5, 0xa7, 0x6f, 0xf7, 0x62, 0x67, 0xbc, 0x17, 0x71, 0xc4, 0xd7, 0xae, 0xfc, 0x53, 0x82, 0x04,
+	0xa5, 0xa2, 0x0c, 0x24, 0xea, 0xdd, 0x6e, 0x5b, 0x5e, 0x40, 0x69, 0x88, 0xab, 0x9d, 0x9e, 0x2c,
+	0xa1, 0x2c, 0x24, 0x37, 0xda, 0xdd, 0x5a, 0x4f, 0x8e, 0xa1, 0x1c, 0xa4, 0x9b, 0xad, 0x86, 0xba,
+	0x55, 0x6b, 0xcb, 0x71, 0x2a, 0xda, 0xac, 0xf5, 0x5a, 0x72, 0x02, 0x15, 0x20, 0xdb, 0x53, 0xb7,
+	0x5a, 0x3b, 0xbd, 0xda, 0xd6, 0xb6, 0x9c, 0x44, 0x79, 0xc8, 0xa8, 0x9d, 0x5e, 0x4b, 0x7b, 0x52,
+	0x6b, 0xcb, 0x29, 0x04, 0x90, 0xda, 0xe9, 0x69, 0x6a, 0xe7, 0x81, 0x9c, 0xa6, 0x50, 0xf5, 0x67,
+	0xbd, 0xd6, 0x8e, 0x9c, 0x41, 0x25, 0xc8, 0x05, 0x3a, 0xbd, 0x6f, 0xe4, 0x2c, 0x42, 0x50, 0x6c,
+	0x74, 0xdb, 0xed, 0x5a, 0xaf, 0xd5, 0xe4, 0xf2, 0x40, 0x5f, 0xd1, 0xa9, 0x6d, 0xb5, 0xe4, 0x1c,
+	0xb5, 0xa6, 0xab, 0x36, 0xe5, 0x3c, 0x23, 0xed, 0xb6, 0xdb, 0x72, 0x81, 0xfe, 0xdb, 0xdd, 0x55,
+	0x9b, 0x72, 0x91, 0xbe, 0x5f, 0xed, 0xf4, 0xfa, 0x35, 0x4d, 0xab, 0x3d, 0x93, 0x31, 0x2a, 0x01,
+	0xa8, 0x9d, 0xde, 0xfa, 0x93, 0x56, 0xa3, 0xd7, 0xd5, 0xe4, 0x57, 0x52, 0x65, 0x15, 0xd2, 0xdc,
+	0x6b, 0xa6, 0xde, 0xed, 0xb4, 0xe4, 0x05, 0xfa, 0x4f, 0xed, 0xf4, 0xee, 0xf9, 0x0e, 0xaa, 0x9d,
+	0xde, 0x57, 0x77, 0xe5, 0x58, 0xe5, 0xbf, 0x12, 0x5c, 0xd9, 0xb0, 0x1d, 0x62, 0x1c, 0x58, 0x8f,
+	0xc8, 0x44, 0x23, 0xfb, 0xc4, 0x21, 0xd6, 0x80, 0xa0, 0x32, 0x24, 0x3d, 0x7d, 0xcf, 0x24, 0x2c,
+	0x59, 0x0a, 0x75, 0xa0, 0xb1, 0x7b, 0x7d, 0xb2, 0x12, 0x53, 0x9b, 0x9a, 0xcf, 0x40, 0x9f, 0x40,
+	0xd2, 0xb0, 0x30, 0x39, 0x66, 0xb9, 0x50, 0xa8, 0x97, 0xb8, 0x44, 0x5a, 0xa5, 0x44, 0x2a, 0xc6,
+	0xb8, 0x48, 0x81, 0x84, 0xa5, 0x0f, 0x09, 0xcb, 0x88, 0xac, 0x48, 0x26, 0x4a, 0x41, 0x8f, 0x20,
+	0x73, 0xa4, 0x9b, 0x06, 0x36, 0xbc, 0x89, 0x92, 0x78, 0xcb, 0x61, 0x5a, 0xae, 0xe7, 0xe8, 0x86,
+	0xe5, 0x3d, 0xe1, 0x0a, 0x1c, 0x28, 0x00, 0x40, 0xb7, 0x61, 0xd1, 0x3d, 0xd4, 0x1d, 0x82, 0xfb,
+	0x23, 0x87, 0xec, 0x1b, 0xc7, 0x7d, 0x93, 0x58, 0x2c, 0x73, 0x44, 0x16, 0x96, 0x7c, 0xf6, 0x36,
+	0xe3, 0xb6, 0x89, 0x55, 0xf9, 0x7d, 0x0c, 0x64, 0x3f, 0x4b, 0x9a, 0xc4, 0x1d, 0x38, 0xc6, 0xc8,
+	0xb3, 0x9d, 0xc0, 0x5a, 0x69, 0xc6, 0xda, 0x5b, 0x10, 0x33, 0x30, 0xf7, 0xf5, 0x3a, 0xa5, 0x9f,
+	0xb2, 0x68, 0xbc, 0x3e, 0x59, 0xc9, 0xf8, 0x28, 0x6a, 0x53, 0x8b, 0x19, 0x18, 0xfd, 0x02, 0x12,
+	0xde, 0x64, 0xe4, 0xfb, 0x9b, 0x5b, 0xbf, 0xf9, 0xd6, 0xf4, 0x14, 0x2f, 0xa1, 0x4a, 0xa8, 0x0c,
+	0x19, 0x6b, 0x6c, 0x9a, 0x2c, 0xf0, 0x34, 0x24, 0x19, 0xe1, 0xa7, 0xa0, 0xa2, 0x9b, 0x90, 0xc7,
+	0x64, 0x5f, 0x1f, 0x9b, 0x5e, 0x9f, 0x1c, 0x8f, 0x1c, 0x5e, 0x1c, 0x39, 0x4e, 0x6b, 0x1d, 0x8f,
+	0x1c, 0xf4, 0x21, 0xa4, 0x0e, 0x0d, 0x8c, 0x89, 0xc5, 0x4a, 0x44, 0x40, 0x70, 0xda, 0x66, 0x22,
+	0x93, 0x91, 0xb3, 0x9b, 0x89, 0x4c, 0x56, 0x86, 0xcd, 0x44, 0x26, 0x2d, 0x67, 0x2a, 0xdf, 0xc5,
+	0xe0, 0xba, 0x6f, 0xcf, 0x86, 0x3e, 0x34, 0xcc, 0xc9, 0xfb, 0x86, 0xc3, 0x47, 0xe1, 0xe1, 0xb8,
+	0x09, 0xf9, 0x01, 0xc3, 0xee, 0x53, 0x35, 0x57, 0x89, 0x97, 0xe3, 0xd4, 0x5e, 0x9f, 0xd6, 0xa1,
+	0x24, 0x74, 0x0f, 0x80, 0x8b, 0x18, 0xd8, 0x6f, 0x07, 0x85, 0xfa, 0x8d, 0xd3, 0x93, 0x95, 0xac,
+	0x88, 0xab, 0x3b, 0x15, 0xe4, 0xac, 0x2f, 0xac, 0x62, 0x17, 0x75, 0x61, 0x51, 0x04, 0x23, 0x40,
+	0x60, 0x11, 0x29, 0xd4, 0x3f, 0xe2, 0x36, 0x95, 0x9a, 0xbe, 0x80, 0x50, 0x9f, 0x82, 0x2a, 0xe1,
+	0x29, 0x26, 0xae, 0xfc, 0x29, 0x06, 0x57, 0x55, 0xcb, 0x23, 0x8e, 0x49, 0xf4, 0x23, 0x12, 0x09,
+	0xc4, 0xaf, 0x21, 0xab, 0x5b, 0x03, 0xe2, 0x7a, 0xb6, 0xe3, 0x2a, 0x52, 0x39, 0xbe, 0x9a, 0x5b,
+	0xbf, 0x3b, 0xe7, 0x68, 0xcf, 0xd3, 0xaf, 0xd6, 0xb8, 0xb2, 0x68, 0x89, 0x01, 0xd8, 0xd2, 0x5f,
+	0x24, 0xc8, 0x08, 0x2e, 0xba, 0x0d, 0x19, 0x56, 0x5c, 0xd4, 0x0f, 0xbf, 0xf0, 0xae, 0x71, 0x3f,
+	0xd2, 0x3d, 0x4a, 0x67, 0xf6, 0xd3, 0x1a, 0x4c, 0x33, 0x31, 0x15, 0xa3, 0x9f, 0x41, 0x86, 0xd5,
+	0x59, 0x3f, 0x38, 0x8d, 0x25, 0xa1, 0xc1, 0x0b, 0x31, 0x5a, 0x93, 0x69, 0x26, 0xab, 0x62, 0xd4,
+	0x38, 0xaf, 0x5c, 0xe2, 0x4c, 0xff, 0x03, 0x11, 0xb9, 0x9d, 0xe9, 0x82, 0x99, 0xad, 0xa0, 0xbf,
+	0xa6, 0xa1, 0xc4, 0x90, 0x2f, 0x94, 0x31, 0x9f, 0x44, 0x32, 0xe6, 0xda, 0x54, 0xc6, 0x04, 0xe6,
+	0xd1, 0x84, 0xf9, 0x10, 0x52, 0x63, 0xcb, 0x78, 0x39, 0xf6, 0x2b, 0x28, 0xc8, 0x5e, 0x9f, 0x36,
+	0x93, 0x4e, 0x89, 0xd9, 0x74, 0xfa, 0x1c, 0x10, 0x8d, 0x25, 0xe9, 0x4f, 0x09, 0x26, 0x99, 0xa0,
+	0xcc, 0x38, 0x8d, 0xb9, 0xc9, 0x97, 0xba, 0x44, 0xf2, 0x3d, 0x04, 0x99, 0x1c, 0x7b, 0x8e, 0xde,
+	0x8f, 0xe8, 0xa7, 0x99, 0xfe, 0xf2, 0xe9, 0xc9, 0x4a, 0xb1, 0x45, 0x79, 0xe7, 0x83, 0x14, 0x49,
+	0x84, 0x87, 0x5d, 0xf4, 0x5b, 0x58, 0xe4, 0x18, 0xd8, 0x70, 0xc8, 0xc0, 0x63, 0xd7, 0x62, 0xa6,
+	0x1c, 0x5f, 0x2d, 0xae, 0xdf, 0x9e, 0x9b, 0x64, 0x53, 0x61, 0xaf, 0x36, 0x85, 0xa2, 0x26, 0xfb,
+	0x50, 0x01, 0xc1, 0x45, 0x8f, 0x21, 0xb7, 0xef, 0x77, 0xf8, 0xfe, 0x0b, 0x32, 0x51, 0xb2, 0xac,
+	0x31, 0x7d, 0x36, 0x07, 0xf8, 0x9c, 0xbb, 0x80, 0x1f, 0x01, 0xec, 0x07, 0x2c, 0xb4, 0x0b, 0x05,
+	0x47, 0xb0, 0x71, 0x7f, 0x6f, 0xa2, 0x00, 0x2b, 0x89, 0xcb, 0x83, 0xe6, 0x43, 0x98, 0xfa, 0x04,
+	0x3d, 0x06, 0x30, 0x82, 0xea, 0x51, 0x72, 0xcc, 0xd0, 0x9f, 0x5e, 0xa2, 0xcc, 0x84, 0xa5, 0x21,
+	0x08, 0x7a, 0x0a, 0xc5, 0xf0, 0x89, 0x99, 0x9a, 0x7f, 0x47, 0x53, 0x0b, 0x11, 0x9c, 0xfa, 0x04,
+	0xf5, 0xe0, 0xea, 0xc0, 0x1e, 0x8e, 0x6c, 0xd7, 0xf0, 0x48, 0x34, 0x05, 0x0a, 0x2c, 0x05, 0x2a,
+	0xa7, 0x27, 0x2b, 0xa8, 0x21, 0xf8, 0xe7, 0xa7, 0x01, 0x1a, 0x9c, 0xe1, 0xfb, 0x49, 0x35, 0x95,
+	0xbc, 0x14, 0xb1, 0x18, 0x26, 0xd5, 0x4e, 0x98, 0xbe, 0x33, 0x49, 0x15, 0x49, 0x6d, 0x15, 0xbb,
+	0x95, 0x65, 0xc8, 0x06, 0x39, 0x40, 0x87, 0x89, 0xda, 0x4e, 0xc3, 0x9f, 0x01, 0x9a, 0xad, 0x9d,
+	0x86, 0x2c, 0x55, 0xfe, 0x96, 0x00, 0x14, 0x46, 0x6e, 0x6b, 0xec, 0xe9, 0x4c, 0xb2, 0x06, 0x29,
+	0xff, 0xd5, 0xac, 0x82, 0x73, 0xeb, 0x3f, 0x79, 0xe3, 0x05, 0x16, 0x02, 0x3c, 0x5c, 0xd0, 0xb8,
+	0x22, 0xfa, 0x3a, 0x3a, 0x18, 0xe4, 0xe6, 0xce, 0x99, 0x67, 0x52, 0xf8, 0xe1, 0x82, 0x98, 0x18,
+	0x1e, 0x41, 0xd2, 0xf5, 0x74, 0xcf, 0x6f, 0x00, 0xc5, 0xf5, 0xb5, 0x39, 0xfa, 0xb3, 0xc6, 0x57,
+	0x77, 0xa8, 0x9a, 0x98, 0xf3, 0x18, 0x06, 0x7a, 0x0a, 0xd9, 0xa0, 0xa8, 0xf8, 0x94, 0x71, 0xe7,
+	0xe2, 0x80, 0x41, 0x04, 0x45, 0xdf, 0x0e, 0xb0, 0x50, 0x0d, 0x72, 0x43, 0x2e, 0x16, 0xde, 0x3a,
+	0x65, 0xde, 0xd7, 0x40, 0x20, 0xb0, 0xfe, 0x16, 0x79, 0xd2, 0x40, 0x28, 0xa9, 0x18, 0xdd, 0x87,
+	0xbc, 0x43, 0xdc, 0xf1, 0x90, 0xf4, 0xdd, 0x91, 0x6e, 0xf9, 0xdd, 0x27, 0xb7, 0xfe, 0x41, 0xc4,
+	0x3c, 0xbe, 0x3c, 0x54, 0x77, 0x46, 0xba, 0x30, 0x21, 0xe7, 0xab, 0x50, 0x8a, 0x5b, 0xb9, 0x0f,
+	0x49, 0xe6, 0x33, 0x9d, 0x53, 0x77, 0x3b, 0x8f, 0x3a, 0xdd, 0xa7, 0x1d, 0x79, 0x81, 0x4e, 0x9a,
+	0xcd, 0x56, 0xbb, 0xd5, 0x6b, 0xf5, 0xbb, 0x9d, 0xf6, 0x33, 0x59, 0x42, 0x37, 0xe0, 0x1a, 0x27,
+	0xd4, 0x3a, 0xcd, 0xfe, 0x53, 0x4d, 0x15, 0xac, 0x58, 0x65, 0x35, 0x9a, 0x26, 0xe1, 0xac, 0x48,
+	0x13, 0xa6, 0xd9, 0x94, 0x25, 0x96, 0x30, 0x5a, 0x77, 0x5b, 0x8e, 0xd5, 0xf3, 0x00, 0x38, 0x88,
+	0x50, 0xe5, 0xcf, 0x57, 0xa0, 0xc4, 0xae, 0xa4, 0x0b, 0xf5, 0xfe, 0x32, 0xeb, 0xfd, 0xfe, 0xfd,
+	0x22, 0x4f, 0xf5, 0xfe, 0x18, 0x6f, 0xfb, 0x77, 0x20, 0x3b, 0xd2, 0x1d, 0x62, 0x79, 0x34, 0x98,
+	0x89, 0xa9, 0xb1, 0x22, 0xb3, 0xcd, 0x18, 0x81, 0x78, 0xc6, 0x17, 0x54, 0xa9, 0x52, 0xfa, 0x88,
+	0x38, 0x6c, 0xe1, 0xf0, 0xe3, 0x7f, 0x83, 0x0f, 0xa1, 0x8b, 0xa1, 0x55, 0x4f, 0x7c, 0x01, 0x4d,
+	0x48, 0xa2, 0x8f, 0x00, 0xc6, 0xa3, 0xbe, 0xd0, 0x8b, 0x8e, 0x48, 0xd9, 0xf1, 0x88, 0x4b, 0xa3,
+	0x6d, 0x58, 0x1c, 0xda, 0xd8, 0xd8, 0x37, 0x06, 0xfe, 0x09, 0xd3, 0xd5, 0x4c, 0x49, 0xb3, 0x7c,
+	0xfe, 0xff, 0xc8, 0xf9, 0xd0, 0xd5, 0xad, 0x7a, 0x68, 0x0e, 0xaa, 0x3d, 0xb1, 0xba, 0x71, 0x28,
+	0x39, 0xaa, 0x4d, 0x99, 0xe8, 0x01, 0xa4, 0xfd, 0xfa, 0xf0, 0x5b, 0xfb, 0xc5, 0x2b, 0x8b, 0x23,
+	0x0a, 0x6d, 0xb4, 0x01, 0x45, 0x8b, 0x1c, 0x47, 0x27, 0x9e, 0xec, 0x54, 0xee, 0xe5, 0x3b, 0xe4,
+	0xf8, 0xfc, 0x71, 0x27, 0x6f, 0x85, 0x1c, 0x8c, 0x1e, 0x43, 0x61, 0xe4, 0x18, 0x43, 0xdd, 0x99,
+	0xf4, 0xfd, 0x72, 0x85, 0xcb, 0x94, 0xab, 0xe8, 0xdf, 0x1c, 0x82, 0x71, 0xd1, 0x06, 0xf8, 0x03,
+	0x06, 0x71, 0x95, 0x1c, 0xf3, 0xf1, 0x72, 0x60, 0x42, 0x19, 0xd5, 0xa1, 0xc0, 0x5c, 0x0c, 0x26,
+	0x9b, 0x3c, 0xf3, 0x70, 0x99, 0x7b, 0x98, 0xa3, 0x1e, 0x9e, 0x33, 0xdd, 0xe4, 0xac, 0x80, 0x8e,
+	0xd1, 0x26, 0x40, 0xb0, 0x24, 0xd3, 0xae, 0xfc, 0xa6, 0x4b, 0x6f, 0x5b, 0x08, 0x86, 0x26, 0x69,
+	0x11, 0x6d, 0xb4, 0x05, 0x59, 0x51, 0xb6, 0x7e, 0x3b, 0xce, 0xcd, 0x5d, 0x55, 0x66, 0x9b, 0x88,
+	0x48, 0xae, 0x00, 0x01, 0x75, 0x20, 0x69, 0x12, 0xdd, 0x25, 0x4a, 0x89, 0x59, 0x75, 0x6f, 0x0e,
+	0xd4, 0x99, 0xf2, 0xaa, 0xee, 0x0c, 0x0e, 0xc9, 0x50, 0x6f, 0x1c, 0xea, 0xd6, 0x01, 0x69, 0x53,
+	0x7d, 0xcd, 0x87, 0x41, 0x1d, 0x90, 0x59, 0xb8, 0xa2, 0xfd, 0x48, 0x66, 0x11, 0xfb, 0x98, 0x47,
+	0xac, 0x48, 0x23, 0x36, 0xb7, 0x27, 0xb1, 0x7c, 0xda, 0x0a, 0xfb, 0xd2, 0x2f, 0xa1, 0xb8, 0x6f,
+	0x3b, 0x43, 0xdd, 0x0b, 0xaa, 0x64, 0x31, 0x9c, 0xda, 0x5e, 0x9f, 0xac, 0x14, 0x36, 0x18, 0x57,
+	0x54, 0x56, 0x61, 0x3f, 0xfa, 0x88, 0x1e, 0x8a, 0xf6, 0x7d, 0x85, 0x75, 0xdb, 0xcf, 0x2f, 0xea,
+	0xdd, 0x6c, 0xef, 0xee, 0x40, 0x6a, 0x70, 0x48, 0x06, 0x2f, 0x5c, 0xe5, 0x2a, 0x8b, 0xf9, 0x57,
+	0x17, 0x84, 0x6a, 0x50, 0xa5, 0x70, 0x67, 0xd4, 0x38, 0x0a, 0x7a, 0x0c, 0x69, 0x87, 0xf8, 0xe3,
+	0xe0, 0x35, 0x06, 0xf8, 0xe5, 0x05, 0x01, 0x35, 0xa6, 0xa5, 0x5a, 0xfb, 0xb6, 0xc8, 0x54, 0x8e,
+	0x83, 0xba, 0x90, 0xd9, 0xa7, 0xeb, 0x8e, 0x41, 0x5c, 0xe5, 0x3a, 0xc3, 0xfc, 0xe2, 0x8d, 0x65,
+	0x7d, 0x76, 0xc3, 0x12, 0xfb, 0x9d, 0x00, 0x09, 0xaa, 0x9b, 0x11, 0x26, 0xf4, 0x24, 0x3f, 0x98,
+	0xad, 0x6e, 0xb1, 0x61, 0x4d, 0x6d, 0x5b, 0xac, 0xba, 0xf9, 0x13, 0xa6, 0x5d, 0xee, 0xc8, 0x20,
+	0xdf, 0xf6, 0x5f, 0x8e, 0x89, 0x33, 0x51, 0x94, 0x48, 0x47, 0xce, 0x52, 0xfa, 0x63, 0x4a, 0x46,
+	0x5f, 0x42, 0x16, 0x93, 0x11, 0xb1, 0xb0, 0xdb, 0xb5, 0x94, 0x1b, 0x6c, 0xcc, 0xb8, 0x42, 0x67,
+	0xdf, 0xa6, 0x20, 0xf2, 0x8e, 0x1b, 0x4a, 0xa1, 0xe7, 0x74, 0xff, 0xa4, 0x0f, 0x04, 0x77, 0xad,
+	0xfa, 0x44, 0x59, 0x62, 0x4e, 0xdf, 0xbe, 0x70, 0x20, 0xc5, 0x4c, 0x75, 0x55, 0xf8, 0xd3, 0x8c,
+	0xa0, 0x69, 0x53, 0xd8, 0xe8, 0x37, 0x90, 0x17, 0x29, 0xbd, 0x69, 0xef, 0xb9, 0xca, 0xff, 0xb1,
+	0x77, 0xad, 0x5f, 0xf0, 0x5d, 0x5b, 0xa1, 0xaa, 0x68, 0x56, 0x51, 0xb4, 0xa5, 0x1f, 0x25, 0x58,
+	0x9c, 0x29, 0x29, 0xf4, 0x3b, 0x48, 0x5b, 0x36, 0x8e, 0x2c, 0x60, 0x2d, 0x6e, 0x68, 0xaa, 0x63,
+	0x63, 0x7f, 0xff, 0xba, 0x73, 0x60, 0x78, 0x87, 0xe3, 0xbd, 0xea, 0xc0, 0x1e, 0xae, 0x05, 0xa6,
+	0xe0, 0xbd, 0xb5, 0x73, 0xbf, 0xfb, 0x55, 0x7d, 0x35, 0x2d, 0x45, 0x51, 0x55, 0x8c, 0xbe, 0x80,
+	0x12, 0x39, 0x1e, 0x19, 0x4e, 0xe4, 0x5a, 0xa1, 0x63, 0x52, 0x9c, 0x9b, 0x58, 0x0c, 0x99, 0xf4,
+	0xd6, 0x58, 0xfa, 0xa3, 0x04, 0xa5, 0x33, 0xe9, 0x4c, 0xaf, 0x59, 0xb6, 0xfa, 0x4f, 0x5d, 0xb3,
+	0x94, 0x12, 0x5c, 0xc0, 0xb1, 0x37, 0x7e, 0x6b, 0x89, 0xbf, 0xe7, 0xb7, 0x96, 0x25, 0x13, 0x20,
+	0xac, 0x08, 0xf4, 0x2b, 0x28, 0xd8, 0x26, 0xee, 0x87, 0xb7, 0xb7, 0x14, 0x5e, 0xc5, 0xb4, 0x59,
+	0x77, 0x4d, 0x7c, 0xe6, 0x02, 0xcf, 0xd9, 0x01, 0x09, 0xa3, 0x15, 0xc8, 0x50, 0xf5, 0x19, 0xbb,
+	0xd3, 0xb6, 0x89, 0xe9, 0x8a, 0xb6, 0xf4, 0xbd, 0x04, 0xd9, 0xe8, 0x77, 0xa9, 0x58, 0xf0, 0x8a,
+	0xf3, 0x27, 0x89, 0x77, 0xdc, 0x88, 0xa7, 0x17, 0xc1, 0xf8, 0xc5, 0x17, 0xc1, 0xa5, 0x23, 0xc8,
+	0x45, 0x72, 0xed, 0xec, 0x60, 0x28, 0xbd, 0xc3, 0x60, 0xf8, 0x31, 0xa4, 0x9e, 0xdb, 0x7b, 0xc2,
+	0x81, 0x78, 0xbd, 0xc0, 0xb5, 0x93, 0x9b, 0xf6, 0x9e, 0xda, 0xd4, 0x92, 0xcf, 0xed, 0x3d, 0x15,
+	0x57, 0x6e, 0x89, 0xe1, 0x0f, 0x20, 0xb5, 0xbd, 0x5b, 0x6f, 0xab, 0x8d, 0x73, 0x07, 0xb7, 0x9f,
+	0x27, 0xbe, 0xfb, 0x61, 0x45, 0xda, 0x4c, 0x64, 0x90, 0x7c, 0xa5, 0xf2, 0xa3, 0x04, 0xa8, 0xa9,
+	0x7b, 0x3a, 0x3d, 0xea, 0x4b, 0x4c, 0x6e, 0xb1, 0x37, 0xc4, 0x7b, 0xfa, 0xa2, 0x8d, 0xbf, 0xcf,
+	0x45, 0xeb, 0x9b, 0x5a, 0xf9, 0x5e, 0x02, 0x88, 0x18, 0xf7, 0x75, 0xf4, 0x53, 0xe4, 0xfc, 0x99,
+	0xe2, 0x4c, 0xfd, 0xd3, 0x7d, 0xc2, 0xff, 0x50, 0xf9, 0x00, 0x32, 0x98, 0xbb, 0xcc, 0x57, 0x92,
+	0xb9, 0x97, 0xf7, 0x4c, 0x64, 0x1e, 0x2e, 0x68, 0x81, 0x72, 0x3d, 0x0d, 0xc9, 0xb1, 0x65, 0xd8,
+	0xd6, 0x67, 0x77, 0x01, 0xcd, 0x96, 0x09, 0x2a, 0x40, 0x96, 0xfd, 0xd7, 0x3d, 0x82, 0xfd, 0x29,
+	0x7c, 0xd7, 0x3a, 0x0a, 0x08, 0x52, 0xfd, 0xe6, 0xab, 0x7f, 0x2f, 0x2f, 0xbc, 0x3a, 0x5d, 0x96,
+	0xfe, 0x7e, 0xba, 0x2c, 0xfd, 0xe3, 0x74, 0x59, 0xfa, 0xd7, 0xe9, 0xb2, 0xf4, 0x87, 0xff, 0x2c,
+	0x2f, 0x7c, 0x93, 0xe6, 0x06, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xad, 0xb5, 0x07, 0x51, 0x7f,
+	0x18, 0x00, 0x00,
 }
diff --git a/pkg/sql/sqlbase/structured.proto b/pkg/sql/sqlbase/structured.proto
index b08bc0fe52fc..cb2e77147b62 100644
--- a/pkg/sql/sqlbase/structured.proto
+++ b/pkg/sql/sqlbase/structured.proto
@@ -65,6 +65,12 @@ message ColumnType {
     INT2VECTOR = 200;
   }
 
+  enum SubKind {
+    NONE = 0;
+    INT8 = 1;
+    INT64 = 2;
+  }
+
   optional Kind kind = 1 [(gogoproto.nullable) = false];
   // BIT, INT, FLOAT, DECIMAL, CHAR and BINARY
   optional int32 width = 2 [(gogoproto.nullable) = false];
@@ -75,6 +81,10 @@ message ColumnType {
   repeated int32 array_dimensions = 4;
   // Collated STRING, CHAR, and VARCHAR
   optional string locale = 5;
+  // Alias for any types where our internal representation is different than
+  // the user specification. Examples are INT4, FLOAT4, etc. Mostly for Postgres
+  // compatibility.
+  optional SubKind alias = 6 [(gogoproto.nullable) = false];
 }
 
 enum ConstraintValidity {
diff --git a/pkg/sql/sqlbase/table.go b/pkg/sql/sqlbase/table.go
index 502156beb355..6fdb791fcd1b 100644
--- a/pkg/sql/sqlbase/table.go
+++ b/pkg/sql/sqlbase/table.go
@@ -93,6 +93,7 @@ func MakeColumnDefDescs(
 	// Set Type.Kind and Type.Locale.
 	colDatumType := parser.CastTargetToDatumType(d.Type)
 	col.Type = DatumTypeToColumnType(colDatumType)
+	var aliasTypeMap = ColumnType_SubKind_value
 
 	// Set other attributes of col.Type and perform type-specific verification.
 	switch t := d.Type.(type) {
@@ -106,6 +107,9 @@ func MakeColumnDefDescs(
 			s := "unique_rowid()"
 			col.DefaultExpr = &s
 		}
+		if val, present := aliasTypeMap[t.Name]; present {
+			col.Type.Alias = ColumnType_SubKind(val)
+		}
 	case *parser.FloatColType:
 		// If the precision for this float col was intentionally specified as 0, return an error.
 		if t.Prec == 0 && t.PrecSpecified {