unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 2 Actions 2 Packages Projects Releases 262 Wiki Activity

Explicitly set the table name during service init (#1497)

Browse Source
This commit is contained in:
Jake Sanders 2020-04-07 13:00:05 +01:00 committed by GitHub
parent 2ea5b33955
commit 71538adfdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service.go
View File

@ -106,12 +106,9 @@ func (s *service) Init(opts ...Option) {
logger.Fatal(err) logger.Fatal(err)
} }
// If the store has no Table set, fallback to the // Explicitly set the table name to the service name
// services name name := s.opts.Cmd.App().Name
if len(store.DefaultStore.Options().Table) == 0 { store.DefaultStore.Init(store.Table(name))
name := s.opts.Cmd.App().Name
store.DefaultStore.Init(store.Table(name))
}
// TODO: replace Cmd.Init with config.Load // TODO: replace Cmd.Init with config.Load
// Right now we're just going to load a token // Right now we're just going to load a token

27
store/cockroach/cockroach.go
View File

@ -14,11 +14,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
// DefaultNamespace is the namespace that the sql store // DefaultDatabase is the namespace that the sql store
// will use if no namespace is provided. // will use if no namespace is provided.
var ( var (
DefaultNamespace = "micro" DefaultDatabase = "micro"
DefaultPrefix = "micro"
) )
type sqlStore struct { type sqlStore struct {
@ -296,26 +295,26 @@ func (s *sqlStore) initDB() error {
func (s *sqlStore) configure() error { func (s *sqlStore) configure() error {
if len(s.options.Nodes) == 0 { if len(s.options.Nodes) == 0 {
s.options.Nodes = []string{"localhost:26257"} s.options.Nodes = []string{"postgresql://root@localhost:26257"}
} }
namespace := s.options.Database database := s.options.Database
if len(namespace) == 0 { if len(database) == 0 {
namespace = DefaultNamespace database = DefaultDatabase
} }
prefix := s.options.Table if len(s.options.Table) == 0 {
if len(prefix) == 0 { return errors.New("no table set")
prefix = DefaultPrefix
} }
table := s.options.Table
// store.namespace must only contain letters, numbers and underscores // store.namespace must only contain letters, numbers and underscores
reg, err := regexp.Compile("[^a-zA-Z0-9]+") reg, err := regexp.Compile("[^a-zA-Z0-9]+")
if err != nil { if err != nil {
return errors.New("error compiling regex for namespace") return errors.New("error compiling regex for namespace")
} }
namespace = reg.ReplaceAllString(namespace, "_") database = reg.ReplaceAllString(database, "_")
prefix = reg.ReplaceAllString(prefix, "_") table = reg.ReplaceAllString(table, "_")
source := s.options.Nodes[0] source := s.options.Nodes[0]
// check if it is a standard connection string eg: host=%s port=%d user=%s password=%s dbname=%s sslmode=disable // check if it is a standard connection string eg: host=%s port=%d user=%s password=%s dbname=%s sslmode=disable
@ -343,8 +342,8 @@ func (s *sqlStore) configure() error {
// save the values // save the values
s.db = db s.db = db
s.database = namespace s.database = database
s.table = prefix s.table = table
// initialise the database // initialise the database
return s.initDB() return s.initDB()