9448582135

Committed 10 Jun 2024 12:45PM UTC coverage: 44.579% (-0.07%) from 44.648%

Build # 9448582135

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #234 from gstarikov/main

fix psql inet type without subnet

Run Details

4 of 23 new or added lines in 3 files covered. (17.39%)

5884 of 13199 relevant lines covered (44.58%)

298.93 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/types/pgtypes/inet.go

package pgtypes

import (
        "database/sql/driver"
        "fmt"
        "net/netip"
        "strings"
)

type Inet struct {
        netip.Prefix
}

// Scan implements the sql.Scanner interface.
func (i *Inet) Scan(src any) error {
        switch v := src.(type) {
        case []byte:
                return i.Prefix.UnmarshalBinary(v)
        case string:
                if strings.Contains(v, "/") {
                        return i.Prefix.UnmarshalText([]byte(v))
                }
                addr, err := netip.ParseAddr(v)
                if err != nil {
                        return err
                }
                i.Prefix = netip.PrefixFrom(addr, addr.BitLen())
                return nil
        default:
                return fmt.Errorf("cannot scan type %T: %v", src, src)
        }
}

// Value implements the driver.Valuer interface.
func (i Inet) Value() (driver.Value, error) {
        return i.Prefix.MarshalText()
}

1	package pgtypes
2
3	import (
4	"database/sql/driver"
5	"fmt"
6	"net/netip"
7	"strings"
8	)
9
10	type Inet struct {
11	netip.Prefix
12	}
13
14	// Scan implements the sql.Scanner interface.
NEW 15	func (i *Inet) Scan(src any) error {	×
NEW 16	switch v := src.(type) {	×
NEW 17	case []byte:	×
NEW 18	return i.Prefix.UnmarshalBinary(v)	×
NEW 19	case string:	×
NEW 20	if strings.Contains(v, "/") {	×
NEW 21	return i.Prefix.UnmarshalText([]byte(v))	×
NEW 22	}	×
NEW 23	addr, err := netip.ParseAddr(v)	×
NEW 24	if err != nil {	×
NEW 25	return err	×
NEW 26	}	×
NEW 27	i.Prefix = netip.PrefixFrom(addr, addr.BitLen())	×
NEW 28	return nil	×
NEW 29	default:	×
NEW 30	return fmt.Errorf("cannot scan type %T: %v", src, src)	×
31	}
32	}
33
34	// Value implements the driver.Valuer interface.
NEW 35	func (i Inet) Value() (driver.Value, error) {	×
NEW 36	return i.Prefix.MarshalText()	×
NEW 37	}	×

stephenafamo / bob / 9448582135

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous