From 5047f2c02ea25469aed1d58f646452dd7e13a2e7 Mon Sep 17 00:00:00 2001
From: Nickolay Ponomarev <asqueella@gmail.com>
Date: Fri, 3 May 2019 02:52:01 +0300
Subject: [PATCH] Remove the ansi-specific test file and update PG tests

- The ANSI dialect is now tested in `sqlparser_common.rs`
- Some PG testcases are also parsed by the generic dialect successfully,
  so test that.
---
 tests/sqlparser_ansi.rs     | 24 ------------------------
 tests/sqlparser_postgres.rs | 16 ++++------------
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 tests/sqlparser_ansi.rs

diff --git a/tests/sqlparser_ansi.rs b/tests/sqlparser_ansi.rs
deleted file mode 100644
index ab80ae92..00000000
--- a/tests/sqlparser_ansi.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#![warn(clippy::all)]
-
-use sqlparser::dialect::AnsiSqlDialect;
-use sqlparser::sqlast::*;
-use sqlparser::sqlparser::*;
-
-#[test]
-fn parse_simple_select() {
-    let sql = String::from("SELECT id, fname, lname FROM customer WHERE id = 1");
-    let mut ast = Parser::parse_sql(&AnsiSqlDialect {}, sql).unwrap();
-    assert_eq!(1, ast.len());
-    match ast.pop().unwrap() {
-        SQLStatement::SQLQuery(q) => match *q {
-            SQLQuery {
-                body: SQLSetExpr::Select(select),
-                ..
-            } => {
-                assert_eq!(3, select.projection.len());
-            }
-            _ => unreachable!(),
-        },
-        _ => unreachable!(),
-    }
-}
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
index f83bb308..557b7a98 100644
--- a/tests/sqlparser_postgres.rs
+++ b/tests/sqlparser_postgres.rs
@@ -2,7 +2,6 @@
 
 use sqlparser::dialect::{GenericSqlDialect, PostgreSqlDialect};
 use sqlparser::sqlast::*;
-use sqlparser::sqlparser::*;
 use sqlparser::test_utils::*;
 
 #[test]
@@ -28,7 +27,7 @@ fn parse_create_table_with_defaults() {
             create_date date DEFAULT now()::text NOT NULL,
             last_update timestamp without time zone DEFAULT now() NOT NULL,
             active integer NOT NULL)";
-    match one_statement_parses_to(sql, "") {
+    match pg_and_generic().one_statement_parses_to(sql, "") {
         SQLStatement::SQLCreateTable {
             name,
             columns,
@@ -74,7 +73,7 @@ fn parse_create_table_from_pg_dump() {
             release_year public.year,
             active integer
         )";
-    match one_statement_parses_to(sql, "") {
+    match pg().one_statement_parses_to(sql, "") {
         SQLStatement::SQLCreateTable {
             name,
             columns,
@@ -135,7 +134,7 @@ fn parse_create_table_with_inherit() {
                value text[], \
                use_metric boolean DEFAULT true\
                )";
-    match verified_stmt(sql) {
+    match pg().verified_stmt(sql) {
         SQLStatement::SQLCreateTable {
             name,
             columns,
@@ -185,18 +184,11 @@ Kwara & Kogi
 PHP	₱ USD $
 \N  Some other value
 \\."#;
-    let ast = one_statement_parses_to(sql, "");
+    let ast = pg_and_generic().one_statement_parses_to(sql, "");
     println!("{:#?}", ast);
     //assert_eq!(sql, ast.to_string());
 }
 
-fn one_statement_parses_to(sql: &str, canonical: &str) -> SQLStatement {
-    pg().one_statement_parses_to(sql, canonical)
-}
-fn verified_stmt(query: &str) -> SQLStatement {
-    pg().verified_stmt(query)
-}
-
 fn pg() -> TestedDialects {
     TestedDialects {
         dialects: vec![Box::new(PostgreSqlDialect {})],