dbviewer 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243466a78ac9698ebe99e2f1cc225355bcb278eced6d87da6ca6d4cc87a636ba
-  data.tar.gz: eb7006f0fb710d799f9167f1f8a8081f6850c46e9bc9ed8d40245ca16024ffdc
+  metadata.gz: 27da0a6d3d08f2a6d1a597c1f7e688a54ffec7048e135b30a605ee3ace20370e
+  data.tar.gz: 2e59f9c1c69b2bb87c7d9a351a045cfaea9709dc49ce7651d8ef24821db43aa7
 SHA512:
-  metadata.gz: f41b5f67b69a22e98a008c3e686c91a369428dc2d57beab21c429cf6ff9dca371cfa546c91a063db62e109819b4c3ff3ba1a6a3e0a333cf55f6e8e7d6f318ead
-  data.tar.gz: fd3467c65880b1f5b187537b7a10bdac6b971846704da02212f1dd04bf8f73c0f1d2ce355310f804c8fcb56d3f04da64ef9bca562027bf60958fc400bc1ee6b9
+  metadata.gz: 48a192e9bdd118358734a2b5008a87e7219fb224b95c897601b5e448c513027b4d14b816d9abcef3950540cb99cb97af991a3f58325359592179e8dc9e2d0752
+  data.tar.gz: f3dacb78ba4309d724c7c469e4ff00457921e97d567f808a14cfe48efb38d45fadee7303f31c8f6e326037f8de27783302561acd0b84e4d42487bada7da8fed8

data/app/assets/javascripts/dbviewer/home.js

@@ -1,4 +1,4 @@
-document.addEventListener("DOMContentLoaded", function () {
+document.addEventListener("DOMContentLoaded", async function () {
   // Helper function to format numbers with commas
   function numberWithDelimiter(number) {
     return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
@@ -24,13 +24,6 @@ document.addEventListener("DOMContentLoaded", function () {
       data.total_tables || 0;
   }
 
-  function updateRelationshipsCount(data) {
-    document.getElementById("relationships-loading").classList.add("d-none");
-    document.getElementById("relationships-count").classList.remove("d-none");
-    document.getElementById("relationships-count").textContent =
-      data.total_relationships || 0;
-  }
-
   function updateDatabaseSize(data) {
     document.getElementById("size-loading").classList.add("d-none");
     document.getElementById("size-count").classList.remove("d-none");
@@ -186,102 +179,113 @@ document.addEventListener("DOMContentLoaded", function () {
     `;
   }
 
-  // Load tables count data
-  fetch(document.getElementById("api_tables_path").value, {
-    headers: {
-      Accept: "application/json",
-      "X-Requested-With": "XMLHttpRequest",
-    },
-  })
-    .then((response) => {
+  async function fetchTableCount() {
+    try {
+      const response = await fetch(
+        document.getElementById("api_tables_path").value,
+        {
+          headers: {
+            Accept: "application/json",
+            "X-Requested-With": "XMLHttpRequest",
+          },
+        }
+      );
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
       }
-      return response.json();
-    })
-    .then((data) => {
+      const data = await response.json();
       updateTablesCount(data);
-    })
-    .catch((error) => {
+    } catch (error) {
       console.error("Error loading tables count:", error);
       const loading = document.getElementById("tables-loading");
       const count = document.getElementById("tables-count");
       loading.classList.add("d-none");
       count.classList.remove("d-none");
       count.innerHTML = '<span class="text-danger">Error</span>';
-    });
+    }
+  }
 
-  // Load database size data
-  fetch(document.getElementById("size_api_database_path").value, {
-    headers: {
-      Accept: "application/json",
-      "X-Requested-With": "XMLHttpRequest",
-    },
-  })
-    .then((response) => {
+  async function fetchDatabaseSize() {
+    try {
+      const response = await fetch(
+        document.getElementById("size_api_database_path").value,
+        {
+          headers: {
+            Accept: "application/json",
+            "X-Requested-With": "XMLHttpRequest",
+          },
+        }
+      );
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
       }
-      return response.json();
-    })
-    .then((data) => {
+      const data = await response.json();
       updateDatabaseSize(data);
-    })
-    .catch((error) => {
+    } catch (error) {
       console.error("Error loading database size:", error);
       const loading = document.getElementById("size-loading");
       const count = document.getElementById("size-count");
       loading.classList.add("d-none");
       count.classList.remove("d-none");
       count.innerHTML = '<span class="text-danger">Error</span>';
-    });
+    }
+  }
 
-  // Load records data separately
-  fetch(document.getElementById("records_api_tables_path").value, {
-    headers: {
-      Accept: "application/json",
-      "X-Requested-With": "XMLHttpRequest",
-    },
-  })
-    .then((response) => {
+  async function fetchRecordsCount() {
+    try {
+      const response = await fetch(
+        document.getElementById("records_api_tables_path").value,
+        {
+          headers: {
+            Accept: "application/json",
+            "X-Requested-With": "XMLHttpRequest",
+          },
+        }
+      );
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
       }
-      return response.json();
-    })
-    .then((recordsData) => {
-      updateRecordsData(recordsData);
-    })
-    .catch((error) => {
-      console.error("Error loading records data:", error);
-      // Update records-related UI with error state
-      const recordsLoading = document.getElementById("records-loading");
-      const recordsCount = document.getElementById("records-count");
-      recordsLoading.classList.add("d-none");
-      recordsCount.classList.remove("d-none");
-      recordsCount.innerHTML = '<span class="text-danger">Error</span>';
-
-      showError("largest-tables-container", error.message);
-    });
+      const data = await response.json();
+      updateRecordsData(data);
+    } catch (error) {
+      console.error("Error loading records count:", error);
+      const loading = document.getElementById("records-loading");
+      const count = document.getElementById("records-count");
+      loading.classList.add("d-none");
+      count.classList.remove("d-none");
+      count.innerHTML = '<span class="text-danger">Error</span>';
+    }
+  }
 
-  // Load recent queries data
-  fetch(document.getElementById("recent_api_queries_path").value, {
-    headers: {
-      Accept: "application/json",
-      "X-Requested-With": "XMLHttpRequest",
-    },
-  })
-    .then((response) => {
+  async function fetchRecentQueries() {
+    try {
+      const response = await fetch(
+        document.getElementById("recent_api_queries_path").value,
+        {
+          headers: {
+            Accept: "application/json",
+            "X-Requested-With": "XMLHttpRequest",
+          },
+        }
+      );
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`);
       }
-      return response.json();
-    })
-    .then((data) => {
+      const data = await response.json();
       updateRecentQueries(data);
-    })
-    .catch((error) => {
+    } catch (error) {
       console.error("Error loading recent queries:", error);
       showError("recent-queries-container", error.message);
-    });
+    }
+  }
+  // Load database size data (Loading records first to prevent race condition on dbviewer model constant creation)
+  await fetchRecordsCount();
+
+  Promise.all([
+    fetchTableCount(),
+    fetchDatabaseSize(),
+    fetchRecentQueries(),
+  ]).catch((error) => {
+    console.error("Error loading initial data:", error);
+  });
 });

data/lib/dbviewer/query/parser.rb

@@ -62,7 +62,12 @@ module Dbviewer
       # @return [Boolean] True if the query should be skipped
       def self.should_skip_internal_query?(event)
         event.payload[:name].include?("Dbviewer::") ||
-        event.payload[:sql].include?("PRAGMA")
+        # SQLite specific check for size queries
+        event.payload[:sql].include?("PRAGMA") ||
+        # PostgreSQL specific check for size queries
+        event.payload[:sql].include?("pg_database_size(current_database())") ||
+        # MySQL specific check for size queries
+        event.payload[:sql].include?("SUM(data_length + index_length) AS size FROM information_schema.TABLES")
       end
     end
   end

data/lib/dbviewer/version.rb

@@ -1,3 +1,3 @@
 module Dbviewer
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbviewer
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Wailan Tirajoh