Skip to content

Commit

Permalink
update all the imports to also be v2
Browse files Browse the repository at this point in the history
  • Loading branch information
chipaca committed Jun 28, 2021
1 parent 2c54167 commit e31d9c6
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 30 deletions.
2 changes: 1 addition & 1 deletion db/chain/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"
"sync"

"github.com/ShiftLeftSecurity/gaum/db/connection"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion db/chain/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"strings"

"github.com/ShiftLeftSecurity/gaum/db/errors"
"github.com/ShiftLeftSecurity/gaum/v2/db/errors"
"github.com/jackc/pgx/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion db/chain/segment.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package chain
import (
"strings"

"github.com/ShiftLeftSecurity/gaum/selectparse"
"github.com/ShiftLeftSecurity/gaum/v2/selectparse"
)

type sqlBool string
Expand Down
4 changes: 2 additions & 2 deletions db/chain/terminations.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package chain
import (
"context"

"github.com/ShiftLeftSecurity/gaum/db/connection"
gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion db/connection/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"
"time"

"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions db/connection_testing/connection_testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"testing"
"time"

"github.com/ShiftLeftSecurity/gaum/db/chain"
"github.com/ShiftLeftSecurity/gaum/db/connection"
"github.com/ShiftLeftSecurity/gaum/v2/db/chain"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
"github.com/jackc/pgconn"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
Expand Down
8 changes: 4 additions & 4 deletions db/postgres/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"os"
"reflect"

"github.com/ShiftLeftSecurity/gaum/db/connection"
gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"
"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/db/srm"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/srm"
"github.com/jackc/pgconn"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
Expand Down
6 changes: 3 additions & 3 deletions db/postgres/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os"
"testing"

"github.com/ShiftLeftSecurity/gaum/db/connection"
"github.com/ShiftLeftSecurity/gaum/db/connection_testing"
"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection_testing"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
)

func newDB(t *testing.T) connection.DB {
Expand Down
8 changes: 4 additions & 4 deletions db/postgrespq/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"os"
"reflect"

"github.com/ShiftLeftSecurity/gaum/db/connection"
gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"
"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/db/srm"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/srm"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v4/stdlib"
Expand Down
6 changes: 3 additions & 3 deletions db/postgrespq/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os"
"testing"

"github.com/ShiftLeftSecurity/gaum/db/connection"
"github.com/ShiftLeftSecurity/gaum/db/connection_testing"
"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection_testing"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
)

func newDB(t *testing.T) connection.DB {
Expand Down
10 changes: 5 additions & 5 deletions db/q/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (

"github.com/pkg/errors"

c "github.com/ShiftLeftSecurity/gaum/db/chain"
"github.com/ShiftLeftSecurity/gaum/db/connection"
"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/db/postgres"
"github.com/ShiftLeftSecurity/gaum/db/postgrespq"
c "github.com/ShiftLeftSecurity/gaum/v2/db/chain"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/postgres"
"github.com/ShiftLeftSecurity/gaum/v2/db/postgrespq"
)

// Driver represent the possible db connection drivers.
Expand Down
2 changes: 1 addition & 1 deletion db/srm/reflection.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"
"unicode"

"github.com/ShiftLeftSecurity/gaum/db/logging"
"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions gaum.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package gaum
import (
"context"

"github.com/ShiftLeftSecurity/gaum/db/connection"
"github.com/ShiftLeftSecurity/gaum/db/postgres"
"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
"github.com/ShiftLeftSecurity/gaum/v2/db/postgres"
"github.com/pkg/errors"
)

Expand Down
8 changes: 8 additions & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# github.com/jackc/chunkreader/v2 v2.0.1
github.com/jackc/chunkreader/v2
# github.com/jackc/pgconn v1.8.1
## explicit
github.com/jackc/pgconn
github.com/jackc/pgconn/internal/ctxwatch
github.com/jackc/pgconn/stmtcache
Expand All @@ -9,25 +10,30 @@ github.com/jackc/pgio
# github.com/jackc/pgpassfile v1.0.0
github.com/jackc/pgpassfile
# github.com/jackc/pgproto3/v2 v2.0.7
## explicit
github.com/jackc/pgproto3/v2
# github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b
github.com/jackc/pgservicefile
# github.com/jackc/pgtype v1.7.0
github.com/jackc/pgtype
# github.com/jackc/pgx/v4 v4.11.0
## explicit
github.com/jackc/pgx/v4
github.com/jackc/pgx/v4/internal/sanitize
github.com/jackc/pgx/v4/pgxpool
github.com/jackc/pgx/v4/stdlib
# github.com/jackc/puddle v1.1.3
github.com/jackc/puddle
# github.com/pkg/errors v0.8.1
## explicit
github.com/pkg/errors
# github.com/satori/go.uuid v1.2.0
## explicit
github.com/satori/go.uuid
# golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/crypto/pbkdf2
# golang.org/x/text v0.3.6
## explicit
golang.org/x/text/cases
golang.org/x/text/internal
golang.org/x/text/internal/language
Expand All @@ -41,3 +47,5 @@ golang.org/x/text/transform
golang.org/x/text/unicode/bidi
golang.org/x/text/unicode/norm
golang.org/x/text/width
# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
## explicit

0 comments on commit e31d9c6

Please sign in to comment.