From 4ffda9ad3b729524ef20b7bede7de1606975d627 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Mon, 5 Oct 2015 17:45:42 -0400 Subject: [PATCH] Fix corners after dropping a couple merges --- cmd/cayleyupgrade/cayleyupgrade.go | 2 +- graph/sql/quadstore.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/cayleyupgrade/cayleyupgrade.go b/cmd/cayleyupgrade/cayleyupgrade.go index f8153be..146dd57 100644 --- a/cmd/cayleyupgrade/cayleyupgrade.go +++ b/cmd/cayleyupgrade/cayleyupgrade.go @@ -22,8 +22,8 @@ import ( "os" "github.com/barakmich/glog" - "github.com/google/cayley/config" "github.com/google/cayley/graph" + "github.com/google/cayley/internal/config" // Load all supported backends. diff --git a/graph/sql/quadstore.go b/graph/sql/quadstore.go index b8ace88..db5aaa4 100644 --- a/graph/sql/quadstore.go +++ b/graph/sql/quadstore.go @@ -20,7 +20,13 @@ import ( const QuadStoreType = "sql" func init() { - graph.RegisterQuadStore(QuadStoreType, true, newQuadStore, createSQLTables, nil) + graph.RegisterQuadStore(QuadStoreType, graph.QuadStoreRegistration{ + NewFunc: newQuadStore, + NewForRequestFunc: nil, + UpgradeFunc: nil, + InitFunc: createSQLTables, + IsPersistent: true, + }) } var (