improve a few more error messages

Author: imor

cli/src/commands/publish.rs

@@ -45,6 +45,10 @@ pub async fn publish(
         }
     }
 
+    if num_published == 0 {
+        return Err(anyhow::anyhow!("No valid script file (.sql) found."));
+    }
+
     for upgrade_file in &payload.upgrade_files {
         let request =
             create_publich_package_upgrade_request(&payload.metadata.extension_name, upgrade_file);

cli/src/models.rs

@@ -1,7 +1,6 @@
 use crate::util;
 
 use anyhow::Context;
-use regex::Regex;
 use std::ffi::OsStr;
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -147,7 +146,7 @@ impl Payload {
 
         if !util::is_valid_extension_name(&extension_name) {
             return Err(anyhow::anyhow!(
-                "invalid extension name detected {}",
+                "Invalid extension name detected: {}. It must begin with an alphabet, contain only alphanumeric characters or `_` and should be between 2 and 32 characters long.",
                 extension_name
             ));
         }
@@ -226,16 +225,10 @@ impl ControlFileRef {
 
     // Name of the extension. Used in the `create extesnion <extension_name>`
     fn extension_name(&self) -> anyhow::Result<String> {
-        let name_regex = Regex::new(r"^[A-z][A-z0-9\_]{2,32}$").expect("regex is valid");
-        let name = self
-            .filename
+        self.filename
             .strip_suffix(".control")
             .context("failed to read extension name from control file")
-            .map(str::to_string)?;
-        if !name_regex.is_match(&name) {
-            return Err(anyhow::anyhow!("extension name must begin with an alphabet, contain only alphanumeric characters or `_` and should be between 2 and 32 characters long."));
-        }
-        Ok(name)
+            .map(str::to_string)
     }
 
     // A comment (any string) about the extension. The comment is applied when initially creating

cli/src/util.rs

@@ -1,4 +1,5 @@
 use anyhow::Context;
+use regex::Regex;
 use sqlx::postgres::PgConnection;
 use sqlx::Connection;
 use std::fs::{File, OpenOptions};
@@ -10,8 +11,9 @@ pub async fn get_connection(connection_str: &str) -> anyhow::Result<PgConnection
         .context("Failed to establish PostgreSQL connection")
 }
 
-pub fn is_valid_extension_name(_name: &str) -> bool {
-    true
+pub fn is_valid_extension_name(name: &str) -> bool {
+    let name_regex = Regex::new(r"^[A-z][A-z0-9\_]{2,32}$").expect("regex is valid");
+    name_regex.is_match(name)
 }
 
 pub fn is_valid_version(_version: &str) -> bool {