From 9ec66bd3285b36204d1fbbe2df96f14aa7bb967a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:01:44 +0000
Subject: [PATCH 01/20] Initial plan


From 43f6e3ed869cad20395454e43b26e0f3be3a93f6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:14:28 +0000
Subject: [PATCH 02/20] Implement etag plumbing for mbtiles backend

- Store MbtType in MbtSource struct
- Detect MbtType during initialization
- Override get_tile_with_etag to use pre-computed hashes
- Use get_tile_and_hash when available
- Manually verified with FlatWithHash and Flat schemas

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 40 +++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 41b251efc..2e7fd5ff2 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -7,12 +7,12 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use martin_tile_utils::{TileCoord, TileData, TileInfo};
-use mbtiles::{MbtError, MbtilesPool};
+use mbtiles::{MbtError, MbtType, MbtilesPool};
 use tilejson::TileJSON;
 use tracing::trace;
 
 use crate::tiles::mbtiles::MbtilesError;
-use crate::tiles::{BoxedSource, MartinCoreResult, Source, UrlQuery};
+use crate::tiles::{BoxedSource, MartinCoreResult, Source, Tile, UrlQuery};
 
 /// Tile source that reads from `MBTiles` files.
 #[derive(Clone)]
@@ -21,6 +21,7 @@ pub struct MbtSource {
     mbtiles: Arc<MbtilesPool>,
     tilejson: TileJSON,
     tile_info: TileInfo,
+    mbt_type: MbtType,
 }
 
 #[expect(clippy::missing_fields_in_debug)]
@@ -29,6 +30,7 @@ impl Debug for MbtSource {
         f.debug_struct("MbtSource")
             .field("id", &self.id)
             .field("path", &self.mbtiles.as_ref())
+            .field("mbt_type", &self.mbt_type)
             .finish()
     }
 }
@@ -51,6 +53,12 @@ impl MbtSource {
             .detect_format(&meta.tilejson)
             .await
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
+            .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
+
+        // Detect the MBTiles schema type
+        let mbt_type = mbt
+            .detect_type()
+            .await
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path))?;
 
         Ok(Self {
@@ -58,6 +66,7 @@ impl MbtSource {
             mbtiles: Arc::new(mbt),
             tilejson: meta.tilejson,
             tile_info,
+            mbt_type,
         })
     }
 }
@@ -109,4 +118,31 @@ impl Source for MbtSource {
             Ok(Vec::new())
         }
     }
+
+    async fn get_tile_with_etag(
+        &self,
+        xyz: TileCoord,
+        _url_query: Option<&UrlQuery>,
+    ) -> MartinCoreResult<Tile> {
+        // Try to get tile with hash from mbtiles
+        if let Some((data, hash)) = self
+            .mbtiles
+            .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
+            .await
+            .map_err(|_| MbtilesError::AcquireConnError(self.id.clone()))?
+        {
+            // If hash is available, use it as etag; otherwise compute it
+            if let Some(hash_str) = hash {
+                Ok(Tile::new_with_etag(data, self.tile_info, hash_str))
+            } else {
+                Ok(Tile::new_hash_etag(data, self.tile_info))
+            }
+        } else {
+            trace!(
+                "Couldn't find tile data in {}/{}/{} of {}",
+                xyz.z, xyz.x, xyz.y, &self.id
+            );
+            Ok(Tile::new_hash_etag(Vec::new(), self.tile_info))
+        }
+    }
 }

From 1d3ff6b83ad8324e0fef2cf7e0f072cd808e118d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 16:17:01 +0000
Subject: [PATCH 03/20] Address code review feedback

- Preserve original error details from get_tile_and_hash
- Add comment explaining empty tile behavior for missing tiles

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 2e7fd5ff2..92b1af312 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -129,7 +129,7 @@ impl Source for MbtSource {
             .mbtiles
             .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(|_| MbtilesError::AcquireConnError(self.id.clone()))?
+            .map_err(MbtilesError::MbtilesLibraryError)?
         {
             // If hash is available, use it as etag; otherwise compute it
             if let Some(hash_str) = hash {
@@ -138,6 +138,8 @@ impl Source for MbtSource {
                 Ok(Tile::new_hash_etag(data, self.tile_info))
             }
         } else {
+            // Tile not found - return empty tile with computed etag
+            // This matches the behavior of get_tile() for consistency
             trace!(
                 "Couldn't find tile data in {}/{}/{} of {}",
                 xyz.z, xyz.x, xyz.y, &self.id

From 46dab12807f1ed0949e00cdc591e3eb7d54a1a51 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Wed, 11 Feb 2026 17:58:08 +0100
Subject: [PATCH 04/20] Apply suggestion from @CommanderStorm

---
 martin-core/src/tiles/mbtiles/source.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 92b1af312..54a5cbf45 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -124,22 +124,18 @@ impl Source for MbtSource {
         xyz: TileCoord,
         _url_query: Option<&UrlQuery>,
     ) -> MartinCoreResult<Tile> {
-        // Try to get tile with hash from mbtiles
         if let Some((data, hash)) = self
             .mbtiles
             .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
             .await
             .map_err(MbtilesError::MbtilesLibraryError)?
         {
-            // If hash is available, use it as etag; otherwise compute it
             if let Some(hash_str) = hash {
                 Ok(Tile::new_with_etag(data, self.tile_info, hash_str))
             } else {
                 Ok(Tile::new_hash_etag(data, self.tile_info))
             }
         } else {
-            // Tile not found - return empty tile with computed etag
-            // This matches the behavior of get_tile() for consistency
             trace!(
                 "Couldn't find tile data in {}/{}/{} of {}",
                 xyz.z, xyz.x, xyz.y, &self.id

From 01ff249de26f0aca0e4510bb1b77e409c4ddf488 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 22:38:04 +0000
Subject: [PATCH 05/20] Fix CI test failures by making MbtType detection
 optional

When detect_type() fails due to missing uniqueness constraints in test databases,
fall back to trying each type when fetching tiles. This maintains the optimization
for properly configured mbtiles files while remaining compatible with test fixtures.

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 77 ++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 54a5cbf45..f38b540d9 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -21,7 +21,7 @@ pub struct MbtSource {
     mbtiles: Arc<MbtilesPool>,
     tilejson: TileJSON,
     tile_info: TileInfo,
-    mbt_type: MbtType,
+    mbt_type: Option<MbtType>,
 }
 
 #[expect(clippy::missing_fields_in_debug)]
@@ -30,7 +30,7 @@ impl Debug for MbtSource {
         f.debug_struct("MbtSource")
             .field("id", &self.id)
             .field("path", &self.mbtiles.as_ref())
-            .field("mbt_type", &self.mbt_type)
+            .field("mbt_type", &self.mbt_type.as_ref().map(|t| format!("{t:?}")).unwrap_or_else(|| "Unknown".to_string()))
             .finish()
     }
 }
@@ -55,11 +55,9 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        // Detect the MBTiles schema type
-        let mbt_type = mbt
-            .detect_type()
-            .await
-            .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path))?;
+        // Try to detect the MBTiles schema type, but don't fail if we can't
+        // This allows working with test databases that don't have proper uniqueness constraints
+        let mbt_type = mbt.detect_type().await.ok();
 
         Ok(Self {
             id,
@@ -124,17 +122,66 @@ impl Source for MbtSource {
         xyz: TileCoord,
         _url_query: Option<&UrlQuery>,
     ) -> MartinCoreResult<Tile> {
-        if let Some((data, hash)) = self
+        // If we have a known type, use it to get tile and hash efficiently
+        if let Some(mbt_type) = self.mbt_type {
+            if let Some((data, hash)) = self
+                .mbtiles
+                .get_tile_and_hash(mbt_type, xyz.z, xyz.x, xyz.y)
+                .await
+                .map_err(MbtilesError::MbtilesLibraryError)?
+            {
+                if let Some(hash_str) = hash {
+                    return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
+                } else {
+                    return Ok(Tile::new_hash_etag(data, self.tile_info));
+                }
+            } else {
+                // Tile not found - return empty tile with computed etag
+                // This matches the behavior of get_tile() for consistency
+                trace!(
+                    "Couldn't find tile data in {}/{}/{} of {}",
+                    xyz.z, xyz.x, xyz.y, &self.id
+                );
+                return Ok(Tile::new_hash_etag(Vec::new(), self.tile_info));
+            }
+        }
+
+        // Fallback: try each type in order of likelihood
+        // First try FlatWithHash (has hash column)
+        if let Ok(Some((data, Some(hash_str)))) = self
             .mbtiles
-            .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
+            .get_tile_and_hash(MbtType::FlatWithHash, xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(MbtilesError::MbtilesLibraryError)?
         {
-            if let Some(hash_str) = hash {
-                Ok(Tile::new_with_etag(data, self.tile_info, hash_str))
-            } else {
-                Ok(Tile::new_hash_etag(data, self.tile_info))
-            }
+            return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
+        }
+
+        // Then try Normalized with hash view
+        if let Ok(Some((data, Some(hash_str)))) = self
+            .mbtiles
+            .get_tile_and_hash(MbtType::Normalized { hash_view: true }, xyz.z, xyz.x, xyz.y)
+            .await
+        {
+            return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
+        }
+
+        // Then try Normalized without hash view
+        if let Ok(Some((data, Some(hash_str)))) = self
+            .mbtiles
+            .get_tile_and_hash(MbtType::Normalized { hash_view: false }, xyz.z, xyz.x, xyz.y)
+            .await
+        {
+            return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
+        }
+
+        // Finally fallback to Flat (no hash) - compute etag
+        if let Some(tile) = self
+            .mbtiles
+            .get_tile(xyz.z, xyz.x, xyz.y)
+            .await
+            .map_err(|_| MbtilesError::AcquireConnError(self.id.clone()))?
+        {
+            Ok(Tile::new_hash_etag(tile, self.tile_info))
         } else {
             trace!(
                 "Couldn't find tile data in {}/{}/{} of {}",

From c82ab86ffe74ae25cb390d0e4eb5d7fb7a894e15 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Feb 2026 00:43:58 +0000
Subject: [PATCH 06/20] Remove inefficient fallback logic and fix test fixture

- Removed inefficient multi-type fallback in get_tile_with_etag
- Created webp_valid.sql with proper PRIMARY KEY constraint for server tests
- Kept original webp.sql as intentionally invalid fixture for error testing
- All 15 server tests and 37 mbtiles library tests passing
- Clippy clean with no warnings

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 80 ++++++-------------------
 martin/tests/mb_server_test.rs          |  2 +-
 tests/fixtures/mbtiles/webp_valid.sql   | 24 ++++++++
 3 files changed, 43 insertions(+), 63 deletions(-)
 create mode 100644 tests/fixtures/mbtiles/webp_valid.sql

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index f38b540d9..3ea220b6e 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -21,7 +21,7 @@ pub struct MbtSource {
     mbtiles: Arc<MbtilesPool>,
     tilejson: TileJSON,
     tile_info: TileInfo,
-    mbt_type: Option<MbtType>,
+    mbt_type: MbtType,
 }
 
 #[expect(clippy::missing_fields_in_debug)]
@@ -30,7 +30,7 @@ impl Debug for MbtSource {
         f.debug_struct("MbtSource")
             .field("id", &self.id)
             .field("path", &self.mbtiles.as_ref())
-            .field("mbt_type", &self.mbt_type.as_ref().map(|t| format!("{t:?}")).unwrap_or_else(|| "Unknown".to_string()))
+            .field("mbt_type", &self.mbt_type)
             .finish()
     }
 }
@@ -55,9 +55,11 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        // Try to detect the MBTiles schema type, but don't fail if we can't
-        // This allows working with test databases that don't have proper uniqueness constraints
-        let mbt_type = mbt.detect_type().await.ok();
+        // Detect the MBTiles schema type
+        let mbt_type = mbt
+            .detect_type()
+            .await
+            .map_err(MbtilesError::MbtilesLibraryError)?;
 
         Ok(Self {
             id,
@@ -122,67 +124,21 @@ impl Source for MbtSource {
         xyz: TileCoord,
         _url_query: Option<&UrlQuery>,
     ) -> MartinCoreResult<Tile> {
-        // If we have a known type, use it to get tile and hash efficiently
-        if let Some(mbt_type) = self.mbt_type {
-            if let Some((data, hash)) = self
-                .mbtiles
-                .get_tile_and_hash(mbt_type, xyz.z, xyz.x, xyz.y)
-                .await
-                .map_err(MbtilesError::MbtilesLibraryError)?
-            {
-                if let Some(hash_str) = hash {
-                    return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
-                } else {
-                    return Ok(Tile::new_hash_etag(data, self.tile_info));
-                }
-            } else {
-                // Tile not found - return empty tile with computed etag
-                // This matches the behavior of get_tile() for consistency
-                trace!(
-                    "Couldn't find tile data in {}/{}/{} of {}",
-                    xyz.z, xyz.x, xyz.y, &self.id
-                );
-                return Ok(Tile::new_hash_etag(Vec::new(), self.tile_info));
-            }
-        }
-
-        // Fallback: try each type in order of likelihood
-        // First try FlatWithHash (has hash column)
-        if let Ok(Some((data, Some(hash_str)))) = self
+        // Use the detected type to get tile and hash efficiently
+        if let Some((data, hash)) = self
             .mbtiles
-            .get_tile_and_hash(MbtType::FlatWithHash, xyz.z, xyz.x, xyz.y)
+            .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
             .await
+            .map_err(MbtilesError::MbtilesLibraryError)?
         {
-            return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
-        }
-
-        // Then try Normalized with hash view
-        if let Ok(Some((data, Some(hash_str)))) = self
-            .mbtiles
-            .get_tile_and_hash(MbtType::Normalized { hash_view: true }, xyz.z, xyz.x, xyz.y)
-            .await
-        {
-            return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
-        }
-
-        // Then try Normalized without hash view
-        if let Ok(Some((data, Some(hash_str)))) = self
-            .mbtiles
-            .get_tile_and_hash(MbtType::Normalized { hash_view: false }, xyz.z, xyz.x, xyz.y)
-            .await
-        {
-            return Ok(Tile::new_with_etag(data, self.tile_info, hash_str));
-        }
-
-        // Finally fallback to Flat (no hash) - compute etag
-        if let Some(tile) = self
-            .mbtiles
-            .get_tile(xyz.z, xyz.x, xyz.y)
-            .await
-            .map_err(|_| MbtilesError::AcquireConnError(self.id.clone()))?
-        {
-            Ok(Tile::new_hash_etag(tile, self.tile_info))
+            if let Some(hash_str) = hash {
+                Ok(Tile::new_with_etag(data, self.tile_info, hash_str))
+            } else {
+                Ok(Tile::new_hash_etag(data, self.tile_info))
+            }
         } else {
+            // Tile not found - return empty tile with computed etag
+            // This matches the behavior of get_tile() for consistency
             trace!(
                 "Couldn't find tile data in {}/{}/{} of {}",
                 xyz.z, xyz.x, xyz.y, &self.id
diff --git a/martin/tests/mb_server_test.rs b/martin/tests/mb_server_test.rs
index 27f6b3be5..adcee259a 100644
--- a/martin/tests/mb_server_test.rs
+++ b/martin/tests/mb_server_test.rs
@@ -61,7 +61,7 @@ async fn config(
     let raw_mlt_script = include_str!("../../tests/fixtures/mbtiles/mlt.sql");
     let (raw_mlt_mbt, raw_mlt_conn, raw_mlt_file) =
         temp_named_mbtiles(&format!("{test_name}_raw_mlt"), raw_mlt_script).await;
-    let webp_script = include_str!("../../tests/fixtures/mbtiles/webp.sql");
+    let webp_script = include_str!("../../tests/fixtures/mbtiles/webp_valid.sql");
     let (webp_mbt, webp_conn, webp_file) =
         temp_named_mbtiles(&format!("{test_name}_webp"), webp_script).await;
 
diff --git a/tests/fixtures/mbtiles/webp_valid.sql b/tests/fixtures/mbtiles/webp_valid.sql
new file mode 100644
index 000000000..647394796
--- /dev/null
+++ b/tests/fixtures/mbtiles/webp_valid.sql
@@ -0,0 +1,24 @@
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE metadata (
+    name text,
+    value text
+);
+INSERT INTO metadata VALUES
+('name','ne2sr'),
+('format','webp'),
+('type','baselayer'),
+('bounds','-180,-85.05113,180,85.05113'),
+('center','0,0,0'),
+('minzoom','0'),
+('maxzoom','0');
+CREATE TABLE tiles (
+    zoom_level integer NOT NULL,
+    tile_column integer NOT NULL,
+    tile_row integer NOT NULL,
+    tile_data blob,
+    PRIMARY KEY(zoom_level, tile_column, tile_row)
+);
+INSERT INTO tiles VALUES(0,0,0,x'524946463A000000574542505650380A0000002F000000');
+CREATE UNIQUE INDEX name ON metadata (name);
+COMMIT;

From 57a0738c0c0918ce95d5dfa109069711a60bf71e Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 05:22:42 +0100
Subject: [PATCH 07/20] Delete tests/fixtures/mbtiles/webp_valid.sql

---
 tests/fixtures/mbtiles/webp_valid.sql | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 tests/fixtures/mbtiles/webp_valid.sql

diff --git a/tests/fixtures/mbtiles/webp_valid.sql b/tests/fixtures/mbtiles/webp_valid.sql
deleted file mode 100644
index 647394796..000000000
--- a/tests/fixtures/mbtiles/webp_valid.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-PRAGMA foreign_keys=OFF;
-BEGIN TRANSACTION;
-CREATE TABLE metadata (
-    name text,
-    value text
-);
-INSERT INTO metadata VALUES
-('name','ne2sr'),
-('format','webp'),
-('type','baselayer'),
-('bounds','-180,-85.05113,180,85.05113'),
-('center','0,0,0'),
-('minzoom','0'),
-('maxzoom','0');
-CREATE TABLE tiles (
-    zoom_level integer NOT NULL,
-    tile_column integer NOT NULL,
-    tile_row integer NOT NULL,
-    tile_data blob,
-    PRIMARY KEY(zoom_level, tile_column, tile_row)
-);
-INSERT INTO tiles VALUES(0,0,0,x'524946463A000000574542505650380A0000002F000000');
-CREATE UNIQUE INDEX name ON metadata (name);
-COMMIT;

From 3ba880ab4184cb3f416800235288d7779e268ff3 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 05:24:34 +0100
Subject: [PATCH 08/20] add an webp index

---
 tests/fixtures/mbtiles/webp.sql | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/fixtures/mbtiles/webp.sql b/tests/fixtures/mbtiles/webp.sql
index 08c7c22e9..a9c45d740 100644
--- a/tests/fixtures/mbtiles/webp.sql
+++ b/tests/fixtures/mbtiles/webp.sql
@@ -12,11 +12,12 @@ INSERT INTO metadata VALUES
 ('center','0,0,0'),
 ('minzoom','0'),
 ('maxzoom','0');
-CREATE TABLE IF NOT EXISTS "tiles"(
-    zoom_level int,
-    tile_column int,
-    tile_row int,
-    tile_data blob
+CREATE TABLE tiles (
+    zoom_level integer,
+    tile_column integer,
+    tile_row integer,
+    tile_data blob,
+    PRIMARY KEY(zoom_level, tile_column, tile_row)
 );
 INSERT INTO tiles VALUES(0,0,0,x'524946463A000000574542505650380A0000002F000000');
 CREATE UNIQUE INDEX name ON metadata (name);

From defd30c6f16137831b8a1ea88878ff793b5240e1 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 05:24:53 +0100
Subject: [PATCH 09/20] Apply suggestion from @CommanderStorm

---
 martin/tests/mb_server_test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/martin/tests/mb_server_test.rs b/martin/tests/mb_server_test.rs
index adcee259a..27f6b3be5 100644
--- a/martin/tests/mb_server_test.rs
+++ b/martin/tests/mb_server_test.rs
@@ -61,7 +61,7 @@ async fn config(
     let raw_mlt_script = include_str!("../../tests/fixtures/mbtiles/mlt.sql");
     let (raw_mlt_mbt, raw_mlt_conn, raw_mlt_file) =
         temp_named_mbtiles(&format!("{test_name}_raw_mlt"), raw_mlt_script).await;
-    let webp_script = include_str!("../../tests/fixtures/mbtiles/webp_valid.sql");
+    let webp_script = include_str!("../../tests/fixtures/mbtiles/webp.sql");
     let (webp_mbt, webp_conn, webp_file) =
         temp_named_mbtiles(&format!("{test_name}_webp"), webp_script).await;
 

From 83911abd1e677731997162f9953148b68773f945 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 05:43:54 +0100
Subject: [PATCH 10/20] Update tests/fixtures/mbtiles/webp.sql

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 tests/fixtures/mbtiles/webp.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/fixtures/mbtiles/webp.sql b/tests/fixtures/mbtiles/webp.sql
index a9c45d740..599b73446 100644
--- a/tests/fixtures/mbtiles/webp.sql
+++ b/tests/fixtures/mbtiles/webp.sql
@@ -16,8 +16,7 @@ CREATE TABLE tiles (
     zoom_level integer,
     tile_column integer,
     tile_row integer,
-    tile_data blob,
-    PRIMARY KEY(zoom_level, tile_column, tile_row)
+    tile_data blob
 );
 INSERT INTO tiles VALUES(0,0,0,x'524946463A000000574542505650380A0000002F000000');
 CREATE UNIQUE INDEX name ON metadata (name);

From a71792a14508a65740f3042d4f2bf05ca6a46514 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 05:45:04 +0100
Subject: [PATCH 11/20] Update martin-core/src/tiles/mbtiles/source.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 3ea220b6e..4c27ab8f9 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -55,11 +55,20 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        // Detect the MBTiles schema type
-        let mbt_type = mbt
-            .detect_type()
-            .await
-            .map_err(MbtilesError::MbtilesLibraryError)?;
+        // Detect the MBTiles schema type.
+        // If detection fails (for example, due to missing uniqueness constraints on the `tiles`
+        // table), do not fail source initialization. Instead, log and fall back to a default
+        // MBTiles type so that previously working files continue to be served.
+        let mbt_type = match mbt.detect_type().await {
+            Ok(mbt_type) => mbt_type,
+            Err(err) => {
+                trace!(
+                    "Failed to detect MBTiles schema type for {}: {err:?}; falling back to flat schema",
+                    path.display()
+                );
+                MbtType::Flat
+            }
+        };
 
         Ok(Self {
             id,

From d63b51eedcd615d36342e7d64b4ddb1882a8b60a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Feb 2026 04:54:40 +0000
Subject: [PATCH 12/20] Fix error handling to preserve AcquireConnError for
 SqlxError

Match SqlxError specifically in get_tile_with_etag to maintain consistency
with get_tile() behavior, preserving source ID in error messages for pool
acquisition failures while wrapping other errors as MbtilesLibraryError.

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 4c27ab8f9..8e465acd3 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -138,7 +138,10 @@ impl Source for MbtSource {
             .mbtiles
             .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(MbtilesError::MbtilesLibraryError)?
+            .map_err(|e| match e {
+                MbtError::SqlxError(_) => MbtilesError::AcquireConnError(self.id.clone()),
+                other => MbtilesError::MbtilesLibraryError(other),
+            })?
         {
             if let Some(hash_str) = hash {
                 Ok(Tile::new_with_etag(data, self.tile_info, hash_str))

From 950e5abcba1cd79e182076c8a25ac60f42d0d384 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 12:20:27 +0100
Subject: [PATCH 13/20] Update martin-core/src/tiles/mbtiles/source.rs

---
 martin-core/src/tiles/mbtiles/source.rs | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 8e465acd3..28063f2a2 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -55,20 +55,8 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        // Detect the MBTiles schema type.
-        // If detection fails (for example, due to missing uniqueness constraints on the `tiles`
-        // table), do not fail source initialization. Instead, log and fall back to a default
-        // MBTiles type so that previously working files continue to be served.
-        let mbt_type = match mbt.detect_type().await {
-            Ok(mbt_type) => mbt_type,
-            Err(err) => {
-                trace!(
-                    "Failed to detect MBTiles schema type for {}: {err:?}; falling back to flat schema",
-                    path.display()
-                );
-                MbtType::Flat
-            }
-        };
+        let mbt_type = match mbt.detect_type().await
+             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
         Ok(Self {
             id,

From 60cb46a54245f4e22d1eb6c8779d511e613e245f Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 12:20:33 +0100
Subject: [PATCH 14/20] Update martin-core/src/tiles/mbtiles/source.rs

---
 martin-core/src/tiles/mbtiles/source.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 28063f2a2..149c1fd3f 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -121,7 +121,6 @@ impl Source for MbtSource {
         xyz: TileCoord,
         _url_query: Option<&UrlQuery>,
     ) -> MartinCoreResult<Tile> {
-        // Use the detected type to get tile and hash efficiently
         if let Some((data, hash)) = self
             .mbtiles
             .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)

From 0879df1099a3eacd7d02d770aa421ba148d57f24 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 12:20:40 +0100
Subject: [PATCH 15/20] Update martin-core/src/tiles/mbtiles/source.rs

---
 martin-core/src/tiles/mbtiles/source.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 149c1fd3f..acd67e1d5 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -136,8 +136,6 @@ impl Source for MbtSource {
                 Ok(Tile::new_hash_etag(data, self.tile_info))
             }
         } else {
-            // Tile not found - return empty tile with computed etag
-            // This matches the behavior of get_tile() for consistency
             trace!(
                 "Couldn't find tile data in {}/{}/{} of {}",
                 xyz.z, xyz.x, xyz.y, &self.id

From eca0bc45f11c9566ec56754b26ee1134fbc4c1ac Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:34:18 +0000
Subject: [PATCH 16/20] Refactor error handling into helper function

Created map_mbt_error() helper function to centralize MbtError to MbtilesError
conversion logic. Both get_tile() and get_tile_with_etag() now use this helper,
ensuring consistent error handling across tile retrieval methods. The helper
preserves source ID context for SqlxError (mapped to AcquireConnError) while
wrapping other errors as MbtilesLibraryError.

Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
---
 martin-core/src/tiles/mbtiles/source.rs | 31 +++++++++++++++++++------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index acd67e1d5..4f836ab79 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -55,8 +55,20 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        let mbt_type = match mbt.detect_type().await
-             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
+        // Detect the MBTiles schema type.
+        // If detection fails (for example, due to missing uniqueness constraints on the `tiles`
+        // table), do not fail source initialization. Instead, log and fall back to a default
+        // MBTiles type so that previously working files continue to be served.
+        let mbt_type = match mbt.detect_type().await {
+            Ok(mbt_type) => mbt_type,
+            Err(err) => {
+                trace!(
+                    "Failed to detect MBTiles schema type for {}: {err:?}; falling back to flat schema",
+                    path.display()
+                );
+                MbtType::Flat
+            }
+        };
 
         Ok(Self {
             id,
@@ -66,6 +78,14 @@ impl MbtSource {
             mbt_type,
         })
     }
+
+    /// Maps `MbtError` to `MbtilesError`, preserving source ID context for `SqlxError`.
+    fn map_mbt_error(&self, error: MbtError) -> MbtilesError {
+        match error {
+            MbtError::SqlxError(_) => MbtilesError::AcquireConnError(self.id.clone()),
+            other => MbtilesError::MbtilesLibraryError(other),
+        }
+    }
 }
 
 #[async_trait]
@@ -104,7 +124,7 @@ impl Source for MbtSource {
             .mbtiles
             .get_tile(xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(|_| MbtilesError::AcquireConnError(self.id.clone()))?
+            .map_err(|e| self.map_mbt_error(e))?
         {
             Ok(tile)
         } else {
@@ -125,10 +145,7 @@ impl Source for MbtSource {
             .mbtiles
             .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(|e| match e {
-                MbtError::SqlxError(_) => MbtilesError::AcquireConnError(self.id.clone()),
-                other => MbtilesError::MbtilesLibraryError(other),
-            })?
+            .map_err(|e| self.map_mbt_error(e))?
         {
             if let Some(hash_str) = hash {
                 Ok(Tile::new_with_etag(data, self.tile_info, hash_str))

From de1dc2e3b6ec4b25e76d8ed7ce42cd755d1694fe Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 12:47:06 +0100
Subject: [PATCH 17/20] Apply suggestions from code review

---
 martin-core/src/tiles/mbtiles/source.rs | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index 4f836ab79..cb3c13ca7 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -55,20 +55,8 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        // Detect the MBTiles schema type.
-        // If detection fails (for example, due to missing uniqueness constraints on the `tiles`
-        // table), do not fail source initialization. Instead, log and fall back to a default
-        // MBTiles type so that previously working files continue to be served.
-        let mbt_type = match mbt.detect_type().await {
-            Ok(mbt_type) => mbt_type,
-            Err(err) => {
-                trace!(
-                    "Failed to detect MBTiles schema type for {}: {err:?}; falling back to flat schema",
-                    path.display()
-                );
-                MbtType::Flat
-            }
-        };
+        let mbt_type = match mbt.detect_type().await
+            .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
         Ok(Self {
             id,
@@ -80,9 +68,9 @@ impl MbtSource {
     }
 
     /// Maps `MbtError` to `MbtilesError`, preserving source ID context for `SqlxError`.
-    fn map_mbt_error(&self, error: MbtError) -> MbtilesError {
+    fn map_mbt_error(error: MbtError, id: String) -> MbtilesError {
         match error {
-            MbtError::SqlxError(_) => MbtilesError::AcquireConnError(self.id.clone()),
+            MbtError::SqlxError(_) => MbtilesError::AcquireConnError(id),
             other => MbtilesError::MbtilesLibraryError(other),
         }
     }
@@ -145,7 +133,7 @@ impl Source for MbtSource {
             .mbtiles
             .get_tile_and_hash(self.mbt_type, xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(|e| self.map_mbt_error(e))?
+            .map_err(|e| Self::map_mbt_error(e, self.id.clone()))?
         {
             if let Some(hash_str) = hash {
                 Ok(Tile::new_with_etag(data, self.tile_info, hash_str))

From 5406a7ff8a21460c41edbbc5e5d84faae85038f0 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 12:47:18 +0100
Subject: [PATCH 18/20] Apply suggestion from @CommanderStorm

---
 martin-core/src/tiles/mbtiles/source.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index cb3c13ca7..f87b1840d 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -112,7 +112,7 @@ impl Source for MbtSource {
             .mbtiles
             .get_tile(xyz.z, xyz.x, xyz.y)
             .await
-            .map_err(|e| self.map_mbt_error(e))?
+            .map_err(|e| Self::map_mbt_error(e, self.id.clone()))?
         {
             Ok(tile)
         } else {

From e89a53a0ad0c943046eb976b55254e9ab82c89a6 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 12 Feb 2026 12:56:12 +0100
Subject: [PATCH 19/20] Apply suggestion from @CommanderStorm

---
 martin-core/src/tiles/mbtiles/source.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index f87b1840d..a8a76a63e 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -55,7 +55,7 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        let mbt_type = match mbt.detect_type().await
+        let mbt_type = mbt.detect_type().await
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
         Ok(Self {

From 656960f63a229210d43db4524b6654a7768e1c52 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:57:46 +0000
Subject: [PATCH 20/20] chore(fmt): apply pre-commit formatting fixes

---
 martin-core/src/tiles/mbtiles/source.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/martin-core/src/tiles/mbtiles/source.rs b/martin-core/src/tiles/mbtiles/source.rs
index a8a76a63e..51bbefd33 100644
--- a/martin-core/src/tiles/mbtiles/source.rs
+++ b/martin-core/src/tiles/mbtiles/source.rs
@@ -55,7 +55,9 @@ impl MbtSource {
             .and_then(|v| v.ok_or(MbtError::NoTilesFound))
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
-        let mbt_type = mbt.detect_type().await
+        let mbt_type = mbt
+            .detect_type()
+            .await
             .map_err(|e| MbtilesError::InvalidMetadata(e.to_string(), path.clone()))?;
 
         Ok(Self {