gopkg/pgx
2
0
Fork 0
Code Activity

Type modifier should be int32 not uint32

Browse Source
This commit is contained in:
Jack Christensen
2018-09-22 07:43:18 -05:00
parent 1b754b5f70
commit 897e90f353
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
messages.go
+1 -1
View File
@@ -24,7 +24,7 @@ type FieldDescription struct {
DataType pgtype.OID DataType pgtype.OID
DataTypeSize int16 DataTypeSize int16
DataTypeName string DataTypeName string
Modifier uint32 Modifier int32
FormatCode int16 FormatCode int16
} }
pgmock/pgmock.go
+7 -7
View File
@@ -229,7 +229,7 @@ where (
TableAttributeNumber: 65534, TableAttributeNumber: 65534,
DataTypeOID: 26, DataTypeOID: 26,
DataTypeSize: 4, DataTypeSize: 4,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
{Name: "typname", {Name: "typname",
@@ -237,7 +237,7 @@ where (
TableAttributeNumber: 1, TableAttributeNumber: 1,
DataTypeOID: 19, DataTypeOID: 19,
DataTypeSize: 64, DataTypeSize: 64,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
}, },
@@ -455,7 +455,7 @@ where (
TableAttributeNumber: 65534, TableAttributeNumber: 65534,
DataTypeOID: 26, DataTypeOID: 26,
DataTypeSize: 4, DataTypeSize: 4,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
{Name: "typname", {Name: "typname",
@@ -463,7 +463,7 @@ where (
TableAttributeNumber: 1, TableAttributeNumber: 1,
DataTypeOID: 19, DataTypeOID: 19,
DataTypeSize: 64, DataTypeSize: 64,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
}, },
@@ -496,7 +496,7 @@ where (
TableAttributeNumber: 65534, TableAttributeNumber: 65534,
DataTypeOID: 26, DataTypeOID: 26,
DataTypeSize: 4, DataTypeSize: 4,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
{Name: "typname", {Name: "typname",
@@ -504,7 +504,7 @@ where (
TableAttributeNumber: 1, TableAttributeNumber: 1,
DataTypeOID: 19, DataTypeOID: 19,
DataTypeSize: 64, DataTypeSize: 64,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
{Name: "typbasetype", {Name: "typbasetype",
@@ -512,7 +512,7 @@ where (
TableAttributeNumber: 65534, TableAttributeNumber: 65534,
DataTypeOID: 26, DataTypeOID: 26,
DataTypeSize: 4, DataTypeSize: 4,
TypeModifier: 4294967295, TypeModifier: -1,
Format: 0, Format: 0,
}, },
}, },
pgproto3/row_description.go
+3 -3
View File
@@ -19,7 +19,7 @@ type FieldDescription struct {
TableAttributeNumber uint16 TableAttributeNumber uint16
DataTypeOID uint32 DataTypeOID uint32
DataTypeSize int16 DataTypeSize int16
TypeModifier uint32 TypeModifier int32
Format int16 Format int16
} }
@@ -57,7 +57,7 @@ func (dst *RowDescription) Decode(src []byte) error {
fd.TableAttributeNumber = binary.BigEndian.Uint16(buf.Next(2)) fd.TableAttributeNumber = binary.BigEndian.Uint16(buf.Next(2))
fd.DataTypeOID = binary.BigEndian.Uint32(buf.Next(4)) fd.DataTypeOID = binary.BigEndian.Uint32(buf.Next(4))
fd.DataTypeSize = int16(binary.BigEndian.Uint16(buf.Next(2))) fd.DataTypeSize = int16(binary.BigEndian.Uint16(buf.Next(2)))
fd.TypeModifier = binary.BigEndian.Uint32(buf.Next(4)) fd.TypeModifier = int32(binary.BigEndian.Uint32(buf.Next(4)))
fd.Format = int16(binary.BigEndian.Uint16(buf.Next(2))) fd.Format = int16(binary.BigEndian.Uint16(buf.Next(2)))
dst.Fields[i] = fd dst.Fields[i] = fd
@@ -80,7 +80,7 @@ func (src *RowDescription) Encode(dst []byte) []byte {
dst = pgio.AppendUint16(dst, fd.TableAttributeNumber) dst = pgio.AppendUint16(dst, fd.TableAttributeNumber)
dst = pgio.AppendUint32(dst, fd.DataTypeOID) dst = pgio.AppendUint32(dst, fd.DataTypeOID)
dst = pgio.AppendInt16(dst, fd.DataTypeSize) dst = pgio.AppendInt16(dst, fd.DataTypeSize)
dst = pgio.AppendUint32(dst, fd.TypeModifier) dst = pgio.AppendInt32(dst, fd.TypeModifier)
dst = pgio.AppendInt16(dst, fd.Format) dst = pgio.AppendInt16(dst, fd.Format)
} }
stdlib/sql_test.go
+2 -2
View File
@@ -1030,7 +1030,7 @@ func TestConnQueryContextCancel(t *testing.T) {
Name: "n", Name: "n",
DataTypeOID: 23, DataTypeOID: 23,
DataTypeSize: 4, DataTypeSize: 4,
TypeModifier: 4294967295, TypeModifier: -1,
}, },
}, },
}), }),
@@ -1206,7 +1206,7 @@ func TestStmtQueryContextCancel(t *testing.T) {
Name: "n", Name: "n",
DataTypeOID: 23, DataTypeOID: 23,
DataTypeSize: 4, DataTypeSize: 4,
TypeModifier: 4294967295, TypeModifier: -1,
}, },
}, },
}), }),