fmt

Author: lovasoa

CHANGELOG.md

@@ -1,6 +1,6 @@
 # CHANGELOG.md
 
-## unreleased
+## v0.44.0
 
 - New function: `sqlpage.regex_match(pattern, text)`. Useful for easy routing using `sqlpage.path()` from 404.sql files.
 - Added a `show_legend` top level property to the chart component.

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "sqlpage"
-version = "0.43.0"
-edition = "2021"
+version = "0.44.0"
+edition = "2024"
 description = "Build data user interfaces entirely in SQL. A web server that takes .sql files and formats the query result using pre-made configurable professional-looking components."
 keywords = ["web", "sql", "framework"]
 license = "MIT"

Cargo.toml

@@ -1,4 +1,4 @@
-use crate::cli::arguments::{parse_cli, Cli};
+use crate::cli::arguments::{Cli, parse_cli};
 use crate::webserver::content_security_policy::ContentSecurityPolicyTemplate;
 use crate::webserver::routing::RoutingConfig;
 use actix_web::http::Uri;
@@ -351,13 +351,8 @@ pub struct AppConfig {
 impl AppConfig {
     #[must_use]
     pub fn cache_stale_duration_ms(&self) -> u64 {
-        self.cache_stale_duration_ms.unwrap_or_else(|| {
-            if self.environment.is_prod() {
-                1000
-            } else {
-                0
-            }
-        })
+        self.cache_stale_duration_ms
+            .unwrap_or_else(|| if self.environment.is_prod() { 1000 } else { 0 })
     }
 
     #[must_use]
@@ -458,7 +453,9 @@ where
         Some(PortOrUrl::Port(p)) => Ok(Some(p)),
         Some(PortOrUrl::Url(u)) => {
             if let Ok(u) = Uri::from_str(&u) {
-                log::warn!("{u} is not a valid value for the SQLPage port number. Ignoring this error since kubernetes may set the SQLPAGE_PORT env variable to a service URI when there is a service named sqlpage. Rename your service to avoid this warning.");
+                log::warn!(
+                    "{u} is not a valid value for the SQLPage port number. Ignoring this error since kubernetes may set the SQLPAGE_PORT env variable to a service URI when there is a service named sqlpage. Rename your service to avoid this warning."
+                );
                 Ok(None)
             } else {
                 Err(D::Error::custom(format!(
@@ -561,7 +558,11 @@ fn create_default_database(configuration_directory: &Path) -> String {
         let old_default_db_path = PathBuf::from(DEFAULT_DATABASE_FILE);
         let default_db_path = config_dir.join(DEFAULT_DATABASE_FILE);
         if let Ok(true) = old_default_db_path.try_exists() {
-            log::warn!("Your sqlite database in {} is publicly accessible through your web server. Please move it to {}.", old_default_db_path.display(), default_db_path.display());
+            log::warn!(
+                "Your sqlite database in {} is publicly accessible through your web server. Please move it to {}.",
+                old_default_db_path.display(),
+                default_db_path.display()
+            );
             return prefix + old_default_db_path.to_str().unwrap();
         } else if let Ok(true) = default_db_path.try_exists() {
             log::debug!(
@@ -578,13 +579,18 @@ fn create_default_database(configuration_directory: &Path) -> String {
             );
             drop(tmp_file);
             if let Err(e) = std::fs::remove_file(&default_db_path) {
-                log::debug!("Unable to remove temporary probe file. It might have already been removed by another instance started concurrently: {e}");
+                log::debug!(
+                    "Unable to remove temporary probe file. It might have already been removed by another instance started concurrently: {e}"
+                );
             }
             return prefix + &encode_uri(&default_db_path) + "?mode=rwc";
         }
     }
 
-    log::warn!("No DATABASE_URL provided, and {} is not writeable. Using a temporary in-memory SQLite database. All the data created will be lost when this server shuts down.", configuration_directory.display());
+    log::warn!(
+        "No DATABASE_URL provided, and {} is not writeable. Using a temporary in-memory SQLite database. All the data created will be lost when this server shuts down.",
+        configuration_directory.display()
+    );
     prefix + ":memory:?cache=shared"
 }
 
@@ -707,8 +713,8 @@ pub fn test_database_url() -> String {
 
 #[cfg(test)]
 pub mod tests {
-    pub use super::test_database_url;
     use super::AppConfig;
+    pub use super::test_database_url;
 
     #[must_use]
     pub fn test_config() -> AppConfig {
@@ -762,9 +768,7 @@ mod test {
         assert_eq!(normalize_site_prefix("a b/c"), "/a%20b/c/");
         assert_eq!(normalize_site_prefix("*-+/:;,?%\"'{"), "/*-+/:;,%3F%%22'{/");
         assert_eq!(
-            normalize_site_prefix(
-                &(0..=0x7F).map(char::from).collect::<String>()
-            ),
+            normalize_site_prefix(&(0..=0x7F).map(char::from).collect::<String>()),
             "/%00%01%02%03%04%05%06%07%08%0B%0C%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20!%22%23$%&'()*+,-./0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~%7F/"
         );
     }
@@ -774,7 +778,9 @@ mod test {
         let _lock = ENV_LOCK
             .lock()
             .expect("Another test panicked while holding the lock");
-        unsafe { env::set_var("SQLPAGE_CONFIGURATION_DIRECTORY", "/path/to/config"); }
+        unsafe {
+            env::set_var("SQLPAGE_CONFIGURATION_DIRECTORY", "/path/to/config");
+        }
 
         let config = load_from_env().unwrap();
 
@@ -784,41 +790,53 @@ mod test {
             "Configuration directory should match the SQLPAGE_CONFIGURATION_DIRECTORY env var"
         );
 
-        unsafe { env::remove_var("SQLPAGE_CONFIGURATION_DIRECTORY"); }
+        unsafe {
+            env::remove_var("SQLPAGE_CONFIGURATION_DIRECTORY");
+        }
     }
 
     #[test]
     fn test_k8s_env_var_ignored() {
         let _lock = ENV_LOCK
             .lock()
             .expect("Another test panicked while holding the lock");
-        unsafe { env::set_var("SQLPAGE_PORT", "tcp://10.0.0.1:8080"); }
+        unsafe {
+            env::set_var("SQLPAGE_PORT", "tcp://10.0.0.1:8080");
+        }
 
         let config = load_from_env().unwrap();
         assert_eq!(config.port, None);
 
-        unsafe { env::remove_var("SQLPAGE_PORT"); }
+        unsafe {
+            env::remove_var("SQLPAGE_PORT");
+        }
     }
 
     #[test]
     fn test_valid_port_env_var() {
         let _lock = ENV_LOCK
             .lock()
             .expect("Another test panicked while holding the lock");
-        unsafe { env::set_var("SQLPAGE_PORT", "9000"); }
+        unsafe {
+            env::set_var("SQLPAGE_PORT", "9000");
+        }
 
         let config = load_from_env().unwrap();
         assert_eq!(config.port, Some(9000));
 
-        unsafe { env::remove_var("SQLPAGE_PORT"); }
+        unsafe {
+            env::remove_var("SQLPAGE_PORT");
+        }
     }
 
     #[test]
     fn test_config_priority() {
         let _lock = ENV_LOCK
             .lock()
             .expect("Another test panicked while holding the lock");
-        unsafe { env::set_var("SQLPAGE_WEB_ROOT", "/"); }
+        unsafe {
+            env::set_var("SQLPAGE_WEB_ROOT", "/");
+        }
 
         let cli = Cli {
             web_root: Some(PathBuf::from(".")),
@@ -835,7 +853,9 @@ mod test {
             "CLI argument should take precedence over environment variable"
         );
 
-        unsafe { env::remove_var("SQLPAGE_WEB_ROOT"); }
+        unsafe {
+            env::remove_var("SQLPAGE_WEB_ROOT");
+        }
     }
 
     #[test]
@@ -859,7 +879,9 @@ mod test {
         .to_string();
         std::fs::write(&config_file_path, config_content).unwrap();
 
-        unsafe { env::set_var("SQLPAGE_WEB_ROOT", env_web_dir.to_str().unwrap()); }
+        unsafe {
+            env::set_var("SQLPAGE_WEB_ROOT", env_web_dir.to_str().unwrap());
+        }
 
         let cli = Cli {
             web_root: None,
@@ -898,7 +920,9 @@ mod test {
             "Configuration directory should remain unchanged"
         );
 
-        unsafe { env::remove_var("SQLPAGE_WEB_ROOT"); }
+        unsafe {
+            env::remove_var("SQLPAGE_WEB_ROOT");
+        }
         std::fs::remove_dir_all(&temp_dir).unwrap();
     }
 
@@ -907,8 +931,12 @@ mod test {
         let _lock = ENV_LOCK
             .lock()
             .expect("Another test panicked while holding the lock");
-        unsafe { env::remove_var("SQLPAGE_CONFIGURATION_DIRECTORY"); }
-        unsafe { env::remove_var("SQLPAGE_WEB_ROOT"); }
+        unsafe {
+            env::remove_var("SQLPAGE_CONFIGURATION_DIRECTORY");
+        }
+        unsafe {
+            env::remove_var("SQLPAGE_WEB_ROOT");
+        }
 
         let cli = Cli {
             web_root: None,

src/app_config.rs

@@ -1,17 +1,17 @@
-use crate::webserver::routing::FileStore;
-use crate::webserver::ErrorWithStatus;
 use crate::AppState;
+use crate::webserver::ErrorWithStatus;
+use crate::webserver::routing::FileStore;
 use actix_web::http::StatusCode;
 use anyhow::Context;
 use async_trait::async_trait;
 use chrono::{DateTime, TimeZone, Utc};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 use std::sync::atomic::{
     AtomicU64,
     Ordering::{Acquire, Release},
 };
-use std::sync::Arc;
 use std::time::SystemTime;
 use tokio::sync::RwLock;
 

src/file_cache.rs

@@ -1,6 +1,6 @@
-use crate::webserver::database::SupportedDatabase;
 use crate::webserver::ErrorWithStatus;
-use crate::webserver::{make_placeholder, Database, StatusCodeResultExt};
+use crate::webserver::database::SupportedDatabase;
+use crate::webserver::{Database, StatusCodeResultExt, make_placeholder};
 use crate::{AppState, TEMPLATES_DIR};
 use anyhow::Context;
 use chrono::{DateTime, Utc};
@@ -250,10 +250,18 @@ impl DbFsQueries {
     #[must_use]
     pub fn get_create_table_sql(dbms: SupportedDatabase) -> &'static str {
         match dbms {
-            SupportedDatabase::Mssql => "CREATE TABLE sqlpage_files(path NVARCHAR(255) NOT NULL PRIMARY KEY, contents VARBINARY(MAX), last_modified DATETIME2(3) NOT NULL DEFAULT CURRENT_TIMESTAMP);",
-            SupportedDatabase::Postgres => "CREATE TABLE IF NOT EXISTS sqlpage_files(path VARCHAR(255) NOT NULL PRIMARY KEY, contents BYTEA, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP);",
-            SupportedDatabase::Snowflake => "CREATE TABLE IF NOT EXISTS sqlpage_files(path VARCHAR(255) NOT NULL PRIMARY KEY, contents VARBINARY, last_modified TIMESTAMP_TZ DEFAULT CONVERT_TIMEZONE('UTC', CURRENT_TIMESTAMP()));",
-            _ => "CREATE TABLE IF NOT EXISTS sqlpage_files(path VARCHAR(255) NOT NULL PRIMARY KEY, contents BLOB, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP);",
+            SupportedDatabase::Mssql => {
+                "CREATE TABLE sqlpage_files(path NVARCHAR(255) NOT NULL PRIMARY KEY, contents VARBINARY(MAX), last_modified DATETIME2(3) NOT NULL DEFAULT CURRENT_TIMESTAMP);"
+            }
+            SupportedDatabase::Postgres => {
+                "CREATE TABLE IF NOT EXISTS sqlpage_files(path VARCHAR(255) NOT NULL PRIMARY KEY, contents BYTEA, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP);"
+            }
+            SupportedDatabase::Snowflake => {
+                "CREATE TABLE IF NOT EXISTS sqlpage_files(path VARCHAR(255) NOT NULL PRIMARY KEY, contents VARBINARY, last_modified TIMESTAMP_TZ DEFAULT CONVERT_TIMEZONE('UTC', CURRENT_TIMESTAMP()));"
+            }
+            _ => {
+                "CREATE TABLE IF NOT EXISTS sqlpage_files(path VARCHAR(255) NOT NULL PRIMARY KEY, contents BLOB, last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP);"
+            }
         }
     }
 
@@ -390,7 +398,9 @@ async fn test_sql_file_read_utf8() -> anyhow::Result<()> {
     // Oracle has specific issues with implicit timestamp conversions and empty strings in this test setup
     // so we skip it for Oracle to avoid complex workarounds in the main codebase.
     if config.database_url.contains("Oracle") {
-        log::warn!("Skipping test_sql_file_read_utf8 for Oracle due to date format/implicit conversion issues");
+        log::warn!(
+            "Skipping test_sql_file_read_utf8 for Oracle due to date format/implicit conversion issues"
+        );
         return Ok(());
     }
 

src/filesystem.rs

@@ -1,8 +1,8 @@
 use sqlpage::{
+    AppState,
     app_config::AppConfig,
     cli, telemetry,
     webserver::{self, Database},
-    AppState,
 };
 
 #[actix_web::main]

src/main.rs

@@ -41,22 +41,22 @@
 //! For more details on available components and their usage, see the
 //! [SQLPage documentation](https://sql-page.com/documentation.sql).
 
+use crate::AppState;
 use crate::templates::SplitTemplate;
+use crate::webserver::ErrorWithStatus;
 use crate::webserver::http::{RequestContext, ResponseFormat};
 use crate::webserver::response_writer::{AsyncResponseWriter, ResponseWriter};
-use crate::webserver::ErrorWithStatus;
-use crate::AppState;
 use actix_web::body::MessageBody;
-use actix_web::cookie::time::format_description::well_known::Rfc3339;
 use actix_web::cookie::time::OffsetDateTime;
+use actix_web::cookie::time::format_description::well_known::Rfc3339;
 use actix_web::http::header::TryIntoHeaderPair;
-use actix_web::http::{header, StatusCode};
+use actix_web::http::{StatusCode, header};
 use actix_web::{HttpResponse, HttpResponseBuilder};
-use anyhow::{bail, format_err, Context as AnyhowContext};
+use anyhow::{Context as AnyhowContext, bail, format_err};
 use awc::cookie::time::Duration;
 use handlebars::{BlockContext, JsonValue, RenderError, Renderable};
 use serde::Serialize;
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::fmt::Write as _;
@@ -411,9 +411,9 @@ impl HeaderContext {
                 let html_renderer =
                     HtmlRenderContext::new(self.app_state, self.request_context, self.writer, data)
                         .await
-                        .with_context(|| {
-                            "Failed to create a render context from the header context."
-                        })?;
+                        .with_context(
+                            || "Failed to create a render context from the header context.",
+                        )?;
                 AnyRenderBodyContext::Html(html_renderer)
             }
         };
@@ -788,7 +788,9 @@ impl<W: std::io::Write> HtmlRenderContext<W> {
         data: &JsonValue,
     ) -> anyhow::Result<()> {
         if Self::is_shell_component(component_name) {
-            bail!("There cannot be more than a single shell per page. You are trying to open the {component_name} component, but a shell component is already opened for the current page. You can fix this by removing the extra shell component, or by moving this component to the top of the SQL file, before any other component that displays data.");
+            bail!(
+                "There cannot be more than a single shell per page. You are trying to open the {component_name} component, but a shell component is already opened for the current page. You can fix this by removing the extra shell component, or by moving this component to the top of the SQL file, before any other component that displays data."
+            );
         }
 
         if component_name == "log" {
@@ -802,10 +804,12 @@ impl<W: std::io::Write> HtmlRenderContext<W> {
         match self.open_component_with_data(component_name, &data).await {
             Ok(_) => Ok(()),
             Err(err) => match HeaderComponent::try_from(component_name) {
-                Ok(_) => bail!("The {component_name} component cannot be used after data has already been sent to the client's browser. \n\
+                Ok(_) => bail!(
+                    "The {component_name} component cannot be used after data has already been sent to the client's browser. \n\
                                 This component must be used before any other component. \n\
                                     To fix this, either move the call to the '{component_name}' component to the top of the SQL file, \n\
-                                or create a new SQL file where '{component_name}' is the first component."),
+                                or create a new SQL file where '{component_name}' is the first component."
+                ),
                 Err(()) => Err(err),
             },
         }
@@ -1124,7 +1128,9 @@ impl SplitTemplateRenderer {
             local_vars.put("row_index", self.row_index.into());
             local_vars.put("component_index", self.component_index.into());
             local_vars.put("csp_nonce", self.nonce.into());
-            log::trace!("Rendering the after_list template with the following local variables: {local_vars:?}");
+            log::trace!(
+                "Rendering the after_list template with the following local variables: {local_vars:?}"
+            );
             *render_context
                 .block_mut()
                 .expect("ctx created without block")