diff --git a/README.md b/README.md index 01e5997f..2b45671a 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/adapters/mysql/dataset_adapter_test.go b/adapters/mysql/dataset_adapter_test.go index b3a5e6df..7197936a 100644 --- a/adapters/mysql/dataset_adapter_test.go +++ b/adapters/mysql/dataset_adapter_test.go @@ -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 { diff --git a/adapters/mysql/mysql.go b/adapters/mysql/mysql.go index 405fd394..6adf368d 100644 --- a/adapters/mysql/mysql.go +++ b/adapters/mysql/mysql.go @@ -1,6 +1,6 @@ package mysql -import "gopkg.in/doug-martin/goqu.v3" +import "gopkg.in/doug-martin/goqu.v4" var ( placeholder_rune = '?' diff --git a/adapters/mysql/mysql_test.go b/adapters/mysql/mysql_test.go index b6b76a04..cb07a5ba 100644 --- a/adapters/mysql/mysql_test.go +++ b/adapters/mysql/mysql_test.go @@ -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 ( diff --git a/adapters/postgres/dataset_adapter_test.go b/adapters/postgres/dataset_adapter_test.go index 7c9fc6a0..87564479 100644 --- a/adapters/postgres/dataset_adapter_test.go +++ b/adapters/postgres/dataset_adapter_test.go @@ -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 { diff --git a/adapters/postgres/postgres.go b/adapters/postgres/postgres.go index 096cad2e..baae5715 100644 --- a/adapters/postgres/postgres.go +++ b/adapters/postgres/postgres.go @@ -1,7 +1,7 @@ package postgres import ( - "gopkg.in/doug-martin/goqu.v3" + "gopkg.in/doug-martin/goqu.v4" ) const placeholder_rune = '$' diff --git a/adapters/postgres/postgres_test.go b/adapters/postgres/postgres_test.go index bfcb50b2..866c193d 100644 --- a/adapters/postgres/postgres_test.go +++ b/adapters/postgres/postgres_test.go @@ -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 = ` @@ -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() { @@ -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") diff --git a/adapters/sqlite3/dataset_adapter_test.go b/adapters/sqlite3/dataset_adapter_test.go index 0477df43..6f49776d 100644 --- a/adapters/sqlite3/dataset_adapter_test.go +++ b/adapters/sqlite3/dataset_adapter_test.go @@ -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 { diff --git a/adapters/sqlite3/sqlite3.go b/adapters/sqlite3/sqlite3.go index ed50ebae..26219b2d 100644 --- a/adapters/sqlite3/sqlite3.go +++ b/adapters/sqlite3/sqlite3.go @@ -1,6 +1,6 @@ package sqlite3 -import "gopkg.in/doug-martin/goqu.v3" +import "gopkg.in/doug-martin/goqu.v4" var ( placeholder_rune = '?' diff --git a/adapters/sqlite3/sqlite3_test.go b/adapters/sqlite3/sqlite3_test.go index bd33fff1..af812d88 100644 --- a/adapters/sqlite3/sqlite3_test.go +++ b/adapters/sqlite3/sqlite3_test.go @@ -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 ( @@ -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 { diff --git a/database.go b/database.go index 47a84e6a..fdb457e5 100644 --- a/database.go +++ b/database.go @@ -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" // ) // diff --git a/docker-compose.yml b/docker-compose.yml index 683e9b66..14027b97 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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' diff --git a/example_test.go b/example_test.go index 3014da01..e116bc0c 100644 --- a/example_test.go +++ b/example_test.go @@ -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