2
0

Rename Oid to OID

This commit is contained in:
Jack Christensen
2016-08-02 13:31:55 -05:00
parent 2bf3fac594
commit 214443deb7
16 changed files with 366 additions and 363 deletions
+14 -14
View File
@@ -57,23 +57,23 @@ var openFromConnPoolCount int
// oids that map to intrinsic database/sql types. These will be allowed to be
// binary, anything else will be forced to text format
var databaseSqlOids map[pgx.Oid]bool
var databaseSqlOIDs map[pgx.OID]bool
func init() {
d := &Driver{}
sql.Register("pgx", d)
databaseSqlOids = make(map[pgx.Oid]bool)
databaseSqlOids[pgx.BoolOid] = true
databaseSqlOids[pgx.ByteaOid] = true
databaseSqlOids[pgx.Int2Oid] = true
databaseSqlOids[pgx.Int4Oid] = true
databaseSqlOids[pgx.Int8Oid] = true
databaseSqlOids[pgx.Float4Oid] = true
databaseSqlOids[pgx.Float8Oid] = true
databaseSqlOids[pgx.DateOid] = true
databaseSqlOids[pgx.TimestampTzOid] = true
databaseSqlOids[pgx.TimestampOid] = true
databaseSqlOIDs = make(map[pgx.OID]bool)
databaseSqlOIDs[pgx.BoolOID] = true
databaseSqlOIDs[pgx.ByteaOID] = true
databaseSqlOIDs[pgx.Int2OID] = true
databaseSqlOIDs[pgx.Int4OID] = true
databaseSqlOIDs[pgx.Int8OID] = true
databaseSqlOIDs[pgx.Float4OID] = true
databaseSqlOIDs[pgx.Float8OID] = true
databaseSqlOIDs[pgx.DateOID] = true
databaseSqlOIDs[pgx.TimestampTzOID] = true
databaseSqlOIDs[pgx.TimestampOID] = true
}
type Driver struct {
@@ -231,7 +231,7 @@ func (c *Conn) queryPrepared(name string, argsV []driver.Value) (driver.Rows, er
// (e.g. []int32)
func restrictBinaryToDatabaseSqlTypes(ps *pgx.PreparedStatement) {
for i, _ := range ps.FieldDescriptions {
intrinsic, _ := databaseSqlOids[ps.FieldDescriptions[i].DataType]
intrinsic, _ := databaseSqlOIDs[ps.FieldDescriptions[i].DataType]
if !intrinsic {
ps.FieldDescriptions[i].FormatCode = pgx.TextFormatCode
}
@@ -248,7 +248,7 @@ func (s *Stmt) Close() error {
}
func (s *Stmt) NumInput() int {
return len(s.ps.ParameterOids)
return len(s.ps.ParameterOIDs)
}
func (s *Stmt) Exec(argsV []driver.Value) (driver.Result, error) {