Separate program entry point from commands

2 files changed, 5 insertions, 2 deletions

diff --git a/pkg/query/errors.go b/pkg/query/errors.go
index 35f8c19..889d40d 100644
--- a/pkg/query/errors.go
+++ b/pkg/query/errors.go
@@ -6,7 +6,7 @@ import (
 )
 
 var ErrQueryFormat = errors.New("Incorrect query format")
-var ErrDatetimeTokenParse = errors.New("Unrecognized format for datetime token")
+var ErrDatetimeTokenParse = errors.New("Unrecognized format for datetime")
 
 // output errors
 var ErrUnrecognizedOutputToken = errors.New("Unrecognized output token")
diff --git a/pkg/query/parser.go b/pkg/query/parser.go
index e22b4c3..53681f6 100644
--- a/pkg/query/parser.go
+++ b/pkg/query/parser.go
@@ -549,7 +549,10 @@ func Parse(tokens []Token) (*Clause, error) {
 			var t time.Time
 			var err error
 			if t, err = util.ParseDateTime(token.Value); err != nil {
-				return nil, ErrDatetimeTokenParse
+				return nil, fmt.Errorf("Cannot parse time `%s`, %v",
+					token.Value,
+					ErrDatetimeTokenParse,
+				)
 			}
 
 			clause.Statements[len(clause.Statements)-1].Value = DatetimeValue{t}