diff --git a/.travis.yml b/.travis.yml index 395591e4d4cd56792144b3acefb28e3aca1f6745..ccf654a127b728bdd009b9af2397be95ff6cb2d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,11 @@ env: GOARCH=amd64 DB_HOST=127.0.0.1 install: - mkdir -p $GOPATH/src/upper.io - - mv $PWD $GOPATH/src/upper.io/db.v2 - - cd $GOPATH/src/upper.io/db.v2 + - mv $PWD $GOPATH/src/upper.io/db.v3 + - cd $GOPATH/src/upper.io/db.v3 - go get -t -v -d ./... - go get -v github.com/cznic/ql/ql - - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/db.v2 + - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/db.v3 before_script: - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql diff --git a/README.md b/README.md index 632dcf8583429f99b81f58910d6e8337bcf407cb..826a48df7068bfb0ccf106852f611d121093230e 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,22 @@ <img src="https://upper.io/db.v2/images/gopher.svg" width="256" /> </p> -# upper.io/db.v2 [](https://travis-ci.org/upper/db) [](https://godoc.org/upper.io/db.v2) +# upper.io/db.v3 [](https://travis-ci.org/upper/db) [](https://godoc.org/upper.io/db.v3) -The `upper.io/db.v2` package for [Go][2] is *not* an ORM, it's just a productive +The `upper.io/db.v3` package for [Go][2] is *not* an ORM, it's just a productive data access layer for Go which provides a common interface to work with -different data sources such as [PostgreSQL](https://upper.io/db.v2/postgresql), -[MySQL](https://upper.io/db.v2/mysql), [SQLite](https://upper.io/db.v2/sqlite), -[QL](https://upper.io/db.v2/ql) and [MongoDB](https://upper.io/db.v2/mongodb). +different data sources such as [PostgreSQL](https://upper.io/db.v3/postgresql), +[MySQL](https://upper.io/db.v3/mysql), [SQLite](https://upper.io/db.v3/sqlite), +[QL](https://upper.io/db.v3/ql) and [MongoDB](https://upper.io/db.v3/mongodb). ``` -go get upper.io/db.v2 +go get upper.io/db.v3 ``` ## User documentation This is the source code repository, see examples and documentation at -[upper.io/db.v2][1]. +[upper.io/db.v3][1]. ## Demo @@ -29,7 +29,7 @@ package main import ( "log" - "upper.io/db.v2/postgresql" + "upper.io/db.v3/postgresql" ) var settings = postgresql.ConnectionURL{ @@ -134,5 +134,5 @@ This project is licensed under the terms of the **MIT License**. * rjmcguire <<rjmcguire@gmail.com>> * wei2912 <<wei2912_support@hotmail.com>> -[1]: https://upper.io/db.v2 +[1]: https://upper.io/db.v3 [2]: http://golang.org diff --git a/_examples/booktown-books/main.go b/_examples/booktown-books/main.go index 1e3d5287b2b42c7e7dece3cfd905463f68712364..1584183f0f24337f81b15c31831e5f4c5b339283 100644 --- a/_examples/booktown-books/main.go +++ b/_examples/booktown-books/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "upper.io/db.v2/postgresql" + "upper.io/db.v3/postgresql" ) var settings = postgresql.ConnectionURL{ diff --git a/db.go b/db.go index 8bd3d2a4e43130ad3210b81dcfcea7de7597f9ea..c2f8a46c9cbe3e3a42a037f29075462264fc0c17 100644 --- a/db.go +++ b/db.go @@ -27,7 +27,7 @@ // driver. upper-db supports the MySQL, PostgreSQL, SQLite and QL databases and // provides partial support (CRUD, no transactions) for MongoDB. // -// go get upper.io/db.v2 +// go get upper.io/db.v3 // // Usage // @@ -36,7 +36,7 @@ // import ( // "log" // -// "upper.io/db.v2/postgresql" // Imports the postgresql adapter. +// "upper.io/db.v3/postgresql" // Imports the postgresql adapter. // ) // // var settings = postgresql.ConnectionURL{ @@ -73,15 +73,15 @@ // } // // See more usage examples and documentation for users at -// https://upper.io/db.v2. -package db // import "upper.io/db.v2" +// https://upper.io/db.v3. +package db // import "upper.io/db.v3" import ( "fmt" "reflect" "time" - "upper.io/db.v2/internal/immutable" + "upper.io/db.v3/internal/immutable" ) // Constraint interface represents a single condition, like "a = 1". where `a` diff --git a/db_test.go b/db_test.go index 324ffda9a1a5b5b7825ed476652adbd316c487b8..aa6a28fa44de984aeb07c7bc2f2b1158d9220c00 100644 --- a/db_test.go +++ b/db_test.go @@ -33,12 +33,12 @@ import ( "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "upper.io/db.v2" - "upper.io/db.v2/mongo" - "upper.io/db.v2/mysql" - "upper.io/db.v2/postgresql" - "upper.io/db.v2/ql" - "upper.io/db.v2/sqlite" + "upper.io/db.v3" + "upper.io/db.v3/mongo" + "upper.io/db.v3/mysql" + "upper.io/db.v3/postgresql" + "upper.io/db.v3/ql" + "upper.io/db.v3/sqlite" ) var wrappers = []string{ diff --git a/internal/cache/cache.go b/internal/cache/cache.go index d81cebe246f6ff0f768cee0d986dbd4d66afbf71..0c65b4685336a26e430d1c06a3ff36bcd33bb95f 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -28,7 +28,7 @@ import ( "strconv" "sync" - "upper.io/db.v2/internal/cache/hashstructure" + "upper.io/db.v3/internal/cache/hashstructure" ) const defaultCapacity = 128 diff --git a/internal/sqladapter/collection.go b/internal/sqladapter/collection.go index bb21e27a9e3fe6874374ef958fbfc9b545a26df5..320209dabea8f68921b13fc0e0e629ed3d9230c6 100644 --- a/internal/sqladapter/collection.go +++ b/internal/sqladapter/collection.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter/exql" ) // Collection represents a SQL table. diff --git a/internal/sqladapter/database.go b/internal/sqladapter/database.go index 6c63a2f50dcaaa798af2a8c6efdb25231cc5b01e..f38d9121e82e144a36a1bd5bade5b8e4d440ea89 100644 --- a/internal/sqladapter/database.go +++ b/internal/sqladapter/database.go @@ -8,10 +8,10 @@ import ( "sync/atomic" "time" - "upper.io/db.v2" - "upper.io/db.v2/internal/cache" - "upper.io/db.v2/internal/sqladapter/exql" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/cache" + "upper.io/db.v3/internal/sqladapter/exql" + "upper.io/db.v3/lib/sqlbuilder" ) var ( diff --git a/internal/sqladapter/exql/default.go b/internal/sqladapter/exql/default.go index abfc9a523f79667e4ce45ec160f0dbfda0f6b71e..2c3a4668ddb478211daeb2a34488d7ab58cf43a6 100644 --- a/internal/sqladapter/exql/default.go +++ b/internal/sqladapter/exql/default.go @@ -1,7 +1,7 @@ package exql import ( - "upper.io/db.v2/internal/cache" + "upper.io/db.v3/internal/cache" ) const ( diff --git a/internal/sqladapter/exql/hash.go b/internal/sqladapter/exql/hash.go index 90a610e5d32fc43a33703d962be65aab58195e32..48f3c2f06ea6ec3c6cc685ecb035a7d7d2ca936c 100644 --- a/internal/sqladapter/exql/hash.go +++ b/internal/sqladapter/exql/hash.go @@ -4,7 +4,7 @@ import ( "reflect" "sync/atomic" - "upper.io/db.v2/internal/cache" + "upper.io/db.v3/internal/cache" ) type hash struct { diff --git a/internal/sqladapter/exql/interfaces.go b/internal/sqladapter/exql/interfaces.go index 44b3e1c2603bdf407af16886bd540e39514b7180..fb0f43467307c9ffd719ae21cfaeabfa66ab0957 100644 --- a/internal/sqladapter/exql/interfaces.go +++ b/internal/sqladapter/exql/interfaces.go @@ -1,7 +1,7 @@ package exql import ( - "upper.io/db.v2/internal/cache" + "upper.io/db.v3/internal/cache" ) // Fragment is any interface that can be both cached and compiled. diff --git a/internal/sqladapter/exql/statement.go b/internal/sqladapter/exql/statement.go index 6453c86027fe4ba6ef4ae0bee4015d4b86ce957c..137e768545a1e51a9c71cb25d4f081722dcb9a5e 100644 --- a/internal/sqladapter/exql/statement.go +++ b/internal/sqladapter/exql/statement.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "upper.io/db.v2/internal/cache" + "upper.io/db.v3/internal/cache" ) // Statement represents different kinds of SQL statements. diff --git a/internal/sqladapter/exql/template.go b/internal/sqladapter/exql/template.go index 5b8637f971092e48be3c4a05873f3297fb95085c..8333f0e31d388384ce8fa2454b9ab4e8bacec9eb 100644 --- a/internal/sqladapter/exql/template.go +++ b/internal/sqladapter/exql/template.go @@ -5,7 +5,7 @@ import ( "sync" "text/template" - "upper.io/db.v2/internal/cache" + "upper.io/db.v3/internal/cache" ) // Type is the type of SQL query the statement represents. diff --git a/internal/sqladapter/result.go b/internal/sqladapter/result.go index d27525f701f2fb08c41daabd508f3f00df84b8cb..9520673c54dd00260cad6b201b2de97b008ad485 100644 --- a/internal/sqladapter/result.go +++ b/internal/sqladapter/result.go @@ -25,9 +25,9 @@ import ( "sync" "sync/atomic" - "upper.io/db.v2" - "upper.io/db.v2/internal/immutable" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/immutable" + "upper.io/db.v3/lib/sqlbuilder" ) type Result struct { diff --git a/internal/sqladapter/testing/adapter.go.tpl b/internal/sqladapter/testing/adapter.go.tpl index 34671fba8f47a5393683833bbd776f86722033fc..1ddd7fe651940c39c300fe44c88705cdc191638e 100644 --- a/internal/sqladapter/testing/adapter.go.tpl +++ b/internal/sqladapter/testing/adapter.go.tpl @@ -16,8 +16,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "upper.io/db.v2" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/lib/sqlbuilder" ) type customLogger struct { diff --git a/internal/sqladapter/tx.go b/internal/sqladapter/tx.go index e1a5dcd8d518f563cc312a68831b5b301d46b4f6..3239f3104f13839753f56085ee62d48d54095566 100644 --- a/internal/sqladapter/tx.go +++ b/internal/sqladapter/tx.go @@ -25,8 +25,8 @@ import ( "database/sql" "sync/atomic" - "upper.io/db.v2" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/lib/sqlbuilder" ) // DatabaseTx represents a database session within a transaction. diff --git a/lib/sqlbuilder/.travis.yml b/lib/sqlbuilder/.travis.yml index c6f97b1cdd2e63b36005532e1a8cfd17abc886bc..6e380aead4253276613feb1ce1e070fccbebde23 100644 --- a/lib/sqlbuilder/.travis.yml +++ b/lib/sqlbuilder/.travis.yml @@ -15,10 +15,10 @@ go: install: - mkdir -p $GOPATH/src/upper.io - - mv $PWD $GOPATH/src/upper.io/db.v2/lib/sqlbuilder - - cd $GOPATH/src/upper.io/db.v2/lib/sqlbuilder + - mv $PWD $GOPATH/src/upper.io/db.v3/lib/sqlbuilder + - cd $GOPATH/src/upper.io/db.v3/lib/sqlbuilder - go get -v -d -t ./... script: - - cd $GOPATH/src/upper.io/db.v2/lib/sqlbuilder + - cd $GOPATH/src/upper.io/db.v3/lib/sqlbuilder - make test diff --git a/lib/sqlbuilder/builder.go b/lib/sqlbuilder/builder.go index be5eaa8491f1e0721341468ff5a44b5a5a7bc41d..fb922dfb331142b5bf3ad7125b94c8ce9e3bf6bb 100644 --- a/lib/sqlbuilder/builder.go +++ b/lib/sqlbuilder/builder.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter/exql" - "upper.io/db.v2/lib/reflectx" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter/exql" + "upper.io/db.v3/lib/reflectx" ) // MapOptions represents options for the mapper. diff --git a/lib/sqlbuilder/builder_test.go b/lib/sqlbuilder/builder_test.go index 5c36603f3ff2c05fb66147ccc8072a3f4476c60c..8e78ef8b7c84c5651f17462acb0f75c988c6a3b4 100644 --- a/lib/sqlbuilder/builder_test.go +++ b/lib/sqlbuilder/builder_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" + "upper.io/db.v3" ) func TestSelect(t *testing.T) { diff --git a/lib/sqlbuilder/convert.go b/lib/sqlbuilder/convert.go index b8b2de4074a3e479c2a11f4432b61b4955494072..bdae020e25db7353a3ebf282a19d82875850030a 100644 --- a/lib/sqlbuilder/convert.go +++ b/lib/sqlbuilder/convert.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter/exql" ) var ( diff --git a/lib/sqlbuilder/delete.go b/lib/sqlbuilder/delete.go index 076162c641affd7bd851e4db0e5d89d4808cb8af..764460e645bfc37648145fa4bcee65cbd8464f8a 100644 --- a/lib/sqlbuilder/delete.go +++ b/lib/sqlbuilder/delete.go @@ -3,8 +3,8 @@ package sqlbuilder import ( "database/sql" - "upper.io/db.v2/internal/immutable" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/immutable" + "upper.io/db.v3/internal/sqladapter/exql" ) type deleterQuery struct { diff --git a/lib/sqlbuilder/fetch.go b/lib/sqlbuilder/fetch.go index b5bf577f029d71c6bcac3deeeac5e744dfaf37ba..c6620da70fe3bfb481e9c4e9953109090ca92c0a 100644 --- a/lib/sqlbuilder/fetch.go +++ b/lib/sqlbuilder/fetch.go @@ -26,8 +26,8 @@ import ( "encoding/json" "reflect" - "upper.io/db.v2" - "upper.io/db.v2/lib/reflectx" + "upper.io/db.v3" + "upper.io/db.v3/lib/reflectx" ) var mapper = reflectx.NewMapper("db") diff --git a/lib/sqlbuilder/insert.go b/lib/sqlbuilder/insert.go index 9cdee4d2dd11d64bc5c49747f9a7159fcea3aae4..17b8260e6ec687fc1829633edfbd04d9e1e624bb 100644 --- a/lib/sqlbuilder/insert.go +++ b/lib/sqlbuilder/insert.go @@ -3,8 +3,8 @@ package sqlbuilder import ( "database/sql" - "upper.io/db.v2/internal/immutable" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/immutable" + "upper.io/db.v3/internal/sqladapter/exql" ) type inserterQuery struct { diff --git a/lib/sqlbuilder/interfaces.go b/lib/sqlbuilder/interfaces.go index b94d90202e6ebdcd3224cf1df34af70114e00f5d..8684fd16f412aaed29030c277968b37d632d4d5a 100644 --- a/lib/sqlbuilder/interfaces.go +++ b/lib/sqlbuilder/interfaces.go @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The upper.io/db.v2/lib/sqlbuilder authors. All rights reserved. +// Copyright (c) 2015 The upper.io/db.v3/lib/sqlbuilder authors. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/lib/sqlbuilder/placeholder_test.go b/lib/sqlbuilder/placeholder_test.go index 80917b719549512a4d1051c3d55a66da0ca9a03c..37b311c1ef4f4a16d768b6d99558c0fc9bfbd762 100644 --- a/lib/sqlbuilder/placeholder_test.go +++ b/lib/sqlbuilder/placeholder_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" + "upper.io/db.v3" ) func TestPlaceholderSimple(t *testing.T) { diff --git a/lib/sqlbuilder/scanner.go b/lib/sqlbuilder/scanner.go index 46c4506aa85a626793ca01c0f25dffd09527ba0b..82de79d004b79e475c034575cb1ea749d8fe99e9 100644 --- a/lib/sqlbuilder/scanner.go +++ b/lib/sqlbuilder/scanner.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - "upper.io/db.v2" + "upper.io/db.v3" ) type scanner struct { diff --git a/lib/sqlbuilder/select.go b/lib/sqlbuilder/select.go index 4ebffd80daf49f399d930923411b825e7f34b5ec..9df30e276f8dbb1cd7b7cb8680bf1753eec4078e 100644 --- a/lib/sqlbuilder/select.go +++ b/lib/sqlbuilder/select.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "upper.io/db.v2" - "upper.io/db.v2/internal/immutable" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3" + "upper.io/db.v3/internal/immutable" + "upper.io/db.v3/internal/sqladapter/exql" ) type selectMode uint8 diff --git a/lib/sqlbuilder/template_test.go b/lib/sqlbuilder/template_test.go index d3f8c6e9e515aadef8c08d05a35e005b7f9b6702..ddae6da1b1e5fa9a9d3120b9d543542dce479e39 100644 --- a/lib/sqlbuilder/template_test.go +++ b/lib/sqlbuilder/template_test.go @@ -1,8 +1,8 @@ package sqlbuilder import ( - "upper.io/db.v2/internal/cache" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/cache" + "upper.io/db.v3/internal/sqladapter/exql" ) const ( diff --git a/lib/sqlbuilder/update.go b/lib/sqlbuilder/update.go index 5e831e1acadf3f11ca19b905e383bb1a587a9eab..56c071ec38bc4cc275667ac0d56c70137d4f02be 100644 --- a/lib/sqlbuilder/update.go +++ b/lib/sqlbuilder/update.go @@ -3,8 +3,8 @@ package sqlbuilder import ( "database/sql" - "upper.io/db.v2/internal/immutable" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/immutable" + "upper.io/db.v3/internal/sqladapter/exql" ) type updaterQuery struct { diff --git a/lib/sqlbuilder/wrapper.go b/lib/sqlbuilder/wrapper.go index 6214a6c6aa05a7cfb7711d2ed0d3ce917de08fea..2c2445d9b5b1b9bd8c5096920a06b5bd551fa6a0 100644 --- a/lib/sqlbuilder/wrapper.go +++ b/lib/sqlbuilder/wrapper.go @@ -26,7 +26,7 @@ import ( "fmt" "sync" - "upper.io/db.v2" + "upper.io/db.v3" ) var ( diff --git a/mongo/README.md b/mongo/README.md index 0e4319c454f3d56a7e9d87e41c962d3585c1cbbc..a23128caedf0b5c5272a5edddf7cfc79627b5e98 100644 --- a/mongo/README.md +++ b/mongo/README.md @@ -1,6 +1,6 @@ # MongoDB adapter for upper.io/db Please read the full docs, acknowledgements and examples at -[https://upper.io/db.v2/wrappers/mongo][1]. +[https://upper.io/db.v3/wrappers/mongo][1]. -[1]: https://upper.io/db.v2/wrappers/mongo +[1]: https://upper.io/db.v3/wrappers/mongo diff --git a/mongo/collection.go b/mongo/collection.go index b2ee28b8be8ed4e2335393cc2243d4d265ce5f56..e3b002182e2a47382432c1a2c872703363a839b0 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.v2" + "upper.io/db.v3" ) // Collection represents a mongodb collection. diff --git a/mongo/database.go b/mongo/database.go index 1bb48287748f6dd579500b5ab7bfaff06a411d16..2d92ac96787eb438d56c57efa2e3b7b4905ba3f3 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 // import "upper.io/db.v2/mongo" +package mongo // import "upper.io/db.v3/mongo" import ( "strings" @@ -27,7 +27,7 @@ import ( "time" "gopkg.in/mgo.v2" - "upper.io/db.v2" + "upper.io/db.v3" ) // Adapter holds the name of the mongodb adapter. diff --git a/mongo/database_test.go b/mongo/database_test.go index 5b3338898282002d65e4e91febb662ad55deea29..461b6465f836803dad2bf55c51d12f2d9dda2af2 100644 --- a/mongo/database_test.go +++ b/mongo/database_test.go @@ -31,7 +31,7 @@ import ( "time" "gopkg.in/mgo.v2/bson" - "upper.io/db.v2" + "upper.io/db.v3" ) // Global settings for tests. diff --git a/mongo/result.go b/mongo/result.go index f871edab38bdb95e5a64d44bbe225fea719a591e..fd9562d20d35aa9b11646e1b8fcd725e1b503d59 100644 --- a/mongo/result.go +++ b/mongo/result.go @@ -32,7 +32,7 @@ import ( "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "upper.io/db.v2" + "upper.io/db.v3" ) // result represents a query result. diff --git a/mysql/README.md b/mysql/README.md index 8d89e1b17f6ade67ac5b5469eb0e869b34e433fc..e5853b1064169f31bbc83b9504f120e27e3f4fee 100644 --- a/mysql/README.md +++ b/mysql/README.md @@ -1,7 +1,7 @@ # MySQL adapter for upper.io/db See the full docs, acknowledgements and examples at -[https://upper.io/db.v2/mysql][1] +[https://upper.io/db.v3/mysql][1] -[1]: https://upper.io/db.v2/mysql +[1]: https://upper.io/db.v3/mysql diff --git a/mysql/adapter_test.go b/mysql/adapter_test.go index 278bc167911830594e38e48d68ff3e23ee292177..7474407ca38bd92d2badba4b43562a59a59b2c9e 100644 --- a/mysql/adapter_test.go +++ b/mysql/adapter_test.go @@ -28,8 +28,8 @@ import ( "os" "time" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) const ( diff --git a/mysql/collection.go b/mysql/collection.go index e9af67b1580798cb3c42ef7095df7fba87aaf7d9..c14ec09dfaa60ca8bbde6f884cbbbfc3c8d475b2 100644 --- a/mysql/collection.go +++ b/mysql/collection.go @@ -24,9 +24,9 @@ package mysql import ( "database/sql" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) // table is the actual implementation of a collection. diff --git a/mysql/database.go b/mysql/database.go index 2cb66f7345ebb1975124604dafa19df84ffa6a6c..068865b3f9ab25cb9c645ebe0351ce93931efefc 100644 --- a/mysql/database.go +++ b/mysql/database.go @@ -28,10 +28,10 @@ import ( "database/sql" _ "github.com/go-sql-driver/mysql" // MySQL driver. - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/internal/sqladapter/exql" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/internal/sqladapter/exql" + "upper.io/db.v3/lib/sqlbuilder" ) // database is the actual implementation of Database diff --git a/mysql/mysql.go b/mysql/mysql.go index 5b6f26dad85518b6d1fbcbb8d1b904ddc909fb65..7f8da66efd0ae06889fc88cc555c0ec42313e6e6 100644 --- a/mysql/mysql.go +++ b/mysql/mysql.go @@ -19,16 +19,16 @@ // 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 // import "upper.io/db.v2/mysql" +package mysql // import "upper.io/db.v3/mysql" import ( "database/sql" "time" - "upper.io/db.v2" + "upper.io/db.v3" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) var ( diff --git a/mysql/stubs_test.go b/mysql/stubs_test.go index 4fd997e1c7b886eee462e06e3dd489f2597a4c30..6a1eb1acdfbe9a25db560912d9e25afda45ce2b9 100644 --- a/mysql/stubs_test.go +++ b/mysql/stubs_test.go @@ -6,7 +6,7 @@ import ( "log" "testing" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) func mustOpen() sqlbuilder.Database { diff --git a/mysql/template.go b/mysql/template.go index b81d4aae2fba5155eb0112b4baa7d6a0ab3259c1..976d4919c0a8f252e89af5026541f27e26728562 100644 --- a/mysql/template.go +++ b/mysql/template.go @@ -22,8 +22,8 @@ package mysql import ( - "upper.io/db.v2/internal/cache" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/cache" + "upper.io/db.v3/internal/sqladapter/exql" ) const ( diff --git a/mysql/template_test.go b/mysql/template_test.go index 725cd0b00dcc80119c54e3a95a4dbafbc1a1c58e..a71de967ed7ef209978e11de263d2793b63932b2 100644 --- a/mysql/template_test.go +++ b/mysql/template_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/lib/sqlbuilder" ) func TestTemplateSelect(t *testing.T) { diff --git a/mysql/tx.go b/mysql/tx.go index 63cc4a7f027683ed77e277206eee9397afe30664..1414572fc7e66e055c13e579a53a8567d003cd1c 100644 --- a/mysql/tx.go +++ b/mysql/tx.go @@ -22,8 +22,8 @@ package mysql import ( - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" ) type tx struct { diff --git a/postgresql/README.md b/postgresql/README.md index 370365fd94cf656da3a735bee7fdc223e750e579..4610b74d960610b4d42734691435fb925ac38e15 100644 --- a/postgresql/README.md +++ b/postgresql/README.md @@ -1,6 +1,6 @@ # PostgreSQL adapter for upper.io/db Please read the full docs, acknowledgements and examples at -[https://upper.io/db.v2/postgresql][1] +[https://upper.io/db.v3/postgresql][1] -[1]: https://upper.io/db.v2/postgresql +[1]: https://upper.io/db.v3/postgresql diff --git a/postgresql/adapter_test.go b/postgresql/adapter_test.go index 72ab2f253f32b11954885d0d0bdf306ae47085dd..df744657a6a25226de0eec3d383e36816023e72d 100644 --- a/postgresql/adapter_test.go +++ b/postgresql/adapter_test.go @@ -29,9 +29,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) const ( diff --git a/postgresql/collection.go b/postgresql/collection.go index fb6f89b4adb921265953ebd9c5b8b0ba9b4be7c3..1321f2d7148ab2cee6eed3c665eefafb12d35a27 100644 --- a/postgresql/collection.go +++ b/postgresql/collection.go @@ -24,9 +24,9 @@ package postgresql import ( "database/sql" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) // table is the actual implementation of a collection. diff --git a/postgresql/database.go b/postgresql/database.go index 8b92ba2de4431a108de5c934eb25cc038e90f110..a95975e62254ec84bf1854c94e202e29127d77b9 100644 --- a/postgresql/database.go +++ b/postgresql/database.go @@ -27,10 +27,10 @@ import ( "sync" _ "github.com/lib/pq" // PostgreSQL driver. - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/internal/sqladapter/exql" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/internal/sqladapter/exql" + "upper.io/db.v3/lib/sqlbuilder" ) // database is the actual implementation of Database diff --git a/postgresql/local_test.go b/postgresql/local_test.go index 82a9069e542b55f50cdaac63ed456be6fc4399d6..1b7b5950c42d9d4177da62ae5b7eb5cfdca22b90 100644 --- a/postgresql/local_test.go +++ b/postgresql/local_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" + "upper.io/db.v3" ) func TestStringAndInt64Array(t *testing.T) { diff --git a/postgresql/postgresql.go b/postgresql/postgresql.go index e0b87cf9d61518f3f97fdc18a3156b84e4ec02ec..bbbc5ffff83d522603ea0482873ab79aba3bf56f 100644 --- a/postgresql/postgresql.go +++ b/postgresql/postgresql.go @@ -19,16 +19,16 @@ // 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 // import "upper.io/db.v2/postgresql" +package postgresql // import "upper.io/db.v3/postgresql" import ( "database/sql" "time" - "upper.io/db.v2" + "upper.io/db.v3" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) var ( diff --git a/postgresql/stubs_test.go b/postgresql/stubs_test.go index c07cf41230300c889131187e7612d63143fe8763..cf1f28347efc50a5ede65bb612b880282d5a3848 100644 --- a/postgresql/stubs_test.go +++ b/postgresql/stubs_test.go @@ -6,7 +6,7 @@ import ( "log" "testing" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) func mustOpen() sqlbuilder.Database { diff --git a/postgresql/template.go b/postgresql/template.go index 5a986d93df32b635402196ea215f4b04754db9e2..13b5952c55be630c35ef95d69645e136130957a9 100644 --- a/postgresql/template.go +++ b/postgresql/template.go @@ -22,8 +22,8 @@ package postgresql import ( - "upper.io/db.v2/internal/cache" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/cache" + "upper.io/db.v3/internal/sqladapter/exql" ) const ( diff --git a/postgresql/template_test.go b/postgresql/template_test.go index fd1f237a8bea5273296fc6cc1f4a39dd84c3d30b..b71176e9f16eafea258f6d42aab7f49de437996a 100644 --- a/postgresql/template_test.go +++ b/postgresql/template_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/lib/sqlbuilder" ) func TestTemplateSelect(t *testing.T) { diff --git a/postgresql/tx.go b/postgresql/tx.go index 9d37aa9c69c0b30a18d252f3b5c0a8643bb9bc8e..4320e0f53ad0d1286f26cc70cbd0bf19b0775d2c 100644 --- a/postgresql/tx.go +++ b/postgresql/tx.go @@ -22,8 +22,8 @@ package postgresql import ( - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) type tx struct { diff --git a/ql/adapter_test.go b/ql/adapter_test.go index 2715c9b00f2832b2a15dddc5f1eb894dd534518a..2024b47da880299f135c2f5d0401e0a980f3e327 100644 --- a/ql/adapter_test.go +++ b/ql/adapter_test.go @@ -26,7 +26,7 @@ import ( "database/sql" "os" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) const ( diff --git a/ql/collection.go b/ql/collection.go index 7d8017706b55a1563f1d7b9a0cf126fe52421fd8..ff63992ddd0770a49f67504b79f575022c434fbf 100644 --- a/ql/collection.go +++ b/ql/collection.go @@ -24,9 +24,9 @@ package ql import ( "database/sql" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) // table is the actual implementation of a collection. diff --git a/ql/database.go b/ql/database.go index 59e2d48ff3a6e48e41a6dab53db8c92fa3306f6d..dd41ed68a6e9b620142398463a066994bc454a47 100644 --- a/ql/database.go +++ b/ql/database.go @@ -28,10 +28,10 @@ import ( "sync/atomic" _ "github.com/cznic/ql/driver" // QL driver - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/internal/sqladapter/exql" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/internal/sqladapter/exql" + "upper.io/db.v3/lib/sqlbuilder" ) // database is the actual implementation of Database diff --git a/ql/ql.go b/ql/ql.go index 3c9a06b2bebd4111e59ead015dd2ea164bd66278..2d8c3f57f00631a8aaea65cdcd6af4355b4dbeaa 100644 --- a/ql/ql.go +++ b/ql/ql.go @@ -19,10 +19,10 @@ // 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 // import "upper.io/db.v2/ql" +package ql // import "upper.io/db.v3/ql" import ( - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) const sqlDriver = `ql` diff --git a/ql/stubs_test.go b/ql/stubs_test.go index 58dda9591bc9c0fb7fe449effdb8e7edd8ea69d8..ba22dd17b926aef9fc619a6265b1749c59d0ef60 100644 --- a/ql/stubs_test.go +++ b/ql/stubs_test.go @@ -6,7 +6,7 @@ import ( "log" "testing" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) func mustOpen() sqlbuilder.Database { diff --git a/ql/template.go b/ql/template.go index e483ca0a838fe8c887814215f9ed3407a4622d4d..53a09d3f3ebcbcdf51db9f087e63e9a7b9863b8a 100644 --- a/ql/template.go +++ b/ql/template.go @@ -22,8 +22,8 @@ package ql import ( - "upper.io/db.v2/internal/cache" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/cache" + "upper.io/db.v3/internal/sqladapter/exql" ) const ( diff --git a/ql/template_test.go b/ql/template_test.go index 7feef59c5684ae5adb2d6a080ca9ebf241b553aa..23d3a7018f6e67b6d4af1d747889a7a90a75cd53 100644 --- a/ql/template_test.go +++ b/ql/template_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/lib/sqlbuilder" ) func TestTemplateSelect(t *testing.T) { diff --git a/ql/tx.go b/ql/tx.go index 146417317cdaa2621725e81f430bdaba09570cd9..0d5c6f9adb9a1f336cfd1e409841d61e5a064aba 100644 --- a/ql/tx.go +++ b/ql/tx.go @@ -22,8 +22,8 @@ package ql import ( - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) type tx struct { diff --git a/sqlite/README.md b/sqlite/README.md index f53f430f10b11dd3feaff4b93c07570de7f99fd2..2b5d6e83b3cb86c926575e5bf6844ffefee04b5b 100644 --- a/sqlite/README.md +++ b/sqlite/README.md @@ -1,6 +1,6 @@ # SQLite3 adapter for upper.io/db Please read the full docs, acknowledgements and examples at -[https://upper.io/db.v2/sqlite][1] +[https://upper.io/db.v3/sqlite][1] -[1]: https://upper.io/db.v2/sqlite +[1]: https://upper.io/db.v3/sqlite diff --git a/sqlite/adapter_test.go b/sqlite/adapter_test.go index 28eced22ededea0d5968740b28c24e09d49854f4..b34f05478f1703759e47e75079e13440b7856e3d 100644 --- a/sqlite/adapter_test.go +++ b/sqlite/adapter_test.go @@ -26,7 +26,7 @@ import ( "database/sql" "os" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) const ( diff --git a/sqlite/collection.go b/sqlite/collection.go index 6ad06ad929481b325f9ae4eac15bb74686779621..2f80152284964345905c3201cbfcf4c02f189be5 100644 --- a/sqlite/collection.go +++ b/sqlite/collection.go @@ -24,9 +24,9 @@ package sqlite import ( "database/sql" - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) // table is the actual implementation of a collection. diff --git a/sqlite/database.go b/sqlite/database.go index 96c85d7076c8b5aad702706b52904764dabbb28d..f1efa16707bb6a78d6d5fe9c0f9c7ffa56079007 100644 --- a/sqlite/database.go +++ b/sqlite/database.go @@ -29,10 +29,10 @@ import ( "sync/atomic" _ "github.com/mattn/go-sqlite3" // SQLite3 driver. - "upper.io/db.v2" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/internal/sqladapter/exql" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/internal/sqladapter/exql" + "upper.io/db.v3/lib/sqlbuilder" ) // database is the actual implementation of Database diff --git a/sqlite/sqlite.go b/sqlite/sqlite.go index 641b5d854aa76bb23e8c15e884a863895bdf62e7..894459a2e5d91da18caeeb23a60edf322426861f 100644 --- a/sqlite/sqlite.go +++ b/sqlite/sqlite.go @@ -19,15 +19,15 @@ // 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 // import "upper.io/db.v2/sqlite" +package sqlite // import "upper.io/db.v3/sqlite" import ( "database/sql" - "upper.io/db.v2" + "upper.io/db.v3" - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) const sqlDriver = `sqlite` diff --git a/sqlite/stubs_test.go b/sqlite/stubs_test.go index cd1dfdbc7673d285c5fe90f9bff2f8f3ef25a1c2..7b45ff61ded861c57b1d753502ef2ee75d58e607 100644 --- a/sqlite/stubs_test.go +++ b/sqlite/stubs_test.go @@ -6,7 +6,7 @@ import ( "log" "testing" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/lib/sqlbuilder" ) func mustOpen() sqlbuilder.Database { diff --git a/sqlite/template.go b/sqlite/template.go index 546fa57641e8e811a6c226d610f9972fb85a6462..fce9dd4bd6e23796e06ae4167948fe8c4d027ac2 100644 --- a/sqlite/template.go +++ b/sqlite/template.go @@ -22,8 +22,8 @@ package sqlite import ( - "upper.io/db.v2/internal/cache" - "upper.io/db.v2/internal/sqladapter/exql" + "upper.io/db.v3/internal/cache" + "upper.io/db.v3/internal/sqladapter/exql" ) const ( diff --git a/sqlite/template_test.go b/sqlite/template_test.go index 39f023f8ddce1b9d1a99f69f5c40a7e303024a80..80737a9a4ed4c60ff16443e97cd54aaffac3f2d8 100644 --- a/sqlite/template_test.go +++ b/sqlite/template_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "upper.io/db.v2" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3" + "upper.io/db.v3/lib/sqlbuilder" ) func TestTemplateSelect(t *testing.T) { diff --git a/sqlite/tx.go b/sqlite/tx.go index c39e76e0a80f20f5ce9f3e05fc24cd6e83b0d6e9..5917f29c3dc0950e32cd779ced8ef4c788dcbd3c 100644 --- a/sqlite/tx.go +++ b/sqlite/tx.go @@ -22,8 +22,8 @@ package sqlite import ( - "upper.io/db.v2/internal/sqladapter" - "upper.io/db.v2/lib/sqlbuilder" + "upper.io/db.v3/internal/sqladapter" + "upper.io/db.v3/lib/sqlbuilder" ) type tx struct {