Move Backend enum into cli module

bikeshedder · Jan 18, 2024 · a4dedcc · a4dedcc
1 parent af5b597
commit a4dedcc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/src/cli/schema/check.rs b/src/cli/schema/check.rs
@@ -1,7 +1,9 @@
 use anyhow::Result;
 use clap::Parser;
 
-use crate::{config::Config, Backend};
+use crate::config::Config;
+
+use super::Backend;
 
 #[derive(Debug, Parser)]
 pub struct CheckArgs {

diff --git a/src/cli/schema/diff.rs b/src/cli/schema/diff.rs
@@ -1,7 +1,9 @@
 use anyhow::Result;
 use clap::Parser;
 
-use crate::{config::Config, Backend};
+use crate::config::Config;
+
+use super::Backend;
 
 #[derive(Debug, Parser)]
 pub struct DiffArgs {
@@ -30,6 +32,8 @@ pub struct DiffArgs {
 pub async fn cmd(cfg: &Config, args: &DiffArgs) -> Result<()> {
     let client = cfg.database.connect().await?;
     let res = tusker_schema::inspect(&client).await?;
+    // Prepare from backend
+
     // FIXME this is work in progress
     for schema in res.values() {
         for table in schema.tables.values() {

diff --git a/src/cli/schema/mod.rs b/src/cli/schema/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use clap::{Parser, Subcommand};
+use clap::{Parser, Subcommand, ValueEnum};
 
 use crate::config::Config;
 
@@ -39,3 +39,19 @@ pub async fn cmd(cfg: &Config, args: &SchemaCommand) -> Result<()> {
     }
     Ok(())
 }
+
+#[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)]
+enum Backend {
+    Migrations,
+    Schema,
+    Database,
+}
+
+impl std::fmt::Display for Backend {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.to_possible_value()
+            .expect("no values are skipped")
+            .get_name()
+            .fmt(f)
+    }
+}
diff --git a/src/main.rs b/src/main.rs
@@ -5,22 +5,6 @@ use config::Config;
 pub mod cli;
 pub mod config;
 
-#[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)]
-enum Backend {
-    Migrations,
-    Schema,
-    Database,
-}
-
-impl std::fmt::Display for Backend {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.to_possible_value()
-            .expect("no values are skipped")
-            .get_name()
-            .fmt(f)
-    }
-}
-
 #[tokio::main]
 async fn main() -> Result<()> {
     let cfg = Config::new()?;