nom-sql: Rename exported parsers for consistency

This will cause the format of a few of the parsers used in tests to
simply be `parse_<thing>`, which will match how we expose them when
wrapped in `readyset-sql-parsing`.

Change-Id: I6a6a6964ec9bd95c88f6b85f610bec20eec6b7a8
Reviewed-on: https://gerrit.readyset.name/c/readyset/+/9664
Tested-by: Buildkite CI
Reviewed-by: Mohamed Yasser Abdelhamed Abdeen <[email protected]>

Author: mvzink

nom-sql/src/parser.rs

@@ -129,7 +129,7 @@ macro_rules! export_parser {
 }
 
 export_parser!(sql_query -> SqlQuery, parse_query_bytes, parse_query);
-export_parser!(selection -> SelectStatement, parse_select_statement_bytes, parse_select_statement);
+export_parser!(selection -> SelectStatement, parse_select_statement_bytes, parse_select);
 export_parser!(expression -> Expr, parse_expr_bytes, parse_expr);
 export_parser!(create_table -> CreateTableStatement, parse_create_table_bytes, parse_create_table);
 export_parser!(view_creation -> CreateViewStatement, parse_create_view_bytes, parse_create_view);
@@ -141,7 +141,7 @@ export_parser!(
 export_parser!(
     key_specification -> TableKey,
     parse_key_specification_bytes,
-    parse_key_specification_string
+    parse_key_specification
 );
 export_parser!(
     type_identifier -> SqlType,

readyset-adapter/benches/hash.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use lru::LruCache;
-use nom_sql::parse_select_statement;
+use nom_sql::parse_select;
 use readyset_client::query::Query;
 use readyset_client::ViewCreateRequest;
 use xxhash_rust::xxh3;
@@ -14,7 +14,7 @@ fn hash_benchmarks(c: &mut Criterion) {
         .iter()
         .map(|q| {
             Query::Parsed(Arc::new(ViewCreateRequest {
-                statement: parse_select_statement(readyset_sql::Dialect::MySQL, q).unwrap(),
+                statement: parse_select(readyset_sql::Dialect::MySQL, q).unwrap(),
                 schema_search_path: vec!["public".into()],
             }))
         })

readyset-sql-parsing/src/lib.rs

@@ -599,7 +599,7 @@ pub fn parse_expr(dialect: Dialect, input: impl AsRef<str>) -> Result<Expr, Stri
 
 #[cfg(not(feature = "sqlparser"))]
 pub fn parse_select(dialect: Dialect, input: impl AsRef<str>) -> Result<SelectStatement, String> {
-    nom_sql::parse_select_statement(dialect, input.as_ref())
+    nom_sql::parse_select(dialect, input.as_ref())
 }
 
 /// Parses a single expression; only intended for use in tests.
@@ -608,7 +608,7 @@ pub fn parse_select(dialect: Dialect, input: impl AsRef<str>) -> Result<SelectSt
     parse_both_inner(
         dialect,
         input,
-        |d, s| nom_sql::parse_select_statement(d, s),
+        |d, s| nom_sql::parse_select(d, s),
         |p, d, s| parse_readyset_select(p, d, s),
     )
 }
@@ -738,7 +738,7 @@ pub fn parse_key_specification(
     dialect: Dialect,
     input: impl AsRef<str>,
 ) -> Result<TableKey, String> {
-    nom_sql::parse_key_specification_string(dialect, input.as_ref())
+    nom_sql::parse_key_specification(dialect, input.as_ref())
 }
 
 #[cfg(feature = "sqlparser")]
@@ -763,7 +763,7 @@ pub fn parse_key_specification(
     parse_both_inner(
         dialect,
         input,
-        |d, s| nom_sql::parse_key_specification_string(d, s),
+        |d, s| nom_sql::parse_key_specification(d, s),
         |p, d, s| parse_readyset_key_specification(p, d, s),
     )
 }

readyset-sql-passes/benches/adapter_rewrites.rs

@@ -1,11 +1,11 @@
 use criterion::{black_box, criterion_group, criterion_main, BatchSize, Bencher, Criterion};
-use nom_sql::parse_select_statement;
+use nom_sql::parse_select;
 use readyset_sql::Dialect;
 use readyset_sql_passes::adapter_rewrites;
 
 fn auto_parameterize_query(c: &mut Criterion) {
     let run_benchmark = |b: &mut Bencher, src: &str| {
-        let q = parse_select_statement(Dialect::MySQL, src).unwrap();
+        let q = parse_select(Dialect::MySQL, src).unwrap();
         b.iter_batched(
             || q.clone(),
             |mut q| {

readyset-sql-passes/src/adapter_rewrites/autoparameterize.rs

@@ -451,7 +451,7 @@ mod tests {
     use super::*;
 
     fn try_parse_select_statement(q: &str, dialect: Dialect) -> Result<SelectStatement, String> {
-        nom_sql::parse_select_statement(dialect, q)
+        nom_sql::parse_select(dialect, q)
     }
 
     fn parse_select_statement(q: &str, dialect: Dialect) -> SelectStatement {

readyset-sql-passes/src/adapter_rewrites/mod.rs

@@ -639,7 +639,7 @@ mod tests {
     use super::*;
 
     fn try_parse_select_statement(q: &str, dialect: Dialect) -> Result<SelectStatement, String> {
-        nom_sql::parse_select_statement(dialect, q)
+        nom_sql::parse_select(dialect, q)
     }
 
     fn parse_select_statement(q: &str, dialect: Dialect) -> SelectStatement {

readyset-sql-passes/src/strip_literals.rs

@@ -69,15 +69,15 @@ impl Borrow<SelectStatement> for SelectStatementSkeleton {
 
 #[cfg(test)]
 mod test {
-    use nom_sql::parse_select_statement;
+    use nom_sql::parse_select;
     use readyset_sql::ast::{ItemPlaceholder, Literal};
     use readyset_sql::Dialect;
 
     use crate::strip_literals::SelectStatementSkeleton;
 
     #[test]
     fn strips_all_literals() {
-        let select = parse_select_statement(
+        let select = parse_select(
             Dialect::MySQL,
             "SELECT \"literal\", a FROM t WHERE t.b = 1 OR (2 = 3) LIMIT ? OFFSET ?;",
         )
@@ -96,7 +96,7 @@ mod test {
         );
         assert_eq!(
             stmt.0,
-            parse_select_statement(
+            parse_select(
                 Dialect::MySQL,
                 "SELECT ?, a FROM t WHERE t.b = ? OR (? = ?) LIMIT ? OFFSET ?"
             )