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

sql fixes

Browse Source
This commit is contained in:
Asim Aslam 2020-04-30 23:53:54 +01:00
parent 359b8bc503
commit c76a5e608d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
store/cockroach/cockroach.go
View File

@ -61,12 +61,12 @@ func (s *sqlStore) createDB(database, table string) {
func (s *sqlStore) initDB(database, table string) error { func (s *sqlStore) initDB(database, table string) error {
// Create the namespace's database // Create the namespace's database
_, err := s.db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s ;", database)) _, err := s.db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s;", database))
if err != nil { if err != nil {
return err return err
} }
_, err = s.db.Exec(fmt.Sprintf("SET DATABASE = %s ;", database)) _, err = s.db.Exec(fmt.Sprintf("SET DATABASE = %s;", database))
if err != nil { if err != nil {
return errors.Wrap(err, "Couldn't set database") return errors.Wrap(err, "Couldn't set database")
} }
@ -99,12 +99,12 @@ func (s *sqlStore) configure() error {
database := s.options.Database database := s.options.Database
if len(database) == 0 { if len(database) == 0 {
database = DefaultDatabase s.options.Database = DefaultDatabase
} }
table := s.options.Table table := s.options.Table
if len(table) == 0 { if len(table) == 0 {
table = DefaultTable s.options.Table = DefaultTable
} }
// store.namespace must only contain letters, numbers and underscores // store.namespace must only contain letters, numbers and underscores
@ -423,7 +423,11 @@ func (s *sqlStore) String() string {
// NewStore returns a new micro Store backed by sql // NewStore returns a new micro Store backed by sql
func NewStore(opts ...store.Option) store.Store { func NewStore(opts ...store.Option) store.Store {
var options store.Options options := store.Options{
Database: DefaultDatabase,
Table: DefaultTable,
}
for _, o := range opts { for _, o := range opts {
o(&options) o(&options)
} }