Finish import of pgtype repo

Fix some tests that broke by merging repos
Tweak readme wording

pgtype/zeronull/float8.go

@@ -3,7 +3,7 @@ package zeronull
 import (
 	"database/sql/driver"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Float8 float64

pgtype/zeronull/float8_test.go

@@ -3,8 +3,8 @@ package zeronull_test
 import (
 	"testing"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestFloat8Transcode(t *testing.T) {

pgtype/zeronull/int2.go

@@ -3,7 +3,7 @@ package zeronull
 import (
 	"database/sql/driver"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Int2 int16

pgtype/zeronull/int2_test.go

@@ -3,8 +3,8 @@ package zeronull_test
 import (
 	"testing"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestInt2Transcode(t *testing.T) {

pgtype/zeronull/int4.go

@@ -3,7 +3,7 @@ package zeronull
 import (
 	"database/sql/driver"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Int4 int32

pgtype/zeronull/int4_test.go

@@ -3,8 +3,8 @@ package zeronull_test
 import (
 	"testing"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestInt4Transcode(t *testing.T) {

pgtype/zeronull/int8.go

@@ -3,7 +3,7 @@ package zeronull
 import (
 	"database/sql/driver"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Int8 int64

pgtype/zeronull/int8_test.go

@@ -3,8 +3,8 @@ package zeronull_test
 import (
 	"testing"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestInt8Transcode(t *testing.T) {

pgtype/zeronull/text.go

@@ -3,7 +3,7 @@ package zeronull
 import (
 	"database/sql/driver"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Text string

pgtype/zeronull/text_test.go

@@ -3,8 +3,8 @@ package zeronull_test
 import (
 	"testing"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestTextTranscode(t *testing.T) {

pgtype/zeronull/timestamp.go

@@ -4,7 +4,7 @@ import (
 	"database/sql/driver"
 	"time"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Timestamp time.Time

pgtype/zeronull/timestamp_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestTimestampTranscode(t *testing.T) {

pgtype/zeronull/timestamptz.go

@@ -4,7 +4,7 @@ import (
 	"database/sql/driver"
 	"time"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Timestamptz time.Time

pgtype/zeronull/timestamptz_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestTimestamptzTranscode(t *testing.T) {

pgtype/zeronull/uuid.go

@@ -3,7 +3,7 @@ package zeronull
 import (
 	"database/sql/driver"
 
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type UUID [16]byte

pgtype/zeronull/uuid_test.go

@@ -3,8 +3,8 @@ package zeronull_test
 import (
 	"testing"
 
-	"github.com/jackc/pgtype/testutil"
-	"github.com/jackc/pgtype/zeronull"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype/zeronull"
 )
 
 func TestUUIDTranscode(t *testing.T) {