1
0
mirror of https://github.com/MontFerret/ferret.git synced 2025-07-13 01:20:35 +02:00

Merge branch 'master' of github.com:MontFerret/ferret into master

This commit is contained in:
Tim Voronov
2020-08-25 01:27:07 -04:00

View File

@ -3,12 +3,13 @@ package cli
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/MontFerret/ferret/pkg/compiler"
"github.com/MontFerret/ferret/pkg/runtime"
"github.com/MontFerret/ferret/pkg/runtime/logging"
"io/ioutil" "io/ioutil"
"os" "os"
"os/signal" "os/signal"
"github.com/MontFerret/ferret/pkg/compiler"
"github.com/MontFerret/ferret/pkg/runtime"
"github.com/MontFerret/ferret/pkg/runtime/logging"
) )
func ExecFile(pathToFile string, opts Options) { func ExecFile(pathToFile string, opts Options) {
@ -29,8 +30,8 @@ func Exec(query string, opts Options) {
prog, err := ferret.Compile(query) prog, err := ferret.Compile(query)
if err != nil { if err != nil {
fmt.Println("Failed to compile the query") fmt.Fprintln(os.Stderr, "Failed to compile the query")
fmt.Println(err) fmt.Fprintln(os.Stderr, err)
os.Exit(1) os.Exit(1)
return return
} }
@ -70,8 +71,8 @@ func Exec(query string, opts Options) {
} }
if err != nil { if err != nil {
fmt.Println("Failed to execute the query") fmt.Fprintln(os.Stderr, "Failed to execute the query")
fmt.Println(err) fmt.Fprintln(os.Stderr, err)
os.Exit(1) os.Exit(1)
return return
} }