scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-09 20:37:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Work-around for bug in query service.

Browse source 
This is a temporary fix which works around the bug introduced in the
query service. That bug requires a databaseID at all times. This commit
lets a user configure fbsql with a databaseID.
This commit is contained in:
Travis Turner 2023-03-19 13:42:20 -05:00
parent 2c3be9d1e8
commit 162ac1c33b
No known key found for this signature in database
GPG key ID: 3FB5CF5C97A37B30
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli/cli.go
View file

@ -101,6 +101,7 @@ func NewCommand(logdest logger.Logger) *Command {
OrganizationID: "",
Database: "",
DatabaseID: "",
CloudAuth: CloudAuthConfig{
ClientID: defaultClientID,
@ -376,6 +377,7 @@ func (cmd *Command) setupConfig() error {
cmd.organizationID = cmd.Config.OrganizationID
cmd.database = cmd.Config.Database
cmd.databaseID = cmd.Config.DatabaseID
cmd.historyPath = cmd.Config.HistoryPath
@ -487,6 +489,12 @@ func (cmd *Command) connectToDatabase(dbName string) error {
p = newNopPrinter()
}
if cmd.databaseID != "" {
cmd.databaseName = "(set by id)"
p.Printf(cmd.connectionMessage())
return nil
}
if dbName == "" {
cmd.databaseID = ""
cmd.databaseName = ""

1
cli/config.go
View file

@ -7,6 +7,7 @@ type Config struct {
OrganizationID string `json:"org-id"`
Database string `json:"db"`
DatabaseID string `json:"db-id"`
// CloudAuth
CloudAuth CloudAuthConfig `json:"cloud-auth"`

1
cmd/fbsql/main.go
View file

@ -52,6 +52,7 @@ func buildFlags(cmd *cobra.Command, cliCmd *cli.Command) {
flags.StringVar(&cliCmd.Config.HistoryPath, "history-path", cliCmd.Config.HistoryPath, "path for history files.")
flags.StringVar(&cliCmd.Config.OrganizationID, "org-id", cliCmd.Config.OrganizationID, "OrganizationID.")
flags.StringVarP(&cliCmd.Config.Database, "dbname", "d", cliCmd.Config.Database, "Name of the database to connect to.")
flags.StringVarP(&cliCmd.Config.DatabaseID, "db-id", "", cliCmd.Config.DatabaseID, "ID of the database to connect to (TEMPORARY).")
flags.StringVar(&cliCmd.Config.CloudAuth.ClientID, "client-id", cliCmd.Config.CloudAuth.ClientID, "Cognito Client ID for FeatureBase Cloud access.")
flags.StringVar(&cliCmd.Config.CloudAuth.Region, "region", cliCmd.Config.CloudAuth.Region, "Cloud region for FeatureBase Cloud access (e.g. us-east-2).")