Skip to content

Commit

Permalink
v4 - Updating imports and docs (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
doug-martin authored Mar 16, 2017
1 parent 118b59a commit 1255ecd
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![GitHub tag](https://img.shields.io/github/tag/doug-martin/goqu.svg?style=flat)](https://github.com/doug-martin/goqu/releases)
[![Build Status](https://travis-ci.org/doug-martin/goqu.svg?branch=master)](https://travis-ci.org/doug-martin/goqu)
[![GoDoc](https://godoc.org/github.com/doug-martin/goqu?status.png)](http://godoc.org/github.com/doug-martin/goqu)
[![GoCover](http://gocover.io/_badge/github.com/doug-martin/goqu)](http://gocover.io/github.com/doug-martin/goqu)
[![Coverage Status](https://coveralls.io/repos/github/C2FO/patio/badge.svg?branch=master)](https://coveralls.io/github/C2FO/patio?branch=master)
[![Join the chat at https://gitter.im/doug-martin/goqu](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/doug-martin/goqu?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

`goqu` is an expressive SQL builder
Expand Down
2 changes: 1 addition & 1 deletion adapters/mysql/dataset_adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/c2fo/testify/assert"
"github.com/c2fo/testify/suite"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

type datasetAdapterTest struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/mysql/mysql.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package mysql

import "gopkg.in/doug-martin/goqu.v3"
import "gopkg.in/doug-martin/goqu.v4"

var (
placeholder_rune = '?'
Expand Down
2 changes: 1 addition & 1 deletion adapters/mysql/mysql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/c2fo/testify/assert"
"github.com/c2fo/testify/suite"
_ "github.com/go-sql-driver/mysql"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion adapters/postgres/dataset_adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/c2fo/testify/suite"
"github.com/c2fo/testify/assert"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

type datasetAdapterTest struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/postgres/postgres.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package postgres

import (
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

const placeholder_rune = '$'
Expand Down
6 changes: 3 additions & 3 deletions adapters/postgres/postgres_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/c2fo/testify/assert"
"github.com/c2fo/testify/suite"
"github.com/lib/pq"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

const schema = `
Expand All @@ -36,7 +36,8 @@ const schema = `
(9, 0.900000, '0.900000', '2015-02-23T03:19:55.000000000-00:00', FALSE, '0.900000');
`

const default_db_uri ="postgres://postgres:@/goqupostgres?sslmode=disable"
const default_db_uri = "postgres://postgres:@/goqupostgres?sslmode=disable"

var db_uri string

func init() {
Expand Down Expand Up @@ -361,7 +362,6 @@ func (me *postgresTest) TestInsertIgnore() {
assert.Equal(t, count, 11)
}


func (me *postgresTest) TestInsertConflict() {
t := me.T()
ds := me.db.From("entry")
Expand Down
2 changes: 1 addition & 1 deletion adapters/sqlite3/dataset_adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/c2fo/testify/assert"
"github.com/c2fo/testify/suite"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

type datasetAdapterTest struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/sqlite3/sqlite3.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sqlite3

import "gopkg.in/doug-martin/goqu.v3"
import "gopkg.in/doug-martin/goqu.v4"

var (
placeholder_rune = '?'
Expand Down
4 changes: 2 additions & 2 deletions adapters/sqlite3/sqlite3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/c2fo/testify/assert"
"github.com/c2fo/testify/suite"
_ "github.com/mattn/go-sqlite3"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

const (
Expand Down Expand Up @@ -158,7 +158,7 @@ func (me *sqlite3Test) TestQuery() {
}

entries = entries[0:0]
assert.NoError(t, ds.Where(goqu.I("int").Between(goqu.RangeVal{Start:3,End:6})).Order(goqu.I("id").Asc()).ScanStructs(&entries))
assert.NoError(t, ds.Where(goqu.I("int").Between(goqu.RangeVal{Start: 3, End: 6})).Order(goqu.I("id").Asc()).ScanStructs(&entries))
assert.Len(t, entries, 4)
assert.NoError(t, err)
for _, entry := range entries {
Expand Down
4 changes: 2 additions & 2 deletions database.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ type (
// import (
// "database/sql"
// "fmt"
// "gopkg.in/doug-martin/goqu.v3"
// _ "gopkg.in/doug-martin/goqu.v3/adapters/postgres"
// "gopkg.in/doug-martin/goqu.v4"
// _ "gopkg.in/doug-martin/goqu.v4/adapters/postgres"
// _ "github.com/lib/pq"
// )
//
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
image: "golang:${GO_VERSION}"
command: bash -c "sleep 30 && go test -v -race ./..."
volumes:
- "./:/go/src/gopkg.in/doug-martin/goqu.v3"
- "./:/go/src/gopkg.in/doug-martin/goqu.v4"
environment:
MYSQL_URI: 'root@tcp(mysql:3306)/goqumysql?parseTime=true'
PG_URI: 'postgres://postgres:@postgres:5432/goqupostgres?sslmode=disable'
Expand Down
2 changes: 1 addition & 1 deletion example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"

"gopkg.in/DATA-DOG/go-sqlmock.v1"
"gopkg.in/doug-martin/goqu.v3"
"gopkg.in/doug-martin/goqu.v4"
)

var driver *sql.DB
Expand Down

0 comments on commit 1255ecd

Please sign in to comment.