Improve empty query errors

src/sql/parser.rs

@@ -5,14 +5,10 @@ use std::str;
 
 #[allow(dead_code)]
 pub fn parse(input: &str) -> Result<Query, Error> {
-	match query(input) {
+	match input.trim().len() {
-		Ok((_, query)) => {
+		0 => Err(Error::EmptyError),
-			if query.empty() {
+		_ => match query(input) {
-				Err(Error::EmptyError)
+			Ok((_, query)) => Ok(query),
-			} else {
-				Ok(query)
-			}
-		}
 			Err(Err::Error(e)) => Err(Error::ParseError {
 				pos: input.len() - e.input.len(),
 				sql: String::from(e.input),
@@ -22,6 +18,7 @@ pub fn parse(input: &str) -> Result<Query, Error> {
 				sql: String::from(e.input),
 			}),
 			Err(Err::Incomplete(_)) => Err(Error::EmptyError),
+		},
 	}
 }
 

src/sql/query.rs

@@ -11,10 +11,6 @@ pub struct Query {
 }
 
 impl Query {
-	pub fn empty(&self) -> bool {
-		self.statements.len() == 0
-	}
-
 	pub fn statements(&self) -> &Vec<Statement> {
 		&self.statements.0
 	}