Skip to content

Remove -file param in cql console command. #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auxten merged 1 commit into from
Aug 5, 2019
Merged

Remove -file param in cql console command. #363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions cmd/cql/internal/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ import (

// CmdConsole is cql console command entity.
var CmdConsole = &Command{
UsageLine: "cql console [common params] [-command sqlcommand] [-file filename] [-out outputfile] [-no-rc true/false] [-single-transaction] [-variable variables] [-explorer explorer_addr] [-adapter adapter_addr] [dsn]",
UsageLine: "cql console [common params] [-command sqlcommand] [-out outputfile] [-no-rc true/false] [-single-transaction] [-variable variables] [-explorer explorer_addr] [-adapter adapter_addr] [dsn]",
Short: "run a console for interactive sql operation",
Long: `
Console runs an interactive SQL console for CovenantSQL.
e.g.
cql console covenantsql://4119ef997dedc585bfbcfae00ab6b87b8486fab323a8e107ea1fd4fc4f7eba5c

There is also a -command param for SQL script, and a -file param for reading SQL in a file.
There is also a -command param for SQL script, and you can add "< file.sql" at end of command for executing a SQL file.
If those params are set, it will run SQL script and exit without staying console mode.
e.g.
cql console -command "create table test1(test2 int);" covenantsql://4119ef997dedc585bfbcfae00ab6b87b8486fab323a8e107ea1fd4fc4f7eba5c
Expand All @@ -72,7 +72,6 @@ var (
noRC bool
singleTransaction bool
command string
fileName string
)

func init() {
Expand All @@ -85,7 +84,6 @@ func init() {
CmdConsole.Flag.BoolVar(&noRC, "no-rc", false, "Do not read start up file")
CmdConsole.Flag.BoolVar(&singleTransaction, "single-transaction", false, "Execute as a single transaction (if non-interactive)")
CmdConsole.Flag.StringVar(&command, "command", "", "Run only single command (SQL or usql internal command) and exit")
CmdConsole.Flag.StringVar(&fileName, "file", "", "Execute commands from file and exit")
CmdConsole.Flag.StringVar(&adapterAddr, "adapter", "", "Address to serve a database chain adapter, e.g. :7784")
CmdConsole.Flag.StringVar(&explorerAddr, "explorer", "", "Address serve a database chain explorer, e.g. :8546")
}
Expand Down Expand Up @@ -261,7 +259,7 @@ func run(u *user.User) (err error) {
}

// create input/output
interactive := command != "" || fileName != ""
interactive := command != ""
l, err := rline.New(interactive, outFile, env.HistoryFile(u))
if err != nil {
return err
Expand Down Expand Up @@ -302,13 +300,6 @@ func run(u *user.User) (err error) {
SetExitStatus(1)
return
}
} else if fileName != "" {
// file
if err = h.Include(fileName, false); err != nil {
ConsoleLog.WithError(err).Error("run file failed")
SetExitStatus(1)
return
}
} else {
// interactive
if err = h.Run(); err != nil {
Expand Down