Merge pull request #313 from barakmich/fixes

Fix corners after causing a couple merges

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.
 

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 (