Merge pull request #474 from splitgraph/refactor-context

chore: Refactor Seafowl context

src/cli/mod.rs

@@ -2,7 +2,7 @@ mod commands;
 mod helper;
 
 use crate::cli::commands::all_commands_info;
-use crate::context::{DefaultSeafowlContext, SeafowlContext};
+use crate::context::SeafowlContext;
 use arrow::util::pretty::pretty_format_batches_with_options;
 use commands::Command;
 use datafusion_common::Result;
@@ -14,12 +14,12 @@ use std::time::Instant;
 const SEAFOWL_CLI_HISTORY: &str = ".history";
 
 pub struct SeafowlCli {
-    ctx: Arc<DefaultSeafowlContext>,
+    ctx: Arc<SeafowlContext>,
 }
 
 impl SeafowlCli {
     // Instantiate new CLI instance
-    pub fn new(ctx: Arc<DefaultSeafowlContext>) -> Self {
+    pub fn new(ctx: Arc<SeafowlContext>) -> Self {
         SeafowlCli { ctx }
     }
 

src/config/context.rs

@@ -4,7 +4,7 @@ use crate::{
     catalog::{
         DefaultCatalog, FunctionCatalog, TableCatalog, DEFAULT_DB, DEFAULT_SCHEMA,
     },
-    context::DefaultSeafowlContext,
+    context::SeafowlContext,
     repository::{interface::Repository, sqlite::SqliteRepository},
 };
 use datafusion::execution::context::SessionState;
@@ -151,7 +151,7 @@ pub fn build_state_with_table_factories(
     state
 }
 
-pub async fn build_context(cfg: &schema::SeafowlConfig) -> Result<DefaultSeafowlContext> {
+pub async fn build_context(cfg: &schema::SeafowlConfig) -> Result<SeafowlContext> {
     let mut runtime_config = RuntimeConfig::new();
     if let Some(max_memory) = cfg.runtime.max_memory {
         runtime_config = runtime_config
@@ -203,7 +203,7 @@ pub async fn build_context(cfg: &schema::SeafowlConfig) -> Result<DefaultSeafowl
     // the user is connected to), but in this case we can just use the same context everywhere
     // (it will reload its schema before running the query)
 
-    Ok(DefaultSeafowlContext {
+    Ok(SeafowlContext {
         inner: context,
         table_catalog: tables,
         function_catalog: functions,
@@ -217,7 +217,6 @@ pub async fn build_context(cfg: &schema::SeafowlConfig) -> Result<DefaultSeafowl
 
 #[cfg(test)]
 mod tests {
-    use crate::context::SeafowlContext;
     use sqlx::sqlite::SqliteJournalMode;
 
     use super::*;