diff --git a/src/lib.rs b/src/lib.rs index 9535ee9..d2cb226 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,7 +30,7 @@ pub trait ViewGenerator { ) -> Result; } -pub async fn lookup_parser( +pub async fn lookup_loader( connection_string: &str, schema_name: String, ) -> Result, SqlantError> { diff --git a/src/main.rs b/src/main.rs index ee9cfb4..91a2bc1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ use std::str::FromStr; use clap::ArgMatches; -use sqlant::{get_generator, lookup_parser, Direction, GeneratorConfigOptions, GeneratorType}; +use sqlant::{get_generator, lookup_loader, Direction, GeneratorConfigOptions, GeneratorType}; fn get_arg(args: &ArgMatches, arg_name: &str) -> String { args.get_one::(arg_name).unwrap().to_string() @@ -11,7 +11,7 @@ fn get_arg(args: &ArgMatches, arg_name: &str) -> String { async fn main() { let args = sqlant::cli::parse(); - let mut s = lookup_parser( + let mut s = lookup_loader( &get_arg(&args, "connection_string"), get_arg(&args, "schema"), ) diff --git a/tests/sql_loader_custom_schema_test.rs b/tests/sql_loader_custom_schema_test.rs index e66f0b7..3696a86 100644 --- a/tests/sql_loader_custom_schema_test.rs +++ b/tests/sql_loader_custom_schema_test.rs @@ -1,4 +1,4 @@ -use sqlant::{lookup_parser, sql_entities::ColumnConstraints::*, sql_entities::*}; +use sqlant::{lookup_loader, sql_entities::ColumnConstraints::*, sql_entities::*}; use std::{collections::BTreeMap, env}; mod utils; @@ -6,7 +6,7 @@ use crate::utils::check_fk; async fn load_erd() -> SqlERData { let con_string = env::var("CON_STRING").unwrap(); - let mut parser = lookup_parser(&con_string, "test_schema".to_string()) + let mut parser = lookup_loader(&con_string, "test_schema".to_string()) .await .unwrap(); parser.load_erd_data().await.unwrap() diff --git a/tests/sql_loader_test.rs b/tests/sql_loader_test.rs index ae0efe4..a7e0bbf 100644 --- a/tests/sql_loader_test.rs +++ b/tests/sql_loader_test.rs @@ -1,4 +1,4 @@ -use sqlant::{lookup_parser, sql_entities::ColumnConstraints::*, sql_entities::*}; +use sqlant::{lookup_loader, sql_entities::ColumnConstraints::*, sql_entities::*}; use std::sync::Arc; use std::{ collections::{BTreeMap, BTreeSet}, @@ -10,7 +10,7 @@ use crate::utils::check_fk; async fn load_erd() -> SqlERData { let con_string = env::var("CON_STRING").unwrap(); - let mut parser = lookup_parser(&con_string, "public".to_string()) + let mut parser = lookup_loader(&con_string, "public".to_string()) .await .unwrap(); parser.load_erd_data().await.unwrap()