Fixing travis test.

.travis.yml

@@ -23,18 +23,12 @@ env: GOARCH=amd64 TEST_HOST=127.0.0.1
 
 install:
   - mkdir -p $GOPATH/src/upper.io
-  - mv $PWD $GOPATH/src/upper.io/db
-  - cd $GOPATH/src/upper.io/db
+  - mv $PWD $GOPATH/src/upper.io/db.v2
+  - cd $GOPATH/src/upper.io/db.v2
   - ls -la
   - go get -v github.com/cznic/ql/ql
-  - 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
-  - go get -v github.com/jmoiron/sqlx
-  - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/db
+  - go get -v -t -d ./...
+  - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/db.v2
 
 before_script:
   - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
@@ -45,11 +39,11 @@ before_script:
   - (cd mongo/_dumps && make)
 
 script:
-  - cd $GOPATH/src/upper.io/db
+  - cd $GOPATH/src/upper.io/db.v2
   - go test -v .
-  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db/mysql
-  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db/postgresql
-# - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db/ql # Temporarily skipping benchmark, see https://github.com/cznic/ql/issues/107
-  - BENCHTIME=2s make test -C $GOPATH/src/upper.io/db/ql
-  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db/sqlite
-  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db/mongo
+  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db.v2/mysql
+  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db.v2/postgresql
+# - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db.v2/ql # Temporarily skipping benchmark, see https://github.com/cznic/ql/issues/107
+  - BENCHTIME=2s make test -C $GOPATH/src/upper.io/db.v2/ql
+  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db.v2/sqlite
+  - BENCHTIME=2s make bench -C $GOPATH/src/upper.io/db.v2/mongo