Move tests using standard SQL from the postgresql-specific file

Author: nickolay

tests/sqlparser_generic.rs

@@ -7,6 +7,58 @@ use sqlparser::sqlast::*;
 use sqlparser::sqlparser::*;
 use sqlparser::sqltokenizer::*;
 
+#[test]
+fn parse_insert_values() {
+    let sql = "INSERT INTO customer VALUES(1, 2, 3)";
+    check_one(sql, "customer", vec![]);
+
+    let sql = "INSERT INTO public.customer VALUES(1, 2, 3)";
+    check_one(sql, "public.customer", vec![]);
+
+    let sql = "INSERT INTO db.public.customer VALUES(1, 2, 3)";
+    check_one(sql, "db.public.customer", vec![]);
+
+    let sql = "INSERT INTO public.customer (id, name, active) VALUES(1, 2, 3)";
+    check_one(
+        sql,
+        "public.customer",
+        vec!["id".to_string(), "name".to_string(), "active".to_string()],
+    );
+
+    fn check_one(sql: &str, expected_table_name: &str, expected_columns: Vec<String>) {
+        match verified_stmt(sql) {
+            SQLStatement::SQLInsert {
+                table_name,
+                columns,
+                values,
+                ..
+            } => {
+                assert_eq!(table_name.to_string(), expected_table_name);
+                assert_eq!(columns, expected_columns);
+                assert_eq!(
+                    vec![vec![
+                        ASTNode::SQLValue(Value::Long(1)),
+                        ASTNode::SQLValue(Value::Long(2)),
+                        ASTNode::SQLValue(Value::Long(3))
+                    ]],
+                    values
+                );
+            }
+            _ => unreachable!(),
+        }
+    }
+}
+
+#[test]
+fn parse_insert_invalid() {
+    let sql = "INSERT public.customer (id, name, active) VALUES (1, 2, 3)";
+    let res = parse_sql_statements(sql);
+    assert_eq!(
+        ParserError::ParserError("Expected INTO, found: public".to_string()),
+        res.unwrap_err()
+    );
+}
+
 #[test]
 fn parse_delete_statement() {
     let sql = "DELETE FROM \"table\"";
@@ -542,6 +594,30 @@ fn parse_create_external_table() {
     }
 }
 
+#[test]
+fn parse_alter_table_constraint_primary_key() {
+    let sql = "ALTER TABLE bazaar.address \
+               ADD CONSTRAINT address_pkey PRIMARY KEY (address_id)";
+    match verified_stmt(sql) {
+        SQLStatement::SQLAlterTable { name, .. } => {
+            assert_eq!(name.to_string(), "bazaar.address");
+        }
+        _ => unreachable!(),
+    }
+}
+
+#[test]
+fn parse_alter_table_constraint_foreign_key() {
+    let sql = "ALTER TABLE public.customer \
+        ADD CONSTRAINT customer_address_id_fkey FOREIGN KEY (address_id) REFERENCES public.address(address_id)";
+    match verified_stmt(sql) {
+        SQLStatement::SQLAlterTable { name, .. } => {
+            assert_eq!(name.to_string(), "public.customer");
+        }
+        _ => unreachable!(),
+    }
+}
+
 #[test]
 fn parse_scalar_function_in_projection() {
     let sql = "SELECT sqrt(id) FROM foo";

tests/sqlparser_postgres.rs

@@ -20,48 +20,6 @@ fn test_prev_index() {
     assert_eq!(parser.prev_token(), None);
 }
 
-#[test]
-fn parse_insert_values() {
-    let sql = "INSERT INTO customer VALUES(1, 2, 3)";
-    check_one(sql, "customer", vec![]);
-
-    let sql = "INSERT INTO public.customer VALUES(1, 2, 3)";
-    check_one(sql, "public.customer", vec![]);
-
-    let sql = "INSERT INTO db.public.customer VALUES(1, 2, 3)";
-    check_one(sql, "db.public.customer", vec![]);
-
-    let sql = "INSERT INTO public.customer (id, name, active) VALUES(1, 2, 3)";
-    check_one(
-        sql,
-        "public.customer",
-        vec!["id".to_string(), "name".to_string(), "active".to_string()],
-    );
-
-    fn check_one(sql: &str, expected_table_name: &str, expected_columns: Vec<String>) {
-        match verified_stmt(sql) {
-            SQLStatement::SQLInsert {
-                table_name,
-                columns,
-                values,
-                ..
-            } => {
-                assert_eq!(table_name.to_string(), expected_table_name);
-                assert_eq!(columns, expected_columns);
-                assert_eq!(
-                    vec![vec![
-                        ASTNode::SQLValue(Value::Long(1)),
-                        ASTNode::SQLValue(Value::Long(2)),
-                        ASTNode::SQLValue(Value::Long(3))
-                    ]],
-                    values
-                );
-            }
-            _ => unreachable!(),
-        }
-    }
-}
-
 #[test]
 fn parse_invalid_table_name() {
     let mut parser = parser("db.public..customer");
@@ -76,16 +34,6 @@ fn parse_no_table_name() {
     assert!(ast.is_err());
 }
 
-#[test]
-fn parse_insert_invalid() {
-    let sql = "INSERT public.customer (id, name, active) VALUES (1, 2, 3)";
-    let res = parse_sql_statements(sql);
-    assert_eq!(
-        ParserError::ParserError("Expected INTO, found: public".to_string()),
-        res.unwrap_err()
-    );
-}
-
 #[test]
 fn parse_create_table_with_defaults() {
     let sql = "CREATE TABLE public.customer (
@@ -234,30 +182,6 @@ fn parse_create_table_with_inherit() {
     }
 }
 
-#[test]
-fn parse_alter_table_constraint_primary_key() {
-    let sql = "ALTER TABLE bazaar.address \
-               ADD CONSTRAINT address_pkey PRIMARY KEY (address_id)";
-    match verified_stmt(sql) {
-        SQLStatement::SQLAlterTable { name, .. } => {
-            assert_eq!(name.to_string(), "bazaar.address");
-        }
-        _ => unreachable!(),
-    }
-}
-
-#[test]
-fn parse_alter_table_constraint_foreign_key() {
-    let sql = "ALTER TABLE public.customer \
-        ADD CONSTRAINT customer_address_id_fkey FOREIGN KEY (address_id) REFERENCES public.address(address_id)";
-    match verified_stmt(sql) {
-        SQLStatement::SQLAlterTable { name, .. } => {
-            assert_eq!(name.to_string(), "public.customer");
-        }
-        _ => unreachable!(),
-    }
-}
-
 #[test]
 fn parse_copy_example() {
     let sql = r#"COPY public.actor (actor_id, first_name, last_name, last_update, value) FROM stdin;