dbviewer 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8d012a4b4e0bde526cf42fa8a40dd1402a2f787ae06381dbf3b6bfeef1dad1
-  data.tar.gz: 49a0b962162fadbdbe51feade176aaf51d211126f45295cf6df5b4f4614d019c
+  metadata.gz: 3b8c2130ace09b45819bd1fa2d739fecb8a32a75a1348e7c094cb8ce0d66bd71
+  data.tar.gz: 65ff2d9bf93a401c7b193dca798e8afdfe4bb535d7b0c4ee5ce7729312792d49
 SHA512:
-  metadata.gz: 76520c547bb120caed2093b6138c55f818c6fd9bbbcdff534ea208af050e721b2319179b69710480330783db884d8f1e6bd661ed807c91599717a90811f449fd
-  data.tar.gz: ba7080bc4598a5e3cf07bede7181ff91e2ab687d43c5583b616f7fa8edc14c1cd871ef9e27764a7ef6cddd94617c4433949328e46f19ec88442d9cc1af2edfbf
+  metadata.gz: fdc6983afc3916e25335e0ce9cb33d9525b16dc7c468d24d4a22794c8fb3509d77527a7bd64d48d2e5fd2637eed1b5cea0a3a92d3011a3486b2869d93ca363f9
+  data.tar.gz: e3a401344d1fcf3fc2d2ecedc0ac283295ef6c5c364fe396095b53d284af42430ab3f49dda08b6d2c78e0b6a0cc808977b558a06b0aa00287df52ec5b4bb2125

data/README.md

@@ -180,7 +180,7 @@ Dbviewer.configure do |config|
 end
 ```
 
-Each connection needs to reference an ActiveRecord class that establishes a database connection. For more details, see [Multiple Database Connections](docs/multiple_connections.md).
+Each connection needs to reference an ActiveRecord class that establishes a database connection.
 
 ## 🪵 Query Logging (Development Only)
 
@@ -326,21 +326,21 @@ If you prefer to set up manually:
 bundle install
 
 # Set up the dummy app database
-cd test/dummy
+cd sample/app
 bin/rails db:prepare
 bin/rails db:migrate
 bin/rails db:seed
 cd ../..
 
 # Prepare test environment
-cd test/dummy && bin/rails db:test:prepare && cd ../..
+cd sample/app && bin/rails db:test:prepare && cd ../..
 ```
 
 ### Development Commands
 
 ```bash
 # Start the development server
-cd test/dummy && bin/rails server
+cd sample/app && bin/rails server
 
 # Run tests
 bundle exec rspec
@@ -357,7 +357,7 @@ gem build dbviewer.gemspec
 
 ### Testing Your Changes
 
-1. Start the dummy Rails application: `cd test/dummy && bin/rails server`
+1. Start the dummy Rails application: `cd sample/app && bin/rails server`
 2. Visit `http://localhost:3000/dbviewer` to test your changes
 3. The dummy app includes sample data across multiple tables to test various DBViewer features
 

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/setup"
 
-APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+APP_RAKEFILE = File.expand_path("sample/app/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
 load "rails/tasks/statistics.rake"

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

@@ -9,6 +9,15 @@ document.addEventListener("DOMContentLoaded", function () {
     return;
   }
 
+  // Helper function to debounce rapid function calls
+  function debounce(func, wait) {
+    let timeout;
+    return function (...args) {
+      clearTimeout(timeout);
+      timeout = setTimeout(() => func.apply(this, args), wait);
+    };
+  }
+
   // Initialize mermaid with theme detection like mini ERD
   mermaid.initialize({
     startOnLoad: true,
@@ -102,6 +111,7 @@ document.addEventListener("DOMContentLoaded", function () {
   // Function to fetch relationships asynchronously
   async function fetchRelationships() {
     const apiPath = document.getElementById("relationships_api_path").value;
+    updateRelationshipsStatus(false, "Requesting relationships data...");
     try {
       const response = await fetch(apiPath, {
         headers: {
@@ -114,15 +124,19 @@ document.addEventListener("DOMContentLoaded", function () {
         throw new Error(`HTTP error! status: ${response.status}`);
       }
 
+      updateRelationshipsStatus(false, "Processing relationships data...");
       const data = await response.json();
       relationships = data.relationships || [];
       relationshipsLoaded = true;
-      updateRelationshipsStatus(true);
+      updateRelationshipsStatus(
+        true,
+        `Loaded ${relationships.length} relationships`
+      );
       return relationships;
     } catch (error) {
       console.error("Error fetching relationships:", error);
       relationshipsLoaded = true; // Mark as loaded even on error to prevent infinite loading
-      updateRelationshipsStatus(true);
+      updateRelationshipsStatus(true, "Failed to load relationships", true);
       return [];
     }
   }
@@ -155,20 +169,31 @@ document.addEventListener("DOMContentLoaded", function () {
   }
 
   // Function to update relationships status
-  function updateRelationshipsStatus(loaded) {
+  function updateRelationshipsStatus(loaded, message, isError = false) {
     const relationshipsStatus = document.getElementById("relationships-status");
     if (relationshipsStatus) {
-      if (loaded) {
+      if (loaded && !isError) {
         relationshipsStatus.innerHTML = `
             <i class="bi bi-check-circle text-success me-2"></i>
-            <small class="text-success">Relationships loaded</small>
+            <small class="text-success">${
+              message || "Relationships loaded"
+            }</small>
+          `;
+      } else if (loaded && isError) {
+        relationshipsStatus.innerHTML = `
+            <i class="bi bi-exclamation-triangle text-warning me-2"></i>
+            <small class="text-warning">${
+              message || "Error loading relationships"
+            }</small>
           `;
       } else {
         relationshipsStatus.innerHTML = `
             <div class="spinner-border spinner-border-sm text-secondary me-2" role="status">
               <span class="visually-hidden">Loading...</span>
             </div>
-            <small class="text-muted">Loading relationships...</small>
+            <small class="text-muted">${
+              message || "Loading relationships..."
+            }</small>
           `;
       }
     }
@@ -189,10 +214,23 @@ document.addEventListener("DOMContentLoaded", function () {
   updateLoadingStatus("Loading table details...");
 
   // Start fetching relationships immediately
-  updateRelationshipsStatus(false);
+  updateRelationshipsStatus(false, "Loading relationships...");
   const relationshipsPromise = fetchRelationships();
   const tablePath = document.getElementById("tables_path").value;
 
+  // Function to fetch tables in batches for better performance
+  async function fetchTablesInBatches(tables, batchSize = 5) {
+    const batches = [];
+    for (let i = 0; i < tables.length; i += batchSize) {
+      batches.push(tables.slice(i, i + batchSize));
+    }
+
+    for (const batch of batches) {
+      await Promise.all(batch.map((table) => fetchTableColumns(table.name)));
+      // This creates a visual effect of tables loading in batches
+    }
+  }
+
   // First pass: add all tables with minimal info and start loading columns
   // Function to fetch column data for a table
   async function fetchTableColumns(tableName) {
@@ -204,6 +242,12 @@ document.addEventListener("DOMContentLoaded", function () {
         },
       });
 
+      if (!response.ok) {
+        throw new Error(
+          `Failed to fetch table ${tableName}: ${response.status}`
+        );
+      }
+
       const data = await response.json();
 
       if (data && data.columns) {
@@ -217,22 +261,29 @@ document.addEventListener("DOMContentLoaded", function () {
       }
     } catch (error) {
       console.error(`Error fetching columns for table ${tableName}:`, error);
+      // Add better error handling
+      showError(
+        "Table Loading Error",
+        `Failed to load columns for table ${tableName}`,
+        error.message
+      );
       columnsLoadedCount++;
       updateTableProgress(columnsLoadedCount, totalTables);
       checkIfReadyToUpdate();
     }
   }
 
+  // Generate initial table representation
   tables.forEach(function (table) {
     const tableName = table.name;
     mermaidDefinition += `  ${tableName} {\n`;
     mermaidDefinition += `    string id\n`;
     mermaidDefinition += "  }\n";
-
-    // Start loading column data asynchronously
-    fetchTableColumns(tableName);
   });
 
+  // Start loading column data asynchronously in batches
+  fetchTablesInBatches(tables);
+
   // Function to check if we're ready to update the diagram with full data
   function checkIfReadyToUpdate() {
     if (columnsLoadedCount === totalTables && relationshipsLoaded) {
@@ -381,18 +432,54 @@ document.addEventListener("DOMContentLoaded", function () {
     panZoomInstance.zoom(1);
 
     // Add event listeners for zoom controls
-    document.getElementById("zoomIn").addEventListener("click", function () {
-      panZoomInstance.zoomIn();
-    });
+    document.getElementById("zoomIn").addEventListener(
+      "click",
+      debounce(function () {
+        panZoomInstance.zoomIn();
+      }, 100)
+    );
 
-    document.getElementById("zoomOut").addEventListener("click", function () {
-      panZoomInstance.zoomOut();
-    });
+    document.getElementById("zoomOut").addEventListener(
+      "click",
+      debounce(function () {
+        panZoomInstance.zoomOut();
+      }, 100)
+    );
+
+    document.getElementById("resetView").addEventListener(
+      "click",
+      debounce(function () {
+        panZoomInstance.reset();
+      }, 100)
+    );
 
-    document.getElementById("resetView").addEventListener("click", function () {
-      panZoomInstance.reset();
+    // Add keyboard shortcuts for zoom controls
+    document.addEventListener("keydown", (e) => {
+      if (e.ctrlKey || e.metaKey) {
+        if (e.key === "+" || e.key === "=") {
+          e.preventDefault();
+          panZoomInstance.zoomIn();
+        } else if (e.key === "-") {
+          e.preventDefault();
+          panZoomInstance.zoomOut();
+        } else if (e.key === "0") {
+          e.preventDefault();
+          panZoomInstance.reset();
+        }
+      }
     });
 
+    // Improve ARIA attributes
+    document
+      .getElementById("zoomIn")
+      .setAttribute("aria-label", "Zoom in diagram");
+    document
+      .getElementById("zoomOut")
+      .setAttribute("aria-label", "Zoom out diagram");
+    document
+      .getElementById("resetView")
+      .setAttribute("aria-label", "Reset diagram view");
+
     // Update initial percentage display
     const zoomDisplay = document.getElementById("zoomPercentage");
     if (zoomDisplay) {
@@ -447,12 +534,18 @@ document.addEventListener("DOMContentLoaded", function () {
       const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
 
       // Create download link and trigger download
+      const objectURL = URL.createObjectURL(blob);
       const downloadLink = document.createElement("a");
-      downloadLink.href = URL.createObjectURL(blob);
+      downloadLink.href = objectURL;
       downloadLink.download = `database_erd_${timestamp}.svg`;
       document.body.appendChild(downloadLink);
       downloadLink.click();
       document.body.removeChild(downloadLink);
+
+      // Clean up object URL
+      setTimeout(() => {
+        URL.revokeObjectURL(objectURL);
+      }, 100);
     } catch (error) {
       console.error("Error downloading SVG:", error);
       alert("Error downloading SVG. Please check console for details.");
@@ -520,12 +613,18 @@ document.addEventListener("DOMContentLoaded", function () {
 
         // Convert canvas to PNG and trigger download
         canvas.toBlob(function (blob) {
+          const objectURL = URL.createObjectURL(blob);
           const downloadLink = document.createElement("a");
-          downloadLink.href = URL.createObjectURL(blob);
+          downloadLink.href = objectURL;
           downloadLink.download = `database_erd_${timestamp}.png`;
           document.body.appendChild(downloadLink);
           downloadLink.click();
           document.body.removeChild(downloadLink);
+
+          // Clean up object URL
+          setTimeout(() => {
+            URL.revokeObjectURL(objectURL);
+          }, 100);
         }, "image/png");
 
         // Clean up
@@ -554,4 +653,38 @@ document.addEventListener("DOMContentLoaded", function () {
       e.preventDefault();
       downloadAsPNG();
     });
+
+  // Add theme observer to update diagram when theme changes
+  function setupThemeObserver() {
+    const observer = new MutationObserver((mutations) => {
+      mutations.forEach((mutation) => {
+        if (mutation.attributeName === "data-bs-theme") {
+          const newTheme =
+            document.documentElement.getAttribute("data-bs-theme");
+          mermaid.initialize({
+            theme: newTheme === "dark" ? "dark" : "default",
+            // Keep other settings
+            securityLevel: "loose",
+            er: {
+              diagramPadding: 20,
+              layoutDirection: "TB",
+              minEntityWidth: 100,
+              minEntityHeight: 75,
+              entityPadding: 15,
+              stroke: "gray",
+              fill: "honeydew",
+              fontSize: 20,
+            },
+          });
+          // Trigger redraw if diagram is already displayed
+          if (diagramReady) {
+            updateDiagramWithFullData();
+          }
+        }
+      });
+    });
+    observer.observe(document.documentElement, { attributes: true });
+  }
+
+  setupThemeObserver();
 });

data/app/controllers/dbviewer/api/queries_controller.rb

@@ -13,16 +13,12 @@ module Dbviewer
       def fetch_recent_queries
         return [] unless query_logging_enabled?
 
-        Dbviewer::Query::Logger.instance.recent_queries(limit: queries_limit)
+        Dbviewer::Query::Logger.instance.recent_queries(limit: 10)
       end
 
       def query_logging_enabled?
         Dbviewer.configuration.enable_query_logging
       end
-
-      def queries_limit
-        10
-      end
     end
   end
 end

data/app/controllers/dbviewer/tables_controller.rb

@@ -57,12 +57,7 @@ module Dbviewer
       @tables = fetch_tables  # Fetch tables for sidebar
 
       @query = prepare_query(@table_name, params[:query])
-      @records = begin
-        execute_query(@query)
-      rescue => e
-        @error = "Error executing query: #{e.message}"
-        nil
-      end
+      @records = execute_query(@query)
 
       render :query
     end

data/app/helpers/dbviewer/application_helper.rb

@@ -2,11 +2,13 @@ module Dbviewer
   module ApplicationHelper
     # Include all the helper modules organized by logical concerns
     include DatabaseHelper
-    include FilterHelper
     include FormattingHelper
-    include PaginationHelper
-    include SortingHelper
-    include TableRenderingHelper
+
+    include DatatableUiHelper
+    include DatatableUiFilterHelper
+    include DatatableUiPaginationHelper
+    include DatatableUiSortingHelper
+    include DatatableUiTableHelper
     include NavigationHelper
     include UiHelper
   end

data/app/helpers/dbviewer/database_helper.rb

@@ -1,5 +1,10 @@
 module Dbviewer
   module DatabaseHelper
+    # Helper to access the database manager
+    def get_database_manager
+      @database_manager ||= ::Dbviewer::Database::Manager.new
+    end
+
     # Check if a table has a created_at column
     def has_timestamp_column?(table_name)
       return false unless table_name.present?
@@ -9,11 +14,6 @@ module Dbviewer
       columns.any? { |col| col[:name] == "created_at" && [ :datetime, :timestamp ].include?(col[:type]) }
     end
 
-    # Helper to access the database manager
-    def get_database_manager
-      @database_manager ||= ::Dbviewer::Database::Manager.new
-    end
-
     # Extract column type from columns info
     def column_type_from_info(column_name, columns)
       return nil unless columns.present?
@@ -21,39 +21,5 @@ module Dbviewer
       column_info = columns.find { |c| c[:name].to_s == column_name.to_s }
       column_info ? column_info[:type].to_s.downcase : nil
     end
-
-    # Get appropriate icon for column data type
-    def column_type_icon(column_type)
-      case column_type.to_s.downcase
-      when /int/, /serial/, /number/, /decimal/, /float/, /double/
-        "bi-123"
-      when /char/, /text/, /string/, /uuid/
-        "bi-fonts"
-      when /date/, /time/
-        "bi-calendar"
-      when /bool/
-        "bi-toggle-on"
-      when /json/, /jsonb/
-        "bi-braces"
-      when /array/
-        "bi-list-ol"
-      else
-        "bi-file-earmark"
-      end
-    end
-
-    # Determine if the current table should be active in the sidebar
-    def current_table?(table_name)
-      @table_name.present? && @table_name == table_name
-    end
-
-    # Format table name for display - truncate if too long
-    def format_table_name(table_name)
-      if table_name.length > 20
-        "#{table_name.first(17)}..."
-      else
-        table_name
-      end
-    end
   end
 end

data/app/helpers/dbviewer/{filter_helper.rb → datatable_ui_filter_helper.rb}

@@ -1,5 +1,5 @@
 module Dbviewer
-  module FilterHelper
+  module DatatableUiFilterHelper
     # Determine default operator based on column type
     def default_operator_for_column_type(column_type)
       if column_type && column_type =~ /char|text|string|uuid|enum/i

data/app/helpers/dbviewer/datatable_ui_helper.rb

@@ -0,0 +1,37 @@
+module Dbviewer
+  module DatatableUiHelper
+    # Get appropriate icon for column data type
+    def column_type_icon(column_type)
+      case column_type.to_s.downcase
+      when /int/, /serial/, /number/, /decimal/, /float/, /double/
+        "bi-123"
+      when /char/, /text/, /string/, /uuid/
+        "bi-fonts"
+      when /date/, /time/
+        "bi-calendar"
+      when /bool/
+        "bi-toggle-on"
+      when /json/, /jsonb/
+        "bi-braces"
+      when /array/
+        "bi-list-ol"
+      else
+        "bi-file-earmark"
+      end
+    end
+
+    # Format table name for display - truncate if too long
+    def format_table_name(table_name)
+      if table_name.length > 20
+        "#{table_name.first(17)}..."
+      else
+        table_name
+      end
+    end
+
+    # Determine if the current table should be active in the sidebar
+    def current_table?(table_name)
+      @table_name.present? && @table_name == table_name
+    end
+  end
+end

data/app/helpers/dbviewer/{pagination_helper.rb → datatable_ui_pagination_helper.rb}

@@ -1,5 +1,5 @@
 module Dbviewer
-  module PaginationHelper
+  module DatatableUiPaginationHelper
     # Common parameters for pagination and filtering
     def common_params(options = {})
       params = {

data/app/helpers/dbviewer/{sorting_helper.rb → datatable_ui_sorting_helper.rb}

@@ -1,5 +1,5 @@
 module Dbviewer
-  module SortingHelper
+  module DatatableUiSortingHelper
     # Returns a sort icon based on the current sort direction
     def sort_icon(column_name, current_order_by, current_direction)
       if column_name == current_order_by

data/app/helpers/dbviewer/{table_rendering_helper.rb → datatable_ui_table_helper.rb}

@@ -1,5 +1,5 @@
 module Dbviewer
-  module TableRenderingHelper
+  module DatatableUiTableHelper
     # Render a complete table header row with sortable columns
     def render_sortable_header_row(records, order_by, order_direction, table_name, current_page, per_page, column_filters)
       return content_tag(:tr) { content_tag(:th, "No columns available") } unless records&.columns

data/app/helpers/dbviewer/formatting_helper.rb

@@ -2,29 +2,56 @@ module Dbviewer
   module FormattingHelper
     def format_cell_value(value)
       return "NULL" if value.nil?
-      return value.to_s.truncate(100) unless value.is_a?(String)
+      return format_default_value(value) unless value.is_a?(String)
 
+      format_string_value(value)
+    end
+
+    private
+
+    def format_string_value(value)
       case value
-      when /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
-        # ISO 8601 datetime
-        begin
-          Time.parse(value).strftime("%Y-%m-%d %H:%M:%S")
-        rescue
-          value.to_s.truncate(100)
-        end
-      when /\A\d{4}-\d{2}-\d{2}\z/
-        # Date
-        value
-      when /\A{.+}\z/, /\A\[.+\]\z/
-        # JSON
-        begin
-          JSON.pretty_generate(JSON.parse(value)).truncate(100)
-        rescue
-          value.to_s.truncate(100)
-        end
+      when ->(v) { datetime_string?(v) }
+        format_datetime_value(value)
+      when ->(v) { date_string?(v) }
+        format_date_value(value)
+      when ->(v) { json_string?(v) }
+        format_json_value(value)
       else
-        value.to_s.truncate(100)
+        format_default_value(value)
       end
     end
+
+    def datetime_string?(value)
+      value.match?(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+    end
+
+    def date_string?(value)
+      value.match?(/\A\d{4}-\d{2}-\d{2}\z/)
+    end
+
+    def json_string?(value)
+      value.match?(/\A{.+}\z/) || value.match?(/\A\[.+\]\z/)
+    end
+
+    def format_datetime_value(value)
+      Time.parse(value).strftime("%Y-%m-%d %H:%M:%S")
+    rescue
+      format_default_value(value)
+    end
+
+    def format_date_value(value)
+      value
+    end
+
+    def format_json_value(value)
+      JSON.pretty_generate(JSON.parse(value)).truncate(100)
+    rescue
+      format_default_value(value)
+    end
+
+    def format_default_value(value)
+      value.to_s.truncate(100)
+    end
   end
 end

data/app/views/layouts/dbviewer/application.html.erb

@@ -115,44 +115,44 @@
         </div>
         <div class="offcanvas-body bg-body-tertiary">
           <ul class="navbar-nav mb-2 mb-lg-0 fw-medium">
-        <li class="nav-item py-1">
-          <%= link_to raw('<i class="bi bi-table me-2 text-primary"></i> Tables'), dbviewer.tables_path, class: "nav-link rounded #{tables_nav_class}" %>
-        </li>
-        <li class="nav-item py-1">
-          <%= link_to raw('<i class="bi bi-diagram-3 me-2 text-primary"></i> ERD'), dbviewer.entity_relationship_diagrams_path, class: "nav-link rounded #{erd_nav_class}" %>
-        </li>
-        <% if Dbviewer.configuration.enable_query_logging %>
-          <li class="nav-item py-1">
-            <%= link_to raw('<i class="bi bi-journal-code me-2 text-primary"></i> SQL Logs'), dbviewer.logs_path, class: "nav-link rounded #{logs_nav_class}" %>
-          </li>
-        <% end %>
-        <li class="nav-item dropdown py-1">
-          <a class="nav-link dropdown-toggle d-flex align-items-center rounded" href="#" id="offcanvasDbDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            <i class="bi bi-database me-2 text-primary"></i> <%= (current_conn = available_connections.find { |c| c[:current] }) ? current_conn[:name] : "Database" %>
-          </a>
-          <ul class="dropdown-menu shadow-sm mt-2" aria-labelledby="offcanvasDbDropdown">
-            <% available_connections.each do |connection| %>
-          <li>
-            <%= button_to connection_path(connection[:key]), method: :post, class: "dropdown-item border-0 w-100 text-start #{'active' if connection[:current]}" do %>
-              <% if connection[:current] %>
-            <i class="bi bi-check2-circle me-2 text-primary"></i>
-              <% else %>
-            <i class="bi bi-circle me-2"></i>
-              <% end %>
-              <%= connection[:name] %>
-            <% end %>
-          </li>
+            <li class="nav-item py-1">
+              <%= link_to raw('<i class="bi bi-table me-2 text-primary"></i> Tables'), dbviewer.tables_path, class: "nav-link rounded #{tables_nav_class}" %>
+            </li>
+            <li class="nav-item py-1">
+              <%= link_to raw('<i class="bi bi-diagram-3 me-2 text-primary"></i> ERD'), dbviewer.entity_relationship_diagrams_path, class: "nav-link rounded #{erd_nav_class}" %>
+            </li>
+            <% if Dbviewer.configuration.enable_query_logging %>
+              <li class="nav-item py-1">
+                <%= link_to raw('<i class="bi bi-journal-code me-2 text-primary"></i> SQL Logs'), dbviewer.logs_path, class: "nav-link rounded #{logs_nav_class}" %>
+              </li>
             <% end %>
-            <li><hr class="dropdown-divider"></li>
-            <li><%= link_to "<i class='bi bi-gear me-2'></i> Manage Connections".html_safe, connections_path, class: "dropdown-item" %></li>
-          </ul>
-        </li>
-        <li class="mt-4 pt-2 border-top">
-          <div class="d-flex align-items-center py-2">
-            <i class="bi bi-tools me-2 text-secondary"></i> 
-            <span class="text-secondary"><%= Rails.env %> environment</span>
-          </div>
-        </li>
+            <li class="nav-item dropdown py-1">
+              <a class="nav-link dropdown-toggle d-flex align-items-center rounded" href="#" id="offcanvasDbDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                <i class="bi bi-database me-2 text-primary"></i> <%= (current_conn = available_connections.find { |c| c[:current] }) ? current_conn[:name] : "Database" %>
+              </a>
+              <ul class="dropdown-menu shadow-sm mt-2" aria-labelledby="offcanvasDbDropdown">
+                <% available_connections.each do |connection| %>
+              <li>
+                <%= button_to connection_path(connection[:key]), method: :post, class: "dropdown-item border-0 w-100 text-start #{'active' if connection[:current]}" do %>
+                  <% if connection[:current] %>
+                <i class="bi bi-check2-circle me-2 text-primary"></i>
+                  <% else %>
+                <i class="bi bi-circle me-2"></i>
+                  <% end %>
+                  <%= connection[:name] %>
+                <% end %>
+              </li>
+                <% end %>
+                <li><hr class="dropdown-divider"></li>
+                <li><%= link_to "<i class='bi bi-gear me-2'></i> Manage Connections".html_safe, connections_path, class: "dropdown-item" %></li>
+              </ul>
+            </li>
+            <li class="mt-4 pt-2 border-top">
+              <div class="d-flex align-items-center py-2">
+                <i class="bi bi-tools me-2 text-secondary"></i> 
+                <span class="text-secondary"><%= Rails.env %> environment</span>
+              </div>
+            </li>
           </ul>
         </div>
       </div>

data/app/views/layouts/dbviewer/shared/_sidebar.html.erb

@@ -18,24 +18,7 @@
         <%= link_to table_path(table[:name], table_url_params), title: table[:name],
                     class: "list-group-item list-group-item-action d-flex align-items-center #{'active' if current_table?(table[:name])}", 
                     tabindex: "0", 
-                    data: { table_name: table[:name] },
-                    onkeydown: "
-                      if(event.key === 'ArrowDown') { 
-                        event.preventDefault();
-                        let next = this.nextElementSibling;
-                        while(next && next.classList.contains('d-none')) {
-                          next = next.nextElementSibling;
-                        }
-                        if(next) next.focus();
-                      } else if(event.key === 'ArrowUp') { 
-                        event.preventDefault();
-                        let prev = this.previousElementSibling;
-                        while(prev && prev.classList.contains('d-none')) {
-                          prev = prev.previousElementSibling;
-                        }
-                        if(prev) prev.focus();
-                        else document.getElementById('tableSearch')?.focus();
-                      }" do %>
+                    data: { table_name: table[:name] } do %>
           <div class="text-truncate">
             <i class="bi bi-table me-2"></i>
             <%= format_table_name(table[:name]) %>

data/lib/dbviewer/query/executor.rb

@@ -15,28 +15,7 @@ module Dbviewer
       # @return [ActiveRecord::Result] Result set with columns and rows
       # @raise [StandardError] If the query is invalid or unsafe
       def execute_query(sql)
-        # Validate and normalize the SQL
-        normalized_sql = ::Dbviewer::Validator::Sql.validate!(sql.to_s)
-
-        # Get max records from configuration
-        max_records = @config.max_records || 10000
-
-        # Add a safety limit if not already present
-        unless normalized_sql =~ /\bLIMIT\s+\d+\s*$/i
-          normalized_sql = "#{normalized_sql} LIMIT #{max_records}"
-        end
-
-        # Log and execute the query
-        Rails.logger.debug("[DBViewer] Executing SQL query: #{normalized_sql}")
-        start_time = Time.now
-        result = @connection.exec_query(normalized_sql)
-        duration = Time.now - start_time
-
-        Rails.logger.debug("[DBViewer] Query completed in #{duration.round(2)}s, returned #{result.rows.size} rows")
-        result
-      rescue => e
-        Rails.logger.error("[DBViewer] SQL query error: #{e.message} for query: #{sql}")
-        raise e
+        exec_query(normalize_sql(sql))
       end
 
       # Execute a SQLite PRAGMA command without adding a LIMIT clause
@@ -44,14 +23,20 @@ module Dbviewer
       # @return [ActiveRecord::Result] Result set with the PRAGMA value
       # @raise [StandardError] If the query is invalid or cannot be executed
       def execute_sqlite_pragma(pragma)
-        sql = "PRAGMA #{pragma}"
-        Rails.logger.debug("[DBViewer] Executing SQLite pragma: #{sql}")
-        result = @connection.exec_query(sql)
-        Rails.logger.debug("[DBViewer] Pragma completed, returned #{result.rows.size} rows")
-        result
-      rescue => e
-        Rails.logger.error("[DBViewer] SQLite pragma error: #{e.message} for pragma: #{pragma}")
-        raise e
+        exec_query("PRAGMA #{pragma}")
+      end
+
+      private
+
+      def exec_query(sql)
+        @connection.exec_query(sql)
+      end
+
+      def normalize_sql(sql)
+        normalized_sql = ::Dbviewer::Validator::Sql.validate!(sql.to_s)
+        max_records = @config.max_records || 10000
+        normalized_sql = "#{normalized_sql} LIMIT #{max_records}" unless normalized_sql =~ /\bLIMIT\s+\d+\s*$/i
+        normalized_sql
       end
     end
   end

data/lib/dbviewer/version.rb

@@ -1,3 +1,3 @@
 module Dbviewer
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbviewer
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Wailan Tirajoh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-14 00:00:00.000000000 Z
+date: 2025-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,12 +99,13 @@ files:
 - app/controllers/dbviewer/tables_controller.rb
 - app/helpers/dbviewer/application_helper.rb
 - app/helpers/dbviewer/database_helper.rb
-- app/helpers/dbviewer/filter_helper.rb
+- app/helpers/dbviewer/datatable_ui_filter_helper.rb
+- app/helpers/dbviewer/datatable_ui_helper.rb
+- app/helpers/dbviewer/datatable_ui_pagination_helper.rb
+- app/helpers/dbviewer/datatable_ui_sorting_helper.rb
+- app/helpers/dbviewer/datatable_ui_table_helper.rb
 - app/helpers/dbviewer/formatting_helper.rb
 - app/helpers/dbviewer/navigation_helper.rb
-- app/helpers/dbviewer/pagination_helper.rb
-- app/helpers/dbviewer/sorting_helper.rb
-- app/helpers/dbviewer/table_rendering_helper.rb
 - app/helpers/dbviewer/ui_helper.rb
 - app/jobs/dbviewer/application_job.rb
 - app/mailers/dbviewer/application_mailer.rb