Merge remote-tracking branch 'upstream/master'

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "macro",
     "core",

attr/src/lib.rs

@@ -86,9 +86,17 @@ impl Intermediate {
 }
 
 pub fn schema_from_filepaths(paths: &[&Path]) -> anyhow::Result<OrmliteSchema> {
+    let invalid_paths = paths.iter().filter(|p| fs::metadata(p).is_err()).collect::<Vec<_>>();
+    if !invalid_paths.is_empty() {
+        for path in invalid_paths {
+            tracing::error!(path=path.display().to_string(), "Does not exist");
+        }
+        anyhow::bail!("Provided paths that did not exist.");
+    }
+
     let walk = paths.iter().flat_map(Walk::new);
 
-    let walk = walk.filter_map(|e| e.ok())
+    let walk = walk.map(|e| e.unwrap())
         .filter(|e| e.path().extension().map(|e| e == "rs")
             .unwrap_or(false))
         .map(|e| e.into_path())
@@ -102,10 +110,10 @@ pub fn schema_from_filepaths(paths: &[&Path]) -> anyhow::Result<OrmliteSchema> {
     for entry in walk {
         let contents = fs::read_to_string(&entry)
             .context(format!("failed to read file: {}", entry.display()))?;
+        tracing::debug!(file=entry.display().to_string(), "Checking for Model, Type, ManualType derive attrs");
         if !contents.contains("Model") {
             continue;
         }
-        tracing::debug!(file=entry.display().to_string(), "Checking for derive attrs: Model, Type, ManualType");
         let ast = syn::parse_file(&contents)
             .context(format!("Failed to parse file: {}", entry.display()))?;
         let intermediate = Intermediate::from_with_opts(ast);

attr/src/syndecode.rs

@@ -103,7 +103,6 @@ mod tests {
         };
         let item = syn::parse2::<syn::ItemEnum>(q).unwrap();
         let attrs = Attributes2::from(item.attrs.as_slice());
-        dbg!(&attrs);
         assert!(attrs.has_derive("Type"));
         assert_eq!(attrs.repr, Some("u8".to_string()));
     }

cli/src/command/migrate.rs

@@ -244,7 +244,6 @@ impl Migrate {
         file_name.push_str(&self.name);
         let migration_body = migration.as_ref().map(|m| {
             m.statements.iter()
-                .inspect(|&f| { dbg!(f); })
                 .map(|s| s.to_sql(Dialect::Postgres))
                 .collect::<Vec<_>>()
                 .join(";\n")

cli/src/main.rs

@@ -42,8 +42,7 @@ fn main() -> Result<()> {
             .without_time()
         )
         .with(tracing_subscriber::filter::Targets::new()
-            .with_target(env!("CARGO_PKG_NAME"), level)
-            .with_target("ormlite", level)
+            .with_target(env!("CARGO_BIN_NAME"), level)
             .with_target("ormlite_attr", level)
             .with_target("sqlmo", level)
         )