sql: add sql migrations

client/manager_sql.go

@@ -10,10 +10,14 @@ import (
  "github.com/pborman/uuid"
  "github.com/pkg/errors"
  "strings"
+ "github.com/rubenv/sql-migrate"
 )
 
-var sqlSchema = []string{
- `CREATE TABLE IF NOT EXISTS hydra_client (
+var migrations = &migrate.MemoryMigrationSource{
+ Migrations: []*migrate.Migration{
+ &migrate.Migration{
+ Id: "1",
+ Up: []string{`CREATE TABLE IF NOT EXISTS hydra_client (
  id varchar(255) NOT NULL PRIMARY KEY,
  client_name text NOT NULL,
  client_secret text NOT NULL,
@@ -28,7 +32,12 @@ var sqlSchema = []string{
  logo_uri text NOT NULL,
  contacts text NOT NULL,
  public boolean NOT NULL
-)`,
+)`},
+ Down: []string{
+ "DROP TABLE hydra_client",
+ },
+ },
+ },
 }
 
 type SQLManager struct {
@@ -109,10 +118,9 @@ func (d *sqlData) ToClient() *Client {
 }
 
 func (s *SQLManager) CreateSchemas() error {
- for _, query := range sqlSchema {
- if _, err := s.DB.Exec(query); err != nil {
- return errors.Wrapf(err, "Could not create schema:\n%s", query)
- }
+ n, err := migrate.Exec(s.DB.DB, s.DB.DriverName(), migrations, migrate.Up)
+ if err != nil {
+ return errors.Wrapf(err, "Could not migrate sql schema, applied %d migrations", n)
  }
  return nil
 }
@@ -191,7 +199,7 @@ func (m *SQLManager) CreateClient(c *Client) error {
  if _, err := m.DB.NamedExec(fmt.Sprintf(
  "INSERT INTO hydra_client (%s) VALUES (%s)",
  strings.Join(sqlParams, ", "),
- ":"+strings.Join(sqlParams, ", :"),
+ ":" + strings.Join(sqlParams, ", :"),
  ), data); err != nil {
  return errors.Wrap(err, "")
  }

glide.yaml

@@ -28,7 +28,7 @@ import:
  - token/hmac
  - token/jwt
 - package: github.com/ory-am/ladon
- version: ^0.3.4
+ version: ^0.4.0
 - package: github.com/pborman/uuid
  version: ^1.0.0
 - package: github.com/pkg/errors

jwk/manager_sql.go

@@ -7,21 +7,32 @@ import (
  "github.com/ory-am/hydra/pkg"
  "github.com/pkg/errors"
  "github.com/square/go-jose"
+ "github.com/rubenv/sql-migrate"
 )
 
 type SQLManager struct {
  DB *sqlx.DB
  Cipher *AEAD
 }
 
-var sqlSchema = []string{
- `CREATE TABLE IF NOT EXISTS hydra_jwk (
+var migrations = &migrate.MemoryMigrationSource{
+ Migrations: []*migrate.Migration{
+ &migrate.Migration{
+ Id: "1",
+ Up: []string{
+ `CREATE TABLE IF NOT EXISTS hydra_jwk (
  sid varchar(255) NOT NULL,
  kid varchar(255) NOT NULL,
  version int NOT NULL DEFAULT 0,
  keydata text NOT NULL,
  PRIMARY KEY (sid, kid)
 )`,
+ },
+ Down: []string{
+ "DROP TABLE hydra_jwk",
+ },
+ },
+ },
 }
 
 type sqlData struct {
@@ -32,10 +43,9 @@ type sqlData struct {
 }
 
 func (s *SQLManager) CreateSchemas() error {
- for _, query := range sqlSchema {
- if _, err := s.DB.Exec(query); err != nil {
- return errors.Wrapf(err, "Could not create schema:\n%s", query)
- }
+ n, err := migrate.Exec(s.DB.DB, s.DB.DriverName(), migrations, migrate.Up)
+ if err != nil {
+ return errors.Wrapf(err, "Could not migrate sql schema, applied %d migrations", n)
  }
  return nil
 }

oauth2/fosite_store_sql.go

@@ -13,6 +13,7 @@ import (
  "net/url"
  "strings"
  "time"
+ "github.com/rubenv/sql-migrate"
 )
 
 type FositeSQLStore struct {
@@ -34,17 +35,30 @@ func sqlTemplate(table string) string {
 }
 
 const (
- sqlTableOpenID  = "oidc"
- sqlTableAccess  = "access"
+ sqlTableOpenID = "oidc"
+ sqlTableAccess = "access"
  sqlTableRefresh = "refresh"
- sqlTableCode  = "code"
+ sqlTableCode = "code"
 )
 
-var sqlSchema = []string{
- sqlTemplate(sqlTableAccess),
- sqlTemplate(sqlTableRefresh),
- sqlTemplate(sqlTableCode),
- sqlTemplate(sqlTableOpenID),
+var migrations = &migrate.MemoryMigrationSource{
+ Migrations: []*migrate.Migration{
+ &migrate.Migration{
+ Id: "1",
+ Up: []string{
+ sqlTemplate(sqlTableAccess),
+ sqlTemplate(sqlTableRefresh),
+ sqlTemplate(sqlTableCode),
+ sqlTemplate(sqlTableOpenID),
+ },
+ Down: []string{
+ fmt.Sprintf("DROP TABLE %s", sqlTableAccess),
+ fmt.Sprintf("DROP TABLE %s", sqlTableRefresh),
+ fmt.Sprintf("DROP TABLE %s", sqlTableCode),
+ fmt.Sprintf("DROP TABLE %s", sqlTableOpenID),
+ },
+ },
+ },
 }
 
 var sqlParams = []string{
@@ -133,7 +147,7 @@ func (s *FositeSQLStore) createSession(signature string, requester fosite.Reques
  "INSERT INTO hydra_oauth2_%s (%s) VALUES (%s)",
  table,
  strings.Join(sqlParams, ", "),
- ":"+strings.Join(sqlParams, ", :"),
+ ":" + strings.Join(sqlParams, ", :"),
  )
  if _, err := s.DB.NamedExec(query, data); err != nil {
  return errors.Wrap(err, "")
@@ -160,10 +174,9 @@ func (s *FositeSQLStore) deleteSession(signature string, table string) error {
 }
 
 func (s *FositeSQLStore) CreateSchemas() error {
- for _, query := range sqlSchema {
- if _, err := s.DB.Exec(query); err != nil {
- return errors.Wrapf(err, "Could not create schema:\n%s", query)
- }
+ n, err := migrate.Exec(s.DB.DB, s.DB.DriverName(), migrations, migrate.Up)
+ if err != nil {
+ return errors.Wrapf(err, "Could not migrate sql schema, applied %d migrations", n)
  }
  return nil
 }