dbviewer 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e50cbafa3a2fc1372ce4150c0de4d54001345af9e7d487b048ba3d59929fd2
-  data.tar.gz: 3e84c14c32a912f5c447dc2d4525231f83cd2bd272f99a3b4e19261b692ee2c3
+  metadata.gz: 72e7257a74294ca4a6ad8b53fc497ca9eb0727772e798b2c4d7fa2c164b35531
+  data.tar.gz: d01a7c934e3e859f06f94a746671974dd93813e832c6f5f54df49b3071e95178
 SHA512:
-  metadata.gz: 5d12f7e3bc158c902256ce416e7770d95436deefcb12f7a54673200d06706d57e5368a8ddd2d6ed374c5c64ebe753c82619fa505864b5f002cf805e6d3d11146
-  data.tar.gz: 645d438dd54e867e6f58c2d0e2f1cdc09c49652b97cfd93ce39758440dea8f58e14910a5718d677513762195a5346a225c11fa289597ef6a7b28e4cf75541e2a
+  metadata.gz: 79511e9ac29ca71e4834b958c54b36ee05f83e831f1426745282139ea6b46d5e0e1bcd2a2b31df956987218bfc44239fa624dba86f74ec4858cc35aea4af8536
+  data.tar.gz: e63f51557b5f2431f63c920989a1b13f7ed5c1cbe5cd708091fc8f728e649caae11a6c09a754d6522b2dbbb3408cb380a2ded2f438770e8b9c2d49b782bdcd7f

data/README.md

@@ -44,7 +44,8 @@ It's designed for development, debugging, and database analysis, offering a clea
 <details>
   <summary>Click to see more screenshots</summary>
   
-  #### Dashboard Overview
+#### Dashboard Overview
+
   <img width="1470" alt="image" src="https://github.com/user-attachments/assets/4e803d51-9a5b-4c80-bb4c-a761dba15a40" />
 
 #### Table Details
@@ -76,7 +77,7 @@ gem "dbviewer", group: :development
 And then execute:
 
 ```bash
-$ bundle
+bundle
 ```
 
 ## 🔧 Usage
@@ -274,6 +275,7 @@ With the addition of Basic Authentication, DBViewer can now be used in any envir
    ```
 
 3. Access the tool through your regular application URL:
+
    ```
    https://yourdomain.com/dbviewer?override_env_check=your_secure_random_key
    ```
@@ -288,6 +290,36 @@ When used in production, ensure:
 - You access DBViewer over HTTPS connections only
 - Access is limited to trusted administrators only
 
+## 🔄 Updating DBViewer
+
+To keep DBViewer up to date with the latest features, security patches, and bug fixes, follow these steps:
+
+### Using Bundler
+
+The simplest way to update is using Bundler:
+
+- Update your Gemfile with the desired version:
+
+   ```ruby
+   # For the latest version
+   gem "dbviewer", group: :development
+   
+   # Or specify a version
+   gem "dbviewer", "~> 0.3.2", group: :development
+   ```
+
+- Run bundle update:
+
+  ```ruby
+  bundle update dbviewer
+  ```
+
+- Restart your Rails server to apply the changes:
+
+  ```ruby
+  rails server
+  ```
+
 ## 🤌🏻 Contributing
 
 Bug reports and pull requests are welcome.

data/app/controllers/concerns/dbviewer/database_operations.rb

@@ -11,6 +11,12 @@ module Dbviewer
       @database_manager ||= ::Dbviewer::DatabaseManager.new
     end
 
+    # Initialize the table query operations manager
+    # This gives direct access to table query operations when needed
+    def table_query_operations
+      @table_query_operations ||= database_manager.table_query_operations
+    end
+
     # Get the name of the current database
     def get_database_name
       adapter = database_manager.connection.adapter_name.downcase
@@ -151,19 +157,8 @@ module Dbviewer
     end
 
     # Fetch records for a table with pagination and sorting
-    def fetch_table_records(table_name)
-      column_filters = params[:column_filters] || {}
-      # Clean up blank filters
-      column_filters.reject! { |_, v| v.blank? }
-
-      database_manager.table_records(
-        table_name,
-        @current_page,
-        @order_by,
-        @order_direction,
-        @per_page,
-        column_filters || {}
-      )
+    def fetch_table_records(table_name, query_params)
+      database_manager.table_records(table_name, query_params)
     end
 
     # Get filtered record count for a table
@@ -377,17 +372,24 @@ module Dbviewer
     end
 
     # Export table data to CSV
-    def export_table_to_csv(table_name, limit = 10000, include_headers = true)
+    def export_table_to_csv(table_name, query_params = nil, include_headers = true)
       require "csv"
 
       begin
-        records = database_manager.table_records(
-          table_name,
-          1, # First page
-          nil, # Default sorting
-          "asc",
-          limit # Limit number of records
-        )
+        if query_params.is_a?(Dbviewer::TableQueryParams)
+          # Use the query params object directly
+          records = database_manager.query_operations.table_records(table_name, query_params)
+        else
+          # Legacy support for the old method signature
+          limit = query_params.is_a?(Numeric) ? query_params : 10000
+          records = database_manager.table_records(
+            table_name,
+            1, # First page
+            nil, # Default sorting
+            "asc",
+            limit # Limit number of records
+          )
+        end
 
         csv_data = CSV.generate do |csv|
           # Add headers if requested

data/app/controllers/concerns/dbviewer/pagination_concern.rb

@@ -35,6 +35,14 @@ module Dbviewer
       @order_direction = "ASC" unless self.class::VALID_SORT_DIRECTIONS.include?(@order_direction)
     end
 
+    def fetch_total_count(table_name, query_params)
+      if query_params.column_filters.present? && query_params.column_filters.values.any?(&:present?)
+        fetch_filtered_record_count(table_name, query_params.column_filters)
+      else
+        fetch_table_record_count(table_name)
+      end
+    end
+
     # Calculate the total number of pages
     def calculate_total_pages(total_count, per_page)
       (total_count.to_f / per_page).ceil

data/app/controllers/dbviewer/tables_controller.rb

@@ -2,34 +2,38 @@ module Dbviewer
   class TablesController < ApplicationController
     include Dbviewer::PaginationConcern
 
+    before_action :set_table_name, except: [ :index ]
+
     def index
       @tables = fetch_tables_with_stats(include_record_counts: true)
     end
 
     def show
-      @table_name = params[:id]
-      @columns = fetch_table_columns(@table_name)
-      @metadata = fetch_table_metadata(@table_name)
-      @tables = fetch_tables_with_stats  # Fetch tables for sidebar
-
       set_pagination_params
       set_sorting_params
 
-      # Extract column filters from params
+      # Get column filters from params first
       @column_filters = params[:column_filters].presence ? params[:column_filters].to_enum.to_h : {}
 
-      if @column_filters.present? && @column_filters.values.any?(&:present?)
-        @total_count = fetch_filtered_record_count(@table_name, @column_filters)
-      else
-        @total_count = fetch_table_record_count(@table_name)
-      end
-
+      # Then apply global creation filters (this will modify @column_filters)
+      set_global_filters
+
+      # Now create the query params with the combined filters
+      query_params = Dbviewer::TableQueryParams.new(
+        page: @current_page,
+        per_page: @per_page,
+        order_by: @order_by,
+        direction: @order_direction,
+        column_filters: @column_filters.reject { |_, v| v.blank? }
+      )
+      @total_count = fetch_total_count(@table_name, query_params)
+      @records = fetch_table_records(@table_name, query_params)
       @total_pages = calculate_total_pages(@total_count, @per_page)
-      @records = fetch_table_records(@table_name)
+      @columns = fetch_table_columns(@table_name)
+      @metadata = fetch_table_metadata(@table_name)
 
-      # Ensure @records is never nil to prevent template errors
       if @records.nil?
-        column_names = fetch_table_columns(@table_name).map { |c| c[:name] }
+        column_names = @columns.map { |c| c[:name] }
         @records = ActiveRecord::Result.new(column_names, [])
       end
 
@@ -53,8 +57,6 @@ module Dbviewer
     end
 
     def mini_erd
-      @table_name = params[:id]
-
       begin
         @erd_data = fetch_mini_erd_for_table(@table_name)
 
@@ -81,7 +83,6 @@ module Dbviewer
     end
 
     def query
-      @table_name = params[:id]
       @read_only_mode = true # Flag to indicate we're in read-only mode
       @columns = fetch_table_columns(@table_name)
       @tables = fetch_tables_with_stats  # Fetch tables for sidebar
@@ -102,20 +103,98 @@ module Dbviewer
         return
       end
 
-      table_name = params[:id]
       limit = (params[:limit] || 10000).to_i
       include_headers = params[:include_headers] != "0"
 
-      csv_data = export_table_to_csv(table_name, limit, include_headers)
+      # Apply global creation filters
+      set_global_filters
+
+      # Create query parameters for export
+      query_params = Dbviewer::TableQueryParams.new(
+        page: 1,
+        per_page: limit,
+        order_by: nil,
+        direction: "asc",
+        column_filters: @column_filters.reject { |_, v| v.blank? }
+      )
+
+      # Get filtered data for export
+      csv_data = export_table_to_csv(@table_name, query_params, include_headers)
 
       # Set filename with timestamp for uniqueness
       timestamp = Time.now.strftime("%Y%m%d%H%M%S")
-      filename = "#{table_name}_export_#{timestamp}.csv"
+
+      # Add filter info to filename if filters are applied
+      filename_suffix = ""
+      if @creation_filter_start.present? || @creation_filter_end.present?
+        filename_suffix = "_filtered"
+      end
+
+      filename = "#{@table_name}#{filename_suffix}_#{timestamp}.csv"
 
       # Send data as file
       send_data csv_data,
                 type: "text/csv; charset=utf-8; header=present",
                 disposition: "attachment; filename=#{filename}"
     end
+
+    private
+
+    def set_table_name
+      @table_name = params[:id]
+    end    # Handle global creation datetime filters across tables
+    def set_global_filters
+      # Store creation filter datetimes in session to persist between table navigation
+      if params[:creation_filter_start].present?
+        session[:creation_filter_start] = params[:creation_filter_start]
+      end
+
+      if params[:creation_filter_end].present?
+        session[:creation_filter_end] = params[:creation_filter_end]
+      end
+
+      # Clear filters if explicitly requested
+      if params[:clear_creation_filter] == "true"
+        session.delete(:creation_filter_start)
+        session.delete(:creation_filter_end)
+      end
+
+      # Set instance variables for view access
+      @creation_filter_start = session[:creation_filter_start]
+      @creation_filter_end = session[:creation_filter_end]
+
+      # Initialize column_filters if not present
+      @column_filters ||= {}
+
+      # Apply creation filters to column_filters if the table has a created_at column
+      if has_timestamp_column?(@table_name) && (@creation_filter_start.present? || @creation_filter_end.present?)
+        # Clear any existing created_at filters to avoid conflicts
+        @column_filters.delete("created_at")
+        @column_filters.delete("created_at_operator")
+        @column_filters.delete("created_at_end")
+
+        if @creation_filter_start.present? && @creation_filter_end.present?
+          # If both start and end are present, set up a range filter
+          @column_filters["created_at"] = @creation_filter_start
+          @column_filters["created_at_end"] = @creation_filter_end
+          # No need for operator when using start and end together
+          Rails.logger.info("[DBViewer] Setting creation filter range: #{@creation_filter_start} to #{@creation_filter_end}")
+        elsif @creation_filter_start.present?
+          # Only start date is present
+          @column_filters["created_at"] = @creation_filter_start
+          @column_filters["created_at_operator"] = "gte" # Greater than or equal
+          Rails.logger.info("[DBViewer] Setting creation filter start: #{@creation_filter_start}")
+        elsif @creation_filter_end.present?
+          # Only end date is present
+          @column_filters["created_at"] = @creation_filter_end
+          @column_filters["created_at_operator"] = "lte" # Less than or equal
+          Rails.logger.info("[DBViewer] Setting creation filter end: #{@creation_filter_end}")
+        end
+      else
+        if @creation_filter_start.present? || @creation_filter_end.present?
+          Rails.logger.info("[DBViewer] Creation filter present but table #{@table_name} has no created_at column")
+        end
+      end
+    end
   end
 end

data/app/helpers/dbviewer/application_helper.rb

@@ -1,5 +1,19 @@
 module Dbviewer
   module ApplicationHelper
+    # Check if a table has a created_at column
+    def has_timestamp_column?(table_name)
+      return false unless table_name.present?
+
+      # Get the columns for the table directly using DatabaseManager
+      columns = get_database_manager.table_columns(table_name)
+      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::DatabaseManager.new
+    end
+
     def format_cell_value(value)
       return "NULL" if value.nil?
       return value.to_s.truncate(100) unless value.is_a?(String)
@@ -114,5 +128,64 @@ module Dbviewer
     def logs_nav_class
       active_nav_class("logs")
     end
+
+    # 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
+        direction = current_direction == "ASC" ? "up" : "down"
+        "<i class='bi bi-sort-#{direction}'></i>".html_safe
+      else
+        "<i class='bi bi-filter invisible sort-icon'></i>".html_safe
+      end
+    end
+
+    # Determine the next sort direction based on the current one
+    def next_sort_direction(column_name, current_order_by, current_direction)
+      if column_name == current_order_by && current_direction == "ASC"
+        "DESC"
+      else
+        "ASC"
+      end
+    end
+
+    # Generate a sortable column header link
+    def sortable_column_header(column_name, current_order_by, current_direction, table_name, current_page, per_page, column_filters)
+      is_sorted = column_name == current_order_by
+      sort_direction = next_sort_direction(column_name, current_order_by, current_direction)
+
+      aria_sort = if is_sorted
+        current_direction.downcase == "asc" ? "ascending" : "descending"
+      else
+        "none"
+      end
+
+      # Build parameters for the sort link
+      sort_params = {
+        order_by: column_name,
+        order_direction: sort_direction,
+        page: current_page,
+        per_page: per_page,
+        column_filters: column_filters
+      }
+
+      # Add creation filter parameters if they're in the controller
+      if defined?(@creation_filter_start) && @creation_filter_start.present?
+        sort_params[:creation_filter_start] = @creation_filter_start
+      end
+
+      if defined?(@creation_filter_end) && @creation_filter_end.present?
+        sort_params[:creation_filter_end] = @creation_filter_end
+      end
+
+      link_to table_path(table_name, sort_params),
+        class: "d-flex align-items-center text-decoration-none text-reset column-sort-link",
+        title: "Sort by #{column_name} (#{sort_direction.downcase})",
+        "aria-sort": aria_sort,
+        role: "button",
+        tabindex: "0" do
+          content_tag(:span, column_name, class: "column-name") +
+          content_tag(:span, sort_icon(column_name, current_order_by, current_direction), class: "sort-icon-container")
+      end
+    end
   end
 end

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

@@ -5,13 +5,158 @@
            id="tableSearch" placeholder="Filter tables..." aria-label="Filter tables">
   </div>
   
+  <div class="p-2">
+    <div class="accordion accordion-flush" id="creationFilterAccordion">
+      <div class="accordion-item border-0">
+        <h2 class="accordion-header" id="creationFilterHeading">
+          <button class="accordion-button p-2 collapsed" type="button" data-bs-toggle="collapse" 
+                  data-bs-target="#creationFilterCollapse" aria-expanded="false" 
+                  aria-controls="creationFilterCollapse">
+            <i class="bi bi-calendar-range me-2"></i> Creation Filter
+            <% if @creation_filter_start.present? || @creation_filter_end.present? %>
+              <% if @table_name.present? && has_timestamp_column?(@table_name) %>
+                <span class="badge bg-success ms-2">Active</span>
+              <% else %>
+                <span class="badge bg-secondary ms-2">Set</span>
+              <% end %>
+            <% end %>
+          </button>
+        </h2>
+        <div id="creationFilterCollapse" class="accordion-collapse collapse" aria-labelledby="creationFilterHeading">
+          <div class="accordion-body p-2">
+            <form id="creationFilterForm" action="<%= request.path %>" method="get" class="mb-0">
+              <!-- Preserve existing query parameters -->
+              <input type="hidden" name="page" value="<%= @current_page %>">
+              <input type="hidden" name="per_page" value="<%= @per_page %>">
+              <input type="hidden" name="order_by" value="<%= @order_by %>">
+              <input type="hidden" name="order_direction" value="<%= @order_direction %>">
+              
+              <!-- Datetime range fields -->
+              <div class="mb-2">
+                <label for="creationFilterStart" class="form-label mb-1 small">Start Date/Time</label>
+                <input type="datetime-local" id="creationFilterStart" name="creation_filter_start" 
+                       class="form-control form-control-sm" value="<%= @creation_filter_start %>">
+              </div>
+              <div class="mb-2">
+                <label for="creationFilterEnd" class="form-label mb-1 small">End Date/Time</label>
+                <input type="datetime-local" id="creationFilterEnd" name="creation_filter_end" 
+                       class="form-control form-control-sm" value="<%= @creation_filter_end %>">
+              </div>
+              
+              <div class="d-flex justify-content-between">
+                <button type="submit" class="btn btn-primary btn-sm">Apply</button>
+                <% if @creation_filter_start.present? || @creation_filter_end.present? %>
+                  <% 
+                    # Preserve other query params when clearing creation filter
+                    clear_params = {
+                      clear_creation_filter: true,
+                      page: @current_page,
+                      per_page: @per_page,
+                      order_by: @order_by,
+                      order_direction: @order_direction
+                    }
+                  %>
+                  <a href="<%= request.path %>?<%= clear_params.to_query %>" class="btn btn-outline-secondary btn-sm">Clear</a>
+                <% end %>
+              </div>
+              <div class="mt-2 small">
+                <% if @table_name.present? && has_timestamp_column?(@table_name) && (@creation_filter_start.present? || @creation_filter_end.present?) %>
+                  <div class="text-success">
+                    <i class="bi bi-check-circle-fill"></i>
+                    Filter active on this table.
+                    <% if @current_page == 1 && @records && @records.rows && @records.rows.empty? %>
+                      <div class="alert alert-warning p-1 mt-2 small">
+                        <i class="bi bi-exclamation-triangle-fill"></i>
+                        No records match the filter criteria.
+                      </div>
+                    <% end %>
+                  </div>
+                <% elsif @table_name.present? && (@creation_filter_start.present? || @creation_filter_end.present?) %>
+                  <div class="text-warning">
+                    <i class="bi bi-exclamation-circle-fill"></i>
+                    This table has no <code>created_at</code> column.
+                  </div>
+                <% elsif !@table_name.present? && (@creation_filter_start.present? || @creation_filter_end.present?) %>
+                  <div class="text-info">
+                    <i class="bi bi-info-circle-fill"></i>
+                    Filter will be applied on tables with <code>created_at</code> column.
+                  </div>
+                <% else %>
+                  <div class="text-muted">
+                    <i class="bi bi-info-circle-fill"></i>
+                    Filters apply to tables with a <code>created_at</code> column.
+                  </div>
+                <% end %>
+              </div>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Add custom styling for datetime inputs -->
+  <style>
+    /* Better datetime input styling */
+    input[type="datetime-local"] {
+      padding-right: 0.5rem;
+    }
+    
+    /* Dark mode support for datetime inputs */
+    [data-bs-theme="dark"] input[type="datetime-local"] {
+      background-color: rgba(255,255,255,0.1);
+      color: #fff;
+      border-color: rgba(255,255,255,0.15);
+    }
+    
+    [data-bs-theme="dark"] input[type="datetime-local"]::-webkit-calendar-picker-indicator {
+      filter: invert(1);
+    }
+  </style>
+  
+  <script>
+    // Set default values for datetime inputs when empty
+    document.addEventListener('DOMContentLoaded', function() {
+      const startInput = document.getElementById('creationFilterStart');
+      const endInput = document.getElementById('creationFilterEnd');
+      
+      // When applying filter with empty start date, default to beginning of current month
+      if (startInput) {
+        startInput.addEventListener('click', function() {
+          if (!this.value) {
+            const now = new Date();
+            const firstDay = new Date(now.getFullYear(), now.getMonth(), 1);
+            const formattedDate = firstDay.toISOString().slice(0, 16); // Format: YYYY-MM-DDTHH:MM
+            this.value = formattedDate;
+          }
+        });
+      }
+      
+      // When applying filter with empty end date, default to current datetime
+      if (endInput) {
+        endInput.addEventListener('click', function() {
+          if (!this.value) {
+            const now = new Date();
+            const formattedDate = now.toISOString().slice(0, 16); // Format: YYYY-MM-DDTHH:MM
+            this.value = formattedDate;
+          }
+        });
+      }
+    });
+  </script>
 </div>
 
 <div class="dbviewer-sidebar-content">
   <% if @tables.any? %>
     <div class="list-group list-group-flush" id="tablesList">
       <% @tables.each do |table| %>
-        <%= link_to table_path(table[:name]), title: table[:name],
+        <% 
+          # Build table URL with creation filter params if they exist
+          table_url_params = {}
+          table_url_params[:creation_filter_start] = @creation_filter_start if @creation_filter_start.present?
+          table_url_params[:creation_filter_end] = @creation_filter_end if @creation_filter_end.present?
+        %>
+        <%= 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] },

data/app/views/dbviewer/tables/index.html.erb

@@ -44,7 +44,13 @@
           <% @tables.each do |table| %>
             <tr>
               <td class="fw-medium">
-                <%= link_to table[:name], table_path(table[:name]), class: "text-decoration-none" %>
+                <% 
+                  # Include creation filter params in table links
+                  filter_params = {}
+                  filter_params[:creation_filter_start] = session[:creation_filter_start] if session[:creation_filter_start].present?
+                  filter_params[:creation_filter_end] = session[:creation_filter_end] if session[:creation_filter_end].present?
+                %>
+                <%= link_to table[:name], table_path(table[:name], filter_params), class: "text-decoration-none" %>
               </td>
               <td class="text-end">
                 <span class="badge bg-secondary-subtle"><%= table[:record_count] %></span>