From 48c0cf5e2080e1466aded68ece72bce0d9a225c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Sun, 7 Jun 2015 06:30:36 -0500
Subject: [PATCH] Changing import paths.
---
.travis.yml | 28 ++++++++++++++--------------
README.md | 30 +++++++++++++++---------------
db.go | 10 +++++-----
db_test.go | 12 ++++++------
mongo/README.md | 6 +++---
mongo/_example/main.go | 4 ++--
mongo/collection.go | 2 +-
mongo/connection.go | 2 +-
mongo/connection_test.go | 2 +-
mongo/database.go | 4 ++--
mongo/database_test.go | 2 +-
mongo/result.go | 2 +-
mysql/README.md | 6 +++---
mysql/_example/main.go | 4 ++--
mysql/collection.go | 8 ++++----
mysql/connection.go | 2 +-
mysql/connection_test.go | 2 +-
mysql/database.go | 10 +++++-----
mysql/database_test.go | 4 ++--
mysql/mysql.go | 8 ++++----
postgresql/README.md | 6 +++---
postgresql/_example/main.go | 4 ++--
postgresql/collection.go | 8 ++++----
postgresql/connection.go | 2 +-
postgresql/connection_test.go | 2 +-
postgresql/database.go | 10 +++++-----
postgresql/database_test.go | 4 ++--
postgresql/postgresql.go | 8 ++++----
ql/_example/main.go | 4 ++--
ql/collection.go | 8 ++++----
ql/database.go | 10 +++++-----
ql/database_test.go | 4 ++--
ql/ql.go | 8 ++++----
sqlite/README.md | 6 +++---
sqlite/_example/main.go | 4 ++--
sqlite/collection.go | 8 ++++----
sqlite/database.go | 10 +++++-----
sqlite/database_test.go | 4 ++--
sqlite/sqlite.go | 8 ++++----
util/sqlutil/convert.go | 4 ++--
util/sqlutil/debug.go | 2 +-
util/sqlutil/fetch.go | 2 +-
util/sqlutil/result/result.go | 6 +++---
util/sqlutil/result/table.go | 2 +-
util/sqlutil/scanner.go | 2 +-
util/sqlutil/sqlutil.go | 2 +-
wrapper.go | 2 +-
47 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 640c3485..cad9991b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,18 @@ env: GOARCH=amd64 TEST_HOST=127.0.0.1 UPPERIO_DB_DEBUG=1
install:
- sudo apt-get install -y bzr make
- - mkdir -p $GOPATH/src/upper.io
- - mv $PWD $GOPATH/src/upper.io/db
- - cd $GOPATH/src/upper.io/db
+ - mkdir -p $GOPATH/src/upper.io/v2
+ - mv $PWD $GOPATH/src/upper.io/v2/db
+ - cd $GOPATH/src/upper.io/v2/db
- ls -la
- go get -v github.com/cznic/ql/ql # ql command line util.
- go get -v -t -d
- - go get -v -t -d upper.io/db/mysql
- - go get -v -t -d upper.io/db/sqlite
- - go get -v -t -d upper.io/db/postgresql
- - go get -v -t -d upper.io/db/mongo
- - go get -v -t -d upper.io/db/ql
- - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/db
+ - go get -v -t -d upper.io/v2/db/mysql
+ - go get -v -t -d upper.io/v2/db/sqlite
+ - go get -v -t -d upper.io/v2/db/postgresql
+ - go get -v -t -d upper.io/v2/db/mongo
+ - go get -v -t -d upper.io/v2/db/ql
+ - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/v2/db
services:
- mongodb
@@ -52,9 +52,9 @@ before_script:
script:
- (cd $GOPATH/src/github.com/jmoiron/sqlx && git pull -a && git checkout ptrs && go build -a && go install) # Peter's branch.
- - cd $GOPATH/src/upper.io/db
- - go test upper.io/db/mysql -test.bench=.
- - go test upper.io/db/sqlite -test.bench=.
- - go test upper.io/db/ql -test.bench=.
- - go test upper.io/db/mongo -test.bench=.
+ - cd $GOPATH/src/upper.io/v2/db
+ - go test upper.io/v2/db/mysql -test.bench=.
+ - go test upper.io/v2/db/sqlite -test.bench=.
+ - go test upper.io/v2/db/ql -test.bench=.
+ - go test upper.io/v2/db/mongo -test.bench=.
- go test -test.v
diff --git a/README.md b/README.md
index dd36fa94..595c9b08 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# upper.io/db
+# upper.io/v2/db
<center>
<img src="https://upper.io/images/icon.svg" width="256" />
@@ -8,15 +8,15 @@
## The `db` package
-
+
-`upper.io/db` is a [Go][2] package that allows developers to communicate with
+`upper.io/v2/db` is a [Go][2] package that allows developers to communicate with
different databases through the use of *adapters* that wrap well-supported
database drivers.
-## Is `upper.io/db` an ORM?
+## Is `upper.io/v2/db` an ORM?
-`upper.io/db` is not an ORM in the sense that it does not tell you how to
+`upper.io/v2/db` is not an ORM in the sense that it does not tell you how to
design your software or how to validate your data, instead it only focuses on
being a tool that deals with common operations on different databases:
@@ -29,26 +29,26 @@ res = col.Find(db.Cond{"name": "Max"}).Limit(10).Sort("-last_name")
err = res.All(&people)
```
-In strict sense `upper.io/db` could be considered a really basic non-magical
+In strict sense `upper.io/v2/db` could be considered a really basic non-magical
ORM that rather stays out of the way.
## Supported databases
-
+
-`upper.io/db` attempts to provide full compatiblity for [CRUD][2] operations
+`upper.io/v2/db` attempts to provide full compatiblity for [CRUD][2] operations
across adapters. Some other operations (such *transactions*) are supported only
on specific database adapters, such as MySQL, PostgreSQL and SQLite.
-* [MongoDB](https://upper.io/db/mongo) via [mgo](http://godoc.org/labix.org/v2/mgo)
-* [MySQL](https://upper.io/db/mysql) via [mysql](https://github.com/go-sql-driver/mysql)
-* [PostgreSQL](https://upper.io/db/postgresql) via [pq](https://github.com/lib/pq)
-* [QL](https://upper.io/db/ql) via [ql](https://github.com/cznic/ql)
-* [SQLite3](https://upper.io/db/sqlite) via [go-sqlite3](https://github.com/mattn/go-sqlite3)
+* [MongoDB](https://upper.io/v2/db/mongo) via [mgo](http://godoc.org/labix.org/v2/mgo)
+* [MySQL](https://upper.io/v2/db/mysql) via [mysql](https://github.com/go-sql-driver/mysql)
+* [PostgreSQL](https://upper.io/v2/db/postgresql) via [pq](https://github.com/lib/pq)
+* [QL](https://upper.io/v2/db/ql) via [ql](https://github.com/cznic/ql)
+* [SQLite3](https://upper.io/v2/db/sqlite) via [go-sqlite3](https://github.com/mattn/go-sqlite3)
## User documentation
-See the project page, recipes and user documentation at [upper.io/db][1].
+See the project page, recipes and user documentation at [upper.io/v2/db][1].
## License
@@ -73,6 +73,6 @@ See the project page, recipes and user documentation at [upper.io/db][1].
> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-[1]: https://upper.io/db
+[1]: https://upper.io/v2/db
[2]: http://golang.org
[3]: http://en.wikipedia.org/wiki/Create,_read,_update_and_delete
diff --git a/db.go b/db.go
index fd95c203..534adb08 100644
--- a/db.go
+++ b/db.go
@@ -22,26 +22,26 @@
// Package db provides a single interface for interacting with different data
// sources through the use of adapters that wrap well-known database drivers.
//
-// As of today, `upper.io/db` fully supports MySQL, PostgreSQL and SQLite (CRUD
+// As of today, `upper.io/v2/db` fully supports MySQL, PostgreSQL and SQLite (CRUD
// + Transactions) and provides partial support for MongoDB and QL (CRUD only).
//
// Usage:
//
// import(
// // Main package.
-// "upper.io/db"
+// "upper.io/v2/db"
// // PostgreSQL adapter.
-// "upper.io/db/postgresql"
+// "upper.io/v2/db/postgresql"
// )
//
-// `upper.io/db` is not an ORM and thus does not impose any hard restrictions
+// `upper.io/v2/db` is not an ORM and thus does not impose any hard restrictions
// on data structures:
//
// // This code works the same for all supported databases.
// var people []Person
// res = col.Find(db.Cond{"name": "Max"}).Limit(2).Sort("-input")
// err = res.All(&people)
-package db // import "upper.io/db"
+package db // import "upper.io/v2/db"
// Cond is a map used to define conditions passed to `db.Collection.Find()` and
// `db.Result.Where()`.
diff --git a/db_test.go b/db_test.go
index 9d9023c5..09226836 100644
--- a/db_test.go
+++ b/db_test.go
@@ -34,13 +34,13 @@ import (
"github.com/jmoiron/sqlx"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
- "upper.io/db"
- "upper.io/db/mongo"
+ "upper.io/v2/db"
+ "upper.io/v2/db/mongo"
- "upper.io/db/mysql"
- "upper.io/db/postgresql"
- "upper.io/db/ql"
- "upper.io/db/sqlite"
+ "upper.io/v2/db/mysql"
+ "upper.io/v2/db/postgresql"
+ "upper.io/v2/db/ql"
+ "upper.io/v2/db/sqlite"
)
var wrappers = []string{
diff --git a/mongo/README.md b/mongo/README.md
index ded918a2..3627fb22 100644
--- a/mongo/README.md
+++ b/mongo/README.md
@@ -1,6 +1,6 @@
-# MongoDB adapter for upper.io/db
+# MongoDB adapter for upper.io/v2/db
Please read the full docs, acknowledgements and examples at
-[https://upper.io/db/wrappers/mongo][1].
+[https://upper.io/v2/db/wrappers/mongo][1].
-[1]: https://upper.io/db/wrappers/mongo
+[1]: https://upper.io/v2/db/wrappers/mongo
diff --git a/mongo/_example/main.go b/mongo/_example/main.go
index 88420f85..b6635258 100644
--- a/mongo/_example/main.go
+++ b/mongo/_example/main.go
@@ -5,8 +5,8 @@ import (
"log"
"time"
- "upper.io/db" // Imports the main db package.
- _ "upper.io/db/mongo" // Imports the mongo adapter.
+ "upper.io/v2/db" // Imports the main db package.
+ _ "upper.io/v2/db/mongo" // Imports the mongo adapter.
)
var settings = db.Settings{
diff --git a/mongo/collection.go b/mongo/collection.go
index df339a01..ca0dfa36 100644
--- a/mongo/collection.go
+++ b/mongo/collection.go
@@ -30,7 +30,7 @@ import (
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
- "upper.io/db"
+ "upper.io/v2/db"
)
// Mongodb Collection
diff --git a/mongo/connection.go b/mongo/connection.go
index cb4917a0..f0a7f9cb 100644
--- a/mongo/connection.go
+++ b/mongo/connection.go
@@ -26,7 +26,7 @@ import (
"net/url"
"strings"
- "upper.io/db"
+ "upper.io/v2/db"
)
const connectionScheme = `mongodb`
diff --git a/mongo/connection_test.go b/mongo/connection_test.go
index 3e3f4328..2ca33718 100644
--- a/mongo/connection_test.go
+++ b/mongo/connection_test.go
@@ -24,7 +24,7 @@ package mongo
import (
"testing"
- "upper.io/db"
+ "upper.io/v2/db"
)
func TestConnectionURL(t *testing.T) {
diff --git a/mongo/database.go b/mongo/database.go
index b5148e2b..bc1d4bf5 100644
--- a/mongo/database.go
+++ b/mongo/database.go
@@ -19,7 +19,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-package mongo
+package mongo // import "upper.io/v2/db/mongo"
import (
"fmt"
@@ -29,7 +29,7 @@ import (
"time"
"gopkg.in/mgo.v2"
- "upper.io/db"
+ "upper.io/v2/db"
)
const Adapter = `mongo`
diff --git a/mongo/database_test.go b/mongo/database_test.go
index fe426bb7..8bfeef09 100644
--- a/mongo/database_test.go
+++ b/mongo/database_test.go
@@ -34,7 +34,7 @@ import (
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
"menteslibres.net/gosexy/to"
- "upper.io/db"
+ "upper.io/v2/db"
)
// Wrapper settings.
diff --git a/mongo/result.go b/mongo/result.go
index 8e6269b3..5609815e 100644
--- a/mongo/result.go
+++ b/mongo/result.go
@@ -29,7 +29,7 @@ import (
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
- "upper.io/db"
+ "upper.io/v2/db"
)
type Result struct {
diff --git a/mysql/README.md b/mysql/README.md
index c2262cd3..6cdb62fe 100644
--- a/mysql/README.md
+++ b/mysql/README.md
@@ -1,7 +1,7 @@
-# MySQL adapter for upper.io/db
+# MySQL adapter for upper.io/v2/db
See the full docs, acknowledgements and examples at
-[https://upper.io/db/mysql][1]
+[https://upper.io/v2/db/mysql][1]
-[1]: https://upper.io/db/mysql
+[1]: https://upper.io/v2/db/mysql
diff --git a/mysql/_example/main.go b/mysql/_example/main.go
index fa4d20f6..f2248a65 100644
--- a/mysql/_example/main.go
+++ b/mysql/_example/main.go
@@ -5,8 +5,8 @@ import (
"log"
"time"
- "upper.io/db" // Imports the main db package.
- _ "upper.io/db/mysql" // Improts the mysql adapter.
+ "upper.io/v2/db" // Imports the main db package.
+ _ "upper.io/v2/db/mysql" // Improts the mysql adapter.
)
var settings = db.Settings{
diff --git a/mysql/collection.go b/mysql/collection.go
index d510642b..383bbb9f 100644
--- a/mysql/collection.go
+++ b/mysql/collection.go
@@ -25,10 +25,10 @@ import (
"database/sql"
"strings"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/result"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/result"
)
type table struct {
diff --git a/mysql/connection.go b/mysql/connection.go
index faa3b4cf..68d583c5 100644
--- a/mysql/connection.go
+++ b/mysql/connection.go
@@ -26,7 +26,7 @@ import (
"net/url"
"strings"
- "upper.io/db"
+ "upper.io/v2/db"
)
const defaultPort = 3306
diff --git a/mysql/connection_test.go b/mysql/connection_test.go
index 1e833d1e..f700c9e6 100644
--- a/mysql/connection_test.go
+++ b/mysql/connection_test.go
@@ -24,7 +24,7 @@ package mysql
import (
"testing"
- "upper.io/db"
+ "upper.io/v2/db"
)
func TestConnectionURL(t *testing.T) {
diff --git a/mysql/database.go b/mysql/database.go
index df840b22..8bcb7ebb 100644
--- a/mysql/database.go
+++ b/mysql/database.go
@@ -28,11 +28,11 @@ import (
_ "github.com/go-sql-driver/mysql" // MySQL driver.
"github.com/jmoiron/sqlx"
- "upper.io/db"
- "upper.io/db/util/schema"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/tx"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/schema"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/tx"
)
var (
diff --git a/mysql/database_test.go b/mysql/database_test.go
index 5fd4d163..f3c9cc78 100644
--- a/mysql/database_test.go
+++ b/mysql/database_test.go
@@ -35,8 +35,8 @@ import (
"github.com/jmoiron/sqlx"
"menteslibres.net/gosexy/to"
- "upper.io/db"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlutil"
)
const (
diff --git a/mysql/mysql.go b/mysql/mysql.go
index 6cdf2d36..9d48672a 100644
--- a/mysql/mysql.go
+++ b/mysql/mysql.go
@@ -19,13 +19,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-package mysql
+package mysql // import "upper.io/v2/db/mysql"
import (
"upper.io/cache"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
)
// Adapter is the public name of the adapter.
diff --git a/postgresql/README.md b/postgresql/README.md
index f374a92b..2c1e7201 100644
--- a/postgresql/README.md
+++ b/postgresql/README.md
@@ -1,6 +1,6 @@
-# PostgreSQL adapter for upper.io/db
+# PostgreSQL adapter for upper.io/v2/db
Please read the full docs, acknowledgements and examples at
-[https://upper.io/db/postgresql][1]
+[https://upper.io/v2/db/postgresql][1]
-[1]: https://upper.io/db/postgresql
+[1]: https://upper.io/v2/db/postgresql
diff --git a/postgresql/_example/main.go b/postgresql/_example/main.go
index 63777145..a1e91606 100644
--- a/postgresql/_example/main.go
+++ b/postgresql/_example/main.go
@@ -5,8 +5,8 @@ import (
"log"
"time"
- "upper.io/db" // Imports the main db package.
- _ "upper.io/db/postgresql" // Imports the postgresql adapter.
+ "upper.io/v2/db" // Imports the main db package.
+ _ "upper.io/v2/db/postgresql" // Imports the postgresql adapter.
)
var settings = db.Settings{
diff --git a/postgresql/collection.go b/postgresql/collection.go
index 0158c17d..5f10d9f7 100644
--- a/postgresql/collection.go
+++ b/postgresql/collection.go
@@ -27,10 +27,10 @@ import (
"strings"
"github.com/jmoiron/sqlx"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/result"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/result"
)
type table struct {
diff --git a/postgresql/connection.go b/postgresql/connection.go
index 451383ce..4758a902 100644
--- a/postgresql/connection.go
+++ b/postgresql/connection.go
@@ -28,7 +28,7 @@ import (
"unicode"
"github.com/lib/pq"
- "upper.io/db"
+ "upper.io/v2/db"
)
// scanner implements a tokenizer for libpq-style option strings.
diff --git a/postgresql/connection_test.go b/postgresql/connection_test.go
index dd6cc0d1..2600b613 100644
--- a/postgresql/connection_test.go
+++ b/postgresql/connection_test.go
@@ -24,7 +24,7 @@ package postgresql
import (
"testing"
- "upper.io/db"
+ "upper.io/v2/db"
)
func TestConnectionURL(t *testing.T) {
diff --git a/postgresql/database.go b/postgresql/database.go
index a95c014c..4a03989b 100644
--- a/postgresql/database.go
+++ b/postgresql/database.go
@@ -30,11 +30,11 @@ import (
"github.com/jmoiron/sqlx"
_ "github.com/lib/pq" // PostgreSQL driver.
- "upper.io/db"
- "upper.io/db/util/schema"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/tx"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/schema"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/tx"
)
var (
diff --git a/postgresql/database_test.go b/postgresql/database_test.go
index 1dc7c3ca..45f0b818 100644
--- a/postgresql/database_test.go
+++ b/postgresql/database_test.go
@@ -35,8 +35,8 @@ import (
"math/rand"
"github.com/jmoiron/sqlx"
- "upper.io/db"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlutil"
)
const (
diff --git a/postgresql/postgresql.go b/postgresql/postgresql.go
index 7e8363cc..f15ef870 100644
--- a/postgresql/postgresql.go
+++ b/postgresql/postgresql.go
@@ -19,13 +19,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-package postgresql
+package postgresql // import "upper.io/v2/db/postgresql"
import (
"upper.io/cache"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
)
// Adapter is the public name of the adapter.
diff --git a/ql/_example/main.go b/ql/_example/main.go
index 297caef5..33a1c75f 100644
--- a/ql/_example/main.go
+++ b/ql/_example/main.go
@@ -5,8 +5,8 @@ import (
"log"
"time"
- "upper.io/db" // Imports the main db package.
- _ "upper.io/db/ql" // Imports the ql adapter.
+ "upper.io/v2/db" // Imports the main db package.
+ _ "upper.io/v2/db/ql" // Imports the ql adapter.
)
var settings = db.Settings{
diff --git a/ql/collection.go b/ql/collection.go
index 53a5d4c1..68b9cb3b 100644
--- a/ql/collection.go
+++ b/ql/collection.go
@@ -26,10 +26,10 @@ import (
"reflect"
"strings"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/result"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/result"
)
type table struct {
diff --git a/ql/database.go b/ql/database.go
index c6529044..0892610d 100644
--- a/ql/database.go
+++ b/ql/database.go
@@ -29,11 +29,11 @@ import (
_ "github.com/cznic/ql/driver" // QL driver
"github.com/jmoiron/sqlx"
- "upper.io/db"
- "upper.io/db/util/schema"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/tx"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/schema"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/tx"
)
var (
diff --git a/ql/database_test.go b/ql/database_test.go
index bc97d167..861dfedf 100644
--- a/ql/database_test.go
+++ b/ql/database_test.go
@@ -41,8 +41,8 @@ import (
"time"
"github.com/jmoiron/sqlx"
- "upper.io/db"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlutil"
)
const (
diff --git a/ql/ql.go b/ql/ql.go
index acffe02c..ce474954 100644
--- a/ql/ql.go
+++ b/ql/ql.go
@@ -19,13 +19,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-package ql
+package ql // import "upper.io/v2/db/ql"
import (
"upper.io/cache"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
)
// Adapter is the public name of the adapter.
diff --git a/sqlite/README.md b/sqlite/README.md
index 1c604de9..747a79d6 100644
--- a/sqlite/README.md
+++ b/sqlite/README.md
@@ -1,6 +1,6 @@
-# SQLite3 adapter for upper.io/db
+# SQLite3 adapter for upper.io/v2/db
Please read the full docs, acknowledgements and examples at
-[https://upper.io/db/sqlite][1]
+[https://upper.io/v2/db/sqlite][1]
-[1]: https://upper.io/db/sqlite
+[1]: https://upper.io/v2/db/sqlite
diff --git a/sqlite/_example/main.go b/sqlite/_example/main.go
index 0c5e1541..90596140 100644
--- a/sqlite/_example/main.go
+++ b/sqlite/_example/main.go
@@ -5,8 +5,8 @@ import (
"log"
"time"
- "upper.io/db" // Imports the main db package.
- _ "upper.io/db/sqlite" // Imports the sqlite adapter.
+ "upper.io/v2/db" // Imports the main db package.
+ _ "upper.io/v2/db/sqlite" // Imports the sqlite adapter.
)
var settings = db.Settings{
diff --git a/sqlite/collection.go b/sqlite/collection.go
index 0aadfcd0..aa9c63d3 100644
--- a/sqlite/collection.go
+++ b/sqlite/collection.go
@@ -26,10 +26,10 @@ import (
"database/sql"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/result"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/result"
)
type table struct {
diff --git a/sqlite/database.go b/sqlite/database.go
index 22de80bb..71f76e07 100644
--- a/sqlite/database.go
+++ b/sqlite/database.go
@@ -29,11 +29,11 @@ import (
"github.com/jmoiron/sqlx"
_ "github.com/mattn/go-sqlite3" // SQLite3 driver.
- "upper.io/db"
- "upper.io/db/util/schema"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
- "upper.io/db/util/sqlutil/tx"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/schema"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
+ "upper.io/v2/db/util/sqlutil/tx"
)
var (
diff --git a/sqlite/database_test.go b/sqlite/database_test.go
index e2296452..ba54503e 100644
--- a/sqlite/database_test.go
+++ b/sqlite/database_test.go
@@ -42,8 +42,8 @@ import (
"github.com/jmoiron/sqlx"
"menteslibres.net/gosexy/to"
- "upper.io/db"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlutil"
)
const (
diff --git a/sqlite/sqlite.go b/sqlite/sqlite.go
index ea66cafd..8ad04fa8 100644
--- a/sqlite/sqlite.go
+++ b/sqlite/sqlite.go
@@ -19,13 +19,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-package sqlite
+package sqlite // import "upper.io/v2/db/sqlite"
import (
"upper.io/cache"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
)
// Adapter is the public name of the adapter.
diff --git a/util/sqlutil/convert.go b/util/sqlutil/convert.go
index d7bc224c..96f2c552 100644
--- a/util/sqlutil/convert.go
+++ b/util/sqlutil/convert.go
@@ -4,8 +4,8 @@ import (
"fmt"
"reflect"
"strings"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
)
var (
diff --git a/util/sqlutil/debug.go b/util/sqlutil/debug.go
index f82a9857..eef4baf6 100644
--- a/util/sqlutil/debug.go
+++ b/util/sqlutil/debug.go
@@ -27,7 +27,7 @@ import (
"os"
"strings"
- "upper.io/db"
+ "upper.io/v2/db"
)
// Debug is used for printing SQL queries and arguments.
diff --git a/util/sqlutil/fetch.go b/util/sqlutil/fetch.go
index 13053d1d..9d1e1bc2 100644
--- a/util/sqlutil/fetch.go
+++ b/util/sqlutil/fetch.go
@@ -27,7 +27,7 @@ import (
"github.com/jmoiron/sqlx"
"github.com/jmoiron/sqlx/reflectx"
- "upper.io/db"
+ "upper.io/v2/db"
)
// FetchRow receives a *sqlx.Rows value and tries to map all the rows into a
diff --git a/util/sqlutil/result/result.go b/util/sqlutil/result/result.go
index 7badb0e7..2426cead 100644
--- a/util/sqlutil/result/result.go
+++ b/util/sqlutil/result/result.go
@@ -26,9 +26,9 @@ import (
"strings"
"github.com/jmoiron/sqlx"
- "upper.io/db"
- "upper.io/db/util/sqlgen"
- "upper.io/db/util/sqlutil"
+ "upper.io/v2/db"
+ "upper.io/v2/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlutil"
)
var (
diff --git a/util/sqlutil/result/table.go b/util/sqlutil/result/table.go
index 57ec42ac..0984adcd 100644
--- a/util/sqlutil/result/table.go
+++ b/util/sqlutil/result/table.go
@@ -3,7 +3,7 @@ package result
import (
"database/sql"
"github.com/jmoiron/sqlx"
- "upper.io/db/util/sqlgen"
+ "upper.io/v2/db/util/sqlgen"
)
type DataProvider interface {
diff --git a/util/sqlutil/scanner.go b/util/sqlutil/scanner.go
index 34bde7a0..270a501c 100644
--- a/util/sqlutil/scanner.go
+++ b/util/sqlutil/scanner.go
@@ -29,7 +29,7 @@ import (
"strconv"
"strings"
- "upper.io/db"
+ "upper.io/v2/db"
)
type scanner struct {
diff --git a/util/sqlutil/sqlutil.go b/util/sqlutil/sqlutil.go
index 4d2b54df..9b3ed2b4 100644
--- a/util/sqlutil/sqlutil.go
+++ b/util/sqlutil/sqlutil.go
@@ -29,7 +29,7 @@ import (
"strings"
"github.com/jmoiron/sqlx/reflectx"
- "upper.io/db"
+ "upper.io/v2/db"
)
var (
diff --git a/wrapper.go b/wrapper.go
index 058cf690..8e3d01af 100644
--- a/wrapper.go
+++ b/wrapper.go
@@ -53,7 +53,7 @@ func Open(adapter string, conn ConnectionURL) (Database, error) {
if ok == false {
// Using panic instead of returning error because attemping to use an
// adapter that does not exists will never result in success.
- panic(fmt.Sprintf(`Open: Unknown adapter %s. (see: https://upper.io/db#database-adapters)`, adapter))
+ panic(fmt.Sprintf(`Open: Unknown adapter %s. (see: https://upper.io/v2/db#database-adapters)`, adapter))
}
// Creating a new connection everytime Open() is called.
--
GitLab