Merge pull request #193 from Brendonovich/fix-file-paths

only treat schema urls as relative
Brendonovich · Oct 28, 2022 · e12e693 · e12e693
2 parents ec2ac40 + 7f7d34f
commit e12e693
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/cli/src/generator/client.rs b/cli/src/generator/client.rs
@@ -84,23 +84,23 @@ pub fn generate(args: &GenerateArgs) -> TokenStream {
                 let url = match self.url {
                     Some(url) => url,
                     None => {
-                        if let Some(url) = source.load_shadow_database_url()? {
+                        let url = if let Some(url) = source.load_shadow_database_url()? {
                             url
                         } else {
                             source.load_url(|key| std::env::var(key).ok())?
-                        }
-                    }
-                };
+                        };
 
-                let url = match url.starts_with("file:") {
-                    true => {
-                        let path = url.split(":").nth(1).unwrap();
+                        match url.starts_with("file:") {
+                            true => {
+                                let path = url.split(":").nth(1).unwrap();
 
-                        if std::path::Path::new("./prisma/schema.prisma").exists() {
-                            format!("file:./prisma/{}", path)
-                        } else { url }
-                    },
-                    _ => url,
+                                if std::path::Path::new("./prisma/schema.prisma").exists() {
+                                    format!("file:./prisma/{}", path)
+                                } else { url }
+                            },
+                            _ => url,
+                        }
+                    }
                 };
 
                 let (db_name, executor) = #pcr::query_core::executor::load(&source, &[], &url).await?;