Merge pull request #250 from bobbyrullo/fix_dex

db, functional: make value column in key not pkey

db/key.go

@@ -27,7 +27,6 @@ func init() {
 		name:    keyTableName,
 		model:   privateKeySetBlob{},
 		autoinc: false,
-		pkey:    []string{"value"},
 	})
 }
 

db/migrations/0009_key_not_primary_key.sql

+-- +migrate Up
+ALTER TABLE key ADD COLUMN tmp_value bytea;
+UPDATE KEY SET tmp_value = value;
+ALTER TABLE key DROP COLUMN value;
+ALTER TABLE key RENAME COLUMN "tmp_value" to "value";

db/migrations/migrations.go

@@ -2,5 +2,5 @@ package migrations
 
 // To download go-bindata run `go get -u github.com/jteeuwen/go-bindata/...`
 
-//go:generate go-bindata -modtime=1 -pkg migrations -o assets.go ../
+//go:generate go-bindata -modtime=1 -pkg migrations -o assets.go -ignore \.go$ -prefix "../.." ../../db/migrations
 //go:generate gofmt -w assets.go

functional/db_test.go

@@ -45,7 +45,9 @@ func connect(t *testing.T) *gorp.DbMap {
 		panic(fmt.Sprintf("Unable to drop migration table: %v", err))
 	}
 
-	db.MigrateToLatest(c)
+	if _, err = db.MigrateToLatest(c); err != nil {
+		panic(fmt.Sprintf("Unable to migrate: %v", err))
+	}
 
 	return c
 }