Merge pull request #53 from thomas-jeepe/master

Fix qualified wildcard stringifying

tests/sqlparser_generic.rs

@@ -90,6 +90,13 @@ fn parse_select_wildcard() {
     );
 }
 
+#[test]
+fn parse_count_wildcard() {
+    verified_only_select(
+        "SELECT COUNT(Employee.*) FROM Order JOIN Employee ON Order.employee = Employee.id",
+    );
+}
+
 #[test]
 fn parse_column_aliases() {
     let sql = "SELECT a.col + 1 AS newname FROM foo AS a";
@@ -147,6 +154,25 @@ fn parse_projection_nested_type() {
     //TODO: add assertions
 }
 
+#[test]
+fn parse_escaped_single_quote_string_predicate() {
+    use self::ASTNode::*;
+    use self::SQLOperator::*;
+    let sql = "SELECT id, fname, lname FROM customer \
+               WHERE salary != 'Jim''s salary'";
+    let ast = verified_only_select(sql);
+    assert_eq!(
+        Some(SQLBinaryExpr {
+            left: Box::new(SQLIdentifier("salary".to_string())),
+            op: NotEq,
+            right: Box::new(SQLValue(Value::SingleQuotedString(
+                "Jim's salary".to_string()
+            )))
+        }),
+        ast.selection,
+    );
+}
+
 #[test]
 fn parse_compound_expr_1() {
     use self::ASTNode::*;