dbviewer 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d46526c59b9c355c9e717e76ebe81299bbdb051be58fb1b789fbe2fa1c50c0e4
-  data.tar.gz: 713277fda9b00b0fe4a48b2e8324632f2c7920b25cbaad369afe2d159c2bcf29
+  metadata.gz: 53152d4109f427b7d3d32f38292f6c7add1aecc15e7bf9ce8db74458f24f8de8
+  data.tar.gz: dc556f4746314538c53a16cd1eabd811b91cfb6c35bee177971de3eae40f9f93
 SHA512:
-  metadata.gz: 77444f6cf1b7d847d114bdef9f965d9c90e4e216666db1fccb7de5652f92950cae7793bab07da982e473517f4c350d0dc186e094291138258c9a589de983bf5c
-  data.tar.gz: fc6801c693d632bf8a4bfe26d0aa4b0614ba8570867cf14575f279813c2b8599e5f3288f1bc0175d2db108d62ec2362d484c47a2e0059d5eb28c1a4d4a091d52
+  metadata.gz: e4b267eee75e4a92a6a139e226834ff051e306524e1450833b644467b3661c83bffcadb9920450f1196c12919b474f6dca7c3cc6b12f352899c5803984c930e7
+  data.tar.gz: f62a2d830f539f8636522035fa60e08535f27c8b0cb77eed42c4baf1103171533e1b8327975a696f5d3c7125bfbc9ae4dc20c1a21d145b3f7b56117f95ccb742

data/README.md

@@ -32,6 +32,11 @@ It's designed for development, debugging, and database analysis, offering a clea
   - View table structure reference while writing queries
   - Protection against potentially harmful SQL operations
   - Query execution statistics and timing
+- **Multiple Database Connections**:
+  - Connect to multiple databases within your application
+  - Switch between connections on-the-fly to view different database schemas
+  - Add new database connections from the UI without code changes
+  - Test connections to verify they're working properly
 - **Enhanced UI Features**:
   - Responsive, Bootstrap-based interface that works on desktop and mobile
   - Fixed header navigation with quick access to all features
@@ -142,6 +147,34 @@ You can also create this file manually if you prefer.
 
 The configuration is accessed through `Dbviewer.configuration` throughout the codebase. You can also access it via `Dbviewer.config` which is an alias for backward compatibility.
 
+### Multiple Database Connections
+
+DBViewer supports working with multiple database connections in your application. This is useful for applications that connect to multiple databases or use different connection pools.
+
+To configure multiple database connections, set them up in your initializer:
+
+```ruby
+# config/initializers/dbviewer.rb
+Dbviewer.configure do |config|
+  # Multiple database connections configuration
+  config.database_connections = {
+    primary: {
+      connection_class: "ActiveRecord::Base",
+      name: "Primary Database"
+    },
+    secondary: {
+      connection_class: "SecondaryDatabase",
+      name: "Blog Database"
+    }
+  }
+
+  # Set the default active connection
+  config.current_connection = :primary
+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).
+
 ## 🪵 Query Logging
 
 DBViewer includes a powerful SQL query logging system that captures and analyzes database queries. You can access this log through the `/dbviewer/logs` endpoint. The logging system offers two storage backends:
@@ -413,12 +446,6 @@ graph TB
     Engine -.->|"setup()"| QueryLogger
     Config -.->|"logging settings"| QueryLogger
 
-    classDef decoupled fill:#e1f5fe,stroke:#01579b,stroke-width:2px
-    classDef controller fill:#f3e5f5,stroke:#4a148c,stroke-width:2px
-    classDef database fill:#e8f5e8,stroke:#1b5e20,stroke-width:2px
-    classDef query fill:#fff3e0,stroke:#e65100,stroke-width:2px
-    classDef storage fill:#fce4ec,stroke:#880e4f,stroke-width:2px
-
     class CacheManager,QueryLogger decoupled
     class HomeController,TablesController,LogsController,ERDController,APIController controller
     class Manager,MetadataManager,DynamicModelFactory database

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

@@ -0,0 +1,70 @@
+
+document.addEventListener('DOMContentLoaded', function() {
+  // Add connection form validation
+  const forms = document.querySelectorAll('.needs-validation');
+  
+  Array.from(forms).forEach(form => {
+    form.addEventListener('submit', event => {
+      if (!form.checkValidity()) {
+        event.preventDefault();
+        event.stopPropagation();
+      }
+      
+      form.classList.add('was-validated');
+    }, false);
+  });
+  
+  // Handle connection test
+  const testButtons = document.querySelectorAll('.test-connection-btn');
+  
+  Array.from(testButtons).forEach(button => {
+    button.addEventListener('click', async function(event) {
+      event.preventDefault();
+      const connectionKey = this.dataset.connectionKey;
+      const statusElement = document.getElementById(`connection-status-${connectionKey}`);
+      
+      if (!statusElement) return;
+      
+      statusElement.innerHTML = '<i class="bi bi-arrow-repeat spin me-1"></i> Testing connection...';
+      statusElement.classList.remove('text-success', 'text-danger');
+      
+      try {
+        const response = await fetch(`/dbviewer/api/connections/${connectionKey}/test`, {
+          method: 'GET',
+          headers: {
+            'Accept': 'application/json',
+            'X-Requested-With': 'XMLHttpRequest'
+          }
+        });
+        
+        const data = await response.json();
+        
+        if (data.success) {
+          statusElement.innerHTML = '<i class="bi bi-check-circle-fill me-1"></i> Connection successful';
+          statusElement.classList.add('text-success');
+        } else {
+          statusElement.innerHTML = `<i class="bi bi-x-circle-fill me-1"></i> ${data.error || 'Connection failed'}`;
+          statusElement.classList.add('text-danger');
+        }
+      } catch (error) {
+        statusElement.innerHTML = '<i class="bi bi-x-circle-fill me-1"></i> Error testing connection';
+        statusElement.classList.add('text-danger');
+      }
+    });
+  });
+});
+
+// Auto-generate connection key from name
+function setupConnectionKeyGenerator() {
+  const nameInput = document.getElementById('connection_name');
+  const keyInput = document.getElementById('connection_key');
+  
+  if (nameInput && keyInput) {
+    nameInput.addEventListener('input', function() {
+      keyInput.value = this.value
+        .toLowerCase()
+        .replace(/\s+/g, '_')
+        .replace(/[^a-z0-9_]/g, '');
+    });
+  }
+}

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

@@ -5,12 +5,100 @@ module Dbviewer
     extend ActiveSupport::Concern
 
     included do
-      helper_method :current_table?, :get_database_name, :get_adapter_name if respond_to?(:helper_method)
+      helper_method :current_table?, :get_database_name, :get_adapter_name,
+                    :current_connection_key, :available_connections if respond_to?(:helper_method)
     end
 
-    # Initialize the database manager
+    # Get the current active connection key
+    def current_connection_key
+      # Get the connection key from the session or fall back to the default
+      key = session[:dbviewer_connection] || Dbviewer.configuration.current_connection
+
+      # Ensure the key actually exists in our configured connections
+      if key && Dbviewer.configuration.database_connections.key?(key.to_sym)
+        return key.to_sym
+      end
+
+      # If the key doesn't exist, fall back to any available connection
+      first_key = Dbviewer.configuration.database_connections.keys.first
+      if first_key
+        session[:dbviewer_connection] = first_key # Update the session
+        return first_key
+      end
+
+      # If there are no connections configured, use a default key
+      # This should never happen in normal operation, but it's a safety measure
+      :default
+    end
+
+    # Set the current connection to use
+    def switch_connection(connection_key)
+      connection_key = connection_key.to_sym if connection_key.respond_to?(:to_sym)
+
+      if connection_key && Dbviewer.configuration.database_connections.key?(connection_key)
+        session[:dbviewer_connection] = connection_key
+        # Clear the database manager to force it to be recreated with the new connection
+        @database_manager = nil
+        return true
+      else
+        # If the connection key doesn't exist, reset to default connection
+        if Dbviewer.configuration.database_connections.key?(Dbviewer.configuration.current_connection)
+          session[:dbviewer_connection] = Dbviewer.configuration.current_connection
+          @database_manager = nil
+          return true
+        else
+          # If even the default connection isn't valid, try the first available connection
+          first_key = Dbviewer.configuration.database_connections.keys.first
+          if first_key
+            session[:dbviewer_connection] = first_key
+            @database_manager = nil
+            return true
+          end
+        end
+      end
+
+      false # Return false if we couldn't set a valid connection
+    end
+
+    # Get list of available connections
+    def available_connections
+      connections = Dbviewer.configuration.database_connections.map do |key, config|
+        # Try to determine the adapter name if it's not already stored
+        adapter_name = nil
+        if config[:adapter_name].present?
+          adapter_name = config[:adapter_name]
+        elsif config[:connection].present?
+          begin
+            adapter_name = config[:connection].connection.adapter_name
+          rescue => e
+            Rails.logger.error("Error getting adapter name: #{e.message}")
+          end
+        end
+
+        {
+          key: key,
+          name: config[:name] || key.to_s.humanize,
+          adapter_name: adapter_name,
+          current: key.to_sym == current_connection_key.to_sym
+        }
+      end
+
+      # Ensure at least one connection is marked as current
+      unless connections.any? { |c| c[:current] }
+        # If no connection is current, mark the first one as current
+        if connections.any?
+          connections.first[:current] = true
+          # Also update the session
+          session[:dbviewer_connection] = connections.first[:key]
+        end
+      end
+
+      connections
+    end
+
+    # Initialize the database manager with the current connection
     def database_manager
-      @database_manager ||= ::Dbviewer::Database::Manager.new
+      @database_manager = ::Dbviewer::Database::Manager.new(current_connection_key)
     end
 
     # Initialize the table query operations manager
@@ -21,6 +109,12 @@ module Dbviewer
 
     # Get the name of the current database
     def get_database_name
+      # First check if this connection has a name in the configuration
+      current_conn_config = Dbviewer.configuration.database_connections[current_connection_key]
+      if current_conn_config && current_conn_config[:name].present?
+        return current_conn_config[:name]
+      end
+
       adapter = database_manager.connection.adapter_name.downcase
 
       case adapter
@@ -34,7 +128,7 @@ module Dbviewer
         result ? result["db_name"] : "Database"
       when /sqlite/
         # For SQLite, extract the database name from the connection_config
-        database_path = ActiveRecord::Base.connection.pool.spec.config[:database] || ""
+        database_path = database_manager.connection.pool.spec.config[:database] || ""
         File.basename(database_path, ".*") || "SQLite Database"
       else
         "Database" # Default fallback
@@ -68,11 +162,21 @@ module Dbviewer
           name: table_name
         }
 
-        # Only fetch record counts if explicitly requested
-        table_stats[:record_count] = database_manager.record_count(table_name) if include_record_counts
+        # Only fetch record count if specifically requested
+        if include_record_counts
+          begin
+            table_stats[:record_count] = database_manager.record_count(table_name)
+          rescue => e
+            Rails.logger.error("Error fetching record count for #{table_name}: #{e.message}")
+            table_stats[:record_count] = 0
+          end
+        end
 
         table_stats
       end
+    rescue => e
+      Rails.logger.error("Error fetching tables: #{e.message}")
+      []
     end
 
     # Gather database analytics information

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

@@ -4,74 +4,44 @@ module Dbviewer
       before_action :set_tables
 
       def relationships
-        # Fetch all relationships asynchronously
-        begin
-          @table_relationships = fetch_table_relationships
-          render_success({
-            relationships: @table_relationships,
-            status: "success"
-          })
-        rescue => e
-          Rails.logger.error("[DBViewer] Error fetching relationships: #{e.message}")
-          render json: {
-            relationships: [],
-            status: "error",
-            error: e.message
-          }, status: :internal_server_error
-        end
+        @table_relationships = fetch_table_relationships
+        render_success({
+          relationships: @table_relationships,
+          status: "success"
+        })
       end
 
       def table_relationships
-        # Fetch relationships for specific tables
         table_names = params[:tables]&.split(",") || []
-
-        if table_names.blank?
-          render json: {
-            relationships: [],
-            status: "error",
-            error: "No tables specified"
-          }, status: :bad_request
-          return
-        end
-
-        begin
-          relationships = []
-
-          table_names.each do |table_name|
-            next unless @tables.any? { |t| t[:name] == table_name }
-
-            begin
-              metadata = fetch_table_metadata(table_name)
-              if metadata && metadata[:foreign_keys].present?
-                metadata[:foreign_keys].each do |fk|
-                  relationships << {
-                    from_table: table_name,
-                    to_table: fk[:to_table],
-                    from_column: fk[:column],
-                    to_column: fk[:primary_key],
-                    name: fk[:name]
-                  }
-                end
+        relationships = []
+
+        table_names.each do |table_name|
+          next unless @tables.any? { |t| t[:name] == table_name }
+
+          begin
+            metadata = fetch_table_metadata(table_name)
+            if metadata && metadata[:foreign_keys].present?
+              metadata[:foreign_keys].each do |fk|
+                relationships << {
+                  from_table: table_name,
+                  to_table: fk[:to_table],
+                  from_column: fk[:column],
+                  to_column: fk[:primary_key],
+                  name: fk[:name]
+                }
               end
-            rescue => e
-              Rails.logger.error("[DBViewer] Error fetching relationships for #{table_name}: #{e.message}")
-              # Continue with other tables even if one fails
             end
+          rescue => e
+            Rails.logger.error("[DBViewer] Error fetching relationships for #{table_name}: #{e.message}")
+            # Continue with other tables even if one fails
           end
-
-          render_success({
-            relationships: relationships,
-            status: "success",
-            processed_tables: table_names
-          })
-        rescue => e
-          Rails.logger.error("[DBViewer] Error in table_relationships: #{e.message}")
-          render json: {
-            relationships: [],
-            status: "error",
-            error: e.message
-          }, status: :internal_server_error
         end
+
+        render_success({
+          relationships: relationships,
+          status: "success",
+          processed_tables: table_names
+        })
       end
 
       private

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

@@ -20,55 +20,20 @@ module Dbviewer
         table_name = params[:id]
         record_id = params[:record_id]
 
-        unless table_name.present? && record_id.present?
-          render_error("Table name and record ID are required", 400)
-          return
+        reverse_foreign_keys = fetch_table_metadata(table_name).dig(:reverse_foreign_keys) || []
+        relationship_counts = reverse_foreign_keys.map do |rel|
+          {
+            table: rel[:from_table],
+            foreign_key: rel[:column],
+            count: database_manager.get_model_for(rel[:from_table]).where(rel[:column] => record_id).count
+          }
         end
 
-        begin
-          # Get table metadata to find relationships
-          metadata = fetch_table_metadata(table_name)
-
-          unless metadata
-            render_error("Table not found", 404)
-            return
-          end
-
-          # Get reverse foreign keys (has_many relationships)
-          reverse_foreign_keys = metadata.dig(:reverse_foreign_keys) || []
-
-          relationship_counts = reverse_foreign_keys.map do |rel|
-            begin
-              # Count records in the related table that reference this record
-              count_query = "SELECT COUNT(*) as count FROM #{rel[:from_table]} WHERE #{rel[:column]} = ?"
-              result = database_manager.connection.exec_query(count_query, "Count Query", [ record_id ])
-              count = result.rows.first&.first || 0
-
-              {
-                table: rel[:from_table],
-                foreign_key: rel[:column],
-                count: count.to_i
-              }
-            rescue => e
-              Rails.logger.error "Error counting relationships for #{rel[:from_table]}: #{e.message}"
-              {
-                table: rel[:from_table],
-                foreign_key: rel[:column],
-                count: 0,
-                error: e.message
-              }
-            end
-          end
-
-          render_success({
-            table_name: table_name,
-            record_id: record_id,
-            relationships: relationship_counts
-          })
-        rescue => e
-          Rails.logger.error "Error fetching relationship counts: #{e.message}"
-          render_error("Error fetching relationship counts: #{e.message}", 500)
-        end
+        render_success({
+          table_name: table_name,
+          record_id: record_id,
+          relationships: relationship_counts
+        })
       end
 
       private

data/app/controllers/dbviewer/connections_controller.rb

@@ -0,0 +1,35 @@
+module Dbviewer
+  class ConnectionsController < ApplicationController
+    # GET /dbviewer/connections
+    def index
+      @connections = available_connections
+
+      respond_to do |format|
+        format.html
+        format.json { render json: @connections }
+      end
+    end
+
+    # POST /dbviewer/connections/:id
+    def update
+      connection_key = params[:id]
+
+      if switch_connection(connection_key)
+        # Safely get the connection name
+        connection_config = Dbviewer.configuration.database_connections[connection_key.to_sym]
+        connection_name = connection_config && connection_config[:name] ? connection_config[:name] : "selected"
+
+        respond_to do |format|
+          format.html { redirect_to root_path, notice: "Switched to #{connection_name} database." }
+          format.json { render json: { success: true, current: connection_key } }
+        end
+      else
+        # Handle the case where switching failed
+        respond_to do |format|
+          format.html { redirect_to connections_path, alert: "Failed to switch connection. The connection may be invalid." }
+          format.json { render json: { success: false, error: "Invalid connection" }, status: :unprocessable_entity }
+        end
+      end
+    end
+  end
+end

data/app/controllers/dbviewer/home_controller.rb

@@ -1,6 +1,11 @@
 module Dbviewer
   class HomeController < ApplicationController
     def index
+      @current_connection_info = {
+        name: get_database_name,
+        adapter: get_adapter_name,
+        key: current_connection_key
+      }
     end
 
     private

data/app/helpers/dbviewer/application_helper.rb

@@ -33,7 +33,13 @@ module Dbviewer
 
     # Generate operator options based on column type
     def operator_options_for_column_type(column_type)
-      if column_type && (column_type =~ /datetime/ || column_type =~ /^date$/ || column_type =~ /^time$/)
+      # Common operators for all types
+      common_operators = [
+        [ "is null", "is_null" ],
+        [ "is not null", "is_not_null" ]
+      ]
+
+      type_specific_operators = if column_type && (column_type =~ /datetime/ || column_type =~ /^date$/ || column_type =~ /^time$/)
         # Date/Time operators
         [
           [ "=", "eq" ],
@@ -64,28 +70,58 @@ module Dbviewer
           [ "ends with", "ends_with" ]
         ]
       end
+
+      # Return type-specific operators first, then common operators
+      type_specific_operators + common_operators
     end
 
     # Render column filter input based on column type
     def render_column_filter_input(form, column_name, column_type, column_filters)
-      if column_type && column_type =~ /datetime/
+      # Get selected operator to check if it's a null operator
+      operator = column_filters["#{column_name}_operator"]
+      is_null_operator = operator == "is_null" || operator == "is_not_null"
+
+      # Clean up the value for non-null operators if the value contains a null operator
+      # This ensures we don't carry over 'is_null' or 'is_not_null' values when switching operators
+      value = column_filters[column_name]
+      if !is_null_operator && value.present? && (value == "is_null" || value == "is_not_null")
+        value = nil
+      end
+
+      # For null operators, display a non-editable field without placeholder
+      if is_null_operator
+        # Keep a hidden field for the actual value
+        hidden_field = form.hidden_field("column_filters[#{column_name}]",
+          value: operator,
+          class: "null-filter-value",
+          data: { column: column_name })
+
+        # Add a visible but disabled text field with no placeholder or value
+        visible_field = form.text_field("column_filters[#{column_name}_display]",
+          disabled: true,
+          value: "",
+          class: "form-control form-control-sm column-filter rounded-0 disabled-filter",
+          data: { column: "#{column_name}_display" })
+
+        hidden_field + visible_field
+      elsif column_type && column_type =~ /datetime/
         form.datetime_local_field("column_filters[#{column_name}]",
-          value: column_filters[column_name],
+          value: value,
           class: "form-control form-control-sm column-filter rounded-0",
           data: { column: column_name })
       elsif column_type && column_type =~ /^date$/
         form.date_field("column_filters[#{column_name}]",
-          value: column_filters[column_name],
+          value: value,
           class: "form-control form-control-sm column-filter rounded-0",
           data: { column: column_name })
       elsif column_type && column_type =~ /^time$/
         form.time_field("column_filters[#{column_name}]",
-          value: column_filters[column_name],
+          value: value,
           class: "form-control form-control-sm column-filter rounded-0",
           data: { column: column_name })
       else
         form.text_field("column_filters[#{column_name}]",
-          value: column_filters[column_name],
+          value: value,
           placeholder: "",
           class: "form-control form-control-sm column-filter rounded-0",
           data: { column: column_name })
@@ -113,8 +149,10 @@ module Dbviewer
       column_type = column_type_from_info(column_name, columns)
 
       content_tag(:div, class: "filter-input-group") do
-        render_operator_select(form, column_name, column_type, column_filters) +
-        render_column_filter_input(form, column_name, column_type, column_filters)
+        operator_select = render_operator_select(form, column_name, column_type, column_filters)
+        input_field = render_column_filter_input(form, column_name, column_type, column_filters)
+
+        operator_select + input_field
       end
     end
 

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

@@ -0,0 +1,119 @@
+<% content_for :title, "Database Connections" %>
+
+<div class="container-fluid">
+  <div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><i class="bi bi-database-fill me-2"></i> Database Connections</h1>
+  </div>
+
+  <div class="row">
+    <div class="col-12">
+      <div class="alert alert-info">
+        <i class="bi bi-info-circle me-2"></i>
+        You can switch between multiple database connections to view different databases in your application.
+      </div>
+    </div>
+  </div>
+
+  <% if flash[:alert] %>
+    <div class="row">
+      <div class="col-12">
+        <div class="alert alert-danger alert-dismissible fade show" role="alert">
+          <i class="bi bi-exclamation-triangle-fill me-2"></i>
+          <%= flash[:alert] %>
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <% if flash[:notice] %>
+    <div class="row">
+      <div class="col-12">
+        <div class="alert alert-success alert-dismissible fade show" role="alert">
+          <i class="bi bi-check-circle-fill me-2"></i>
+          <%= flash[:notice] %>
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+      </div>
+    </div>
+  <% end %>
+  
+  <div class="row">
+    <% @connections.each do |connection| %>
+      <div class="col-md-6 col-lg-4 mb-4">
+        <div class="card dbviewer-card h-100 <%= 'border-primary' if connection[:current] %>">
+          <div class="card-header d-flex justify-content-between align-items-center">
+            <h5 class="card-title mb-0">
+              <% if connection[:adapter_name]&.downcase&.include?('sqlite') %>
+                <i class="bi bi-database-fill me-2 text-success"></i>
+              <% elsif connection[:adapter_name]&.downcase&.include?('mysql') %>
+                <i class="bi bi-database-fill me-2 text-warning"></i>
+              <% elsif connection[:adapter_name]&.downcase&.include?('postgres') %>
+                <i class="bi bi-database-fill me-2 text-info"></i>
+              <% else %>
+                <i class="bi bi-database me-2"></i>
+              <% end %>
+              <%= connection[:name] %>
+            </h5>
+            <% if connection[:current] %>
+              <span class="badge bg-success">Current</span>
+            <% end %>
+          </div>
+          <div class="card-body">
+            <% if connection[:current] %>
+              <p class="mb-3"><em>Currently active connection</em></p>
+            <% end %>
+            <p><strong>Key:</strong> <%= connection[:key] %></p>
+            <% if connection[:adapter_name] %>
+              <p><strong>Adapter:</strong> <%= connection[:adapter_name] %></p>
+            <% end %>
+            
+            <div class="d-flex flex-column mt-3">
+              <div class="d-flex justify-content-between mb-2">
+                <% if connection[:current] %>
+                  <button class="btn btn-outline-secondary btn-sm" disabled>
+                    <i class="bi bi-check-circle-fill me-1"></i> Currently Active
+                  </button>
+                <% else %>
+                  <%= button_to connection_path(connection[:key]), method: :post, class: "btn btn-primary btn-sm" do %>
+                    <i class="bi bi-lightning-charge me-1"></i> Switch to this Connection
+                  <% end %>
+                <% end %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<script>
+  // Form validation script
+  document.addEventListener('DOMContentLoaded', function() {
+    const forms = document.querySelectorAll('.needs-validation')
+    
+    // Loop over them and prevent submission
+    Array.from(forms).forEach(form => {
+      form.addEventListener('submit', event => {
+        if (!form.checkValidity()) {
+          event.preventDefault()
+          event.stopPropagation()
+        }
+        
+        form.classList.add('was-validated')
+      }, false)
+    })
+    
+    // Auto-generate a key from the name
+    const nameInput = document.getElementById('connection_name')
+    const keyInput = document.getElementById('connection_key')
+    
+    nameInput.addEventListener('input', function() {
+      keyInput.value = this.value
+        .toLowerCase()
+        .replace(/\s+/g, '_')
+        .replace(/[^a-z0-9_]/g, '')
+    })
+  })
+</script>

data/app/views/dbviewer/connections/new.html.erb

@@ -0,0 +1,79 @@
+<% content_for :title, "Add New Database Connection" %>
+
+<div class="container-fluid">
+  <div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><i class="bi bi-plus-circle me-2"></i> Add New Database Connection</h1>
+  </div>
+
+  <div class="row">
+    <div class="col-12 col-md-8 col-lg-6 mx-auto">
+      <div class="card dbviewer-card">
+        <div class="card-header">
+          <h5 class="card-title mb-0">Connection Details</h5>
+        </div>
+        <div class="card-body">
+          <%= form_tag connections_path, method: :post, class: "needs-validation", novalidate: true do %>
+            <div class="mb-3">
+              <label for="connection_name" class="form-label">Connection Name*</label>
+              <input type="text" class="form-control" id="connection_name" name="connection_name" 
+                     placeholder="e.g. Blog Database" required>
+              <div class="form-text">A human-readable name for this connection</div>
+            </div>
+            
+            <div class="mb-3">
+              <label for="connection_key" class="form-label">Connection Key*</label>
+              <input type="text" class="form-control" id="connection_key" name="connection_key" 
+                     placeholder="e.g. blog_db" required>
+              <div class="form-text">A unique identifier for this connection (lowercase, no spaces)</div>
+            </div>
+            
+            <div class="mb-3">
+              <label for="connection_class" class="form-label">Connection Class*</label>
+              <input type="text" class="form-control" id="connection_class" name="connection_class" 
+                     placeholder="e.g. BlogDatabase" required>
+              <div class="form-text">
+                The fully qualified class name that establishes the connection.
+                This class must inherit from ActiveRecord::Base.
+              </div>
+            </div>
+            
+            <div class="d-flex justify-content-between mt-4">
+              <%= link_to "Cancel", connections_path, class: "btn btn-secondary" %>
+              <button type="submit" class="btn btn-primary">Add Connection</button>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  // Form validation script
+  document.addEventListener('DOMContentLoaded', function() {
+    const forms = document.querySelectorAll('.needs-validation')
+    
+    // Loop over them and prevent submission
+    Array.from(forms).forEach(form => {
+      form.addEventListener('submit', event => {
+        if (!form.checkValidity()) {
+          event.preventDefault()
+          event.stopPropagation()
+        }
+        
+        form.classList.add('was-validated')
+      }, false)
+    })
+    
+    // Auto-generate a key from the name
+    const nameInput = document.getElementById('connection_name')
+    const keyInput = document.getElementById('connection_key')
+    
+    nameInput.addEventListener('input', function() {
+      keyInput.value = this.value
+        .toLowerCase()
+        .replace(/\s+/g, '_')
+        .replace(/[^a-z0-9_]/g, '')
+    })
+  })
+</script>

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

@@ -0,0 +1,49 @@
+<%# Table list for sidebar %>
+<% if tables.any? %>
+  <% tables.each do |table| %>
+    <% 
+      # Build table URL with creation filter params if they exist
+      table_url_params = {}
+      table_url_params[:creation_filter_start] = @creation_filter_start if defined?(@creation_filter_start) && @creation_filter_start.present?
+      table_url_params[:creation_filter_end] = @creation_filter_end if defined?(@creation_filter_end) && @creation_filter_end.present?
+    %>
+    <%= link_to dbviewer.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();
+                  }" do %>
+      <div class="d-flex justify-content-between align-items-center w-100">
+        <div class="text-truncate">
+          <i class="bi bi-table me-2 small"></i>
+          <span><%= table[:name] %></span>
+        </div>
+        <% if table[:record_count].present? %>
+          <span class="badge bg-light text-dark fw-normal">
+            <%= number_with_delimiter(table[:record_count]) %>
+          </span>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% else %>
+  <div class="list-group-item text-muted small">
+    <i class="bi bi-info-circle me-1"></i>
+    No tables found in this database
+  </div>
+<% end %>

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

@@ -4,14 +4,6 @@
 
 <div class="d-flex justify-content-between align-items-center mb-4">
   <h1>Database Tables</h1>
-  <div>
-    <%= link_to dashboard_path, class: "btn btn-outline-primary me-2" do %>
-      <i class="bi bi-house-door me-1"></i> Dashboard
-    <% end %>
-    <%= link_to entity_relationship_diagrams_path, class: "btn btn-outline-primary" do %>
-      <i class="bi bi-diagram-3 me-1"></i> View ERD
-    <% end %>
-  </div>
 </div>
 
 <% if flash[:error] %>

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

@@ -120,6 +120,15 @@
       background-color: var(--bs-tertiary-bg, #f8f9fa);
     }
     
+    /* Styling for disabled input fields (IS NULL, IS NOT NULL) */
+    .column-filter:disabled, .disabled-filter {
+      background-color: var(--bs-tertiary-bg, #f0f0f0);
+      border-color: var(--bs-border-color, #dee2e6);
+      color: var(--bs-secondary-color, #6c757d);
+      opacity: 0.6;
+      cursor: not-allowed;
+    }
+    
     /* Action column styling */
     .action-column {
       width: 60px;
@@ -818,11 +827,61 @@
       };
     }
     
+    // Function to handle operator changes for IS NULL and IS NOT NULL operators
+    function setupNullOperators() {
+      operatorSelects.forEach(select => {
+        // Initial setup for existing null operators
+        if (select.value === 'is_null' || select.value === 'is_not_null') {
+          const columnName = select.name.match(/\[(.*?)_operator\]/)[1];
+          const inputContainer = select.closest('.filter-input-group');
+          // Check for display field (the visible disabled field)
+          const displayField = inputContainer.querySelector(`[data-column="${columnName}_display"]`);
+          if (displayField) {
+            displayField.classList.add('disabled-filter');
+          }
+          
+          // Make sure the value field properly reflects the null operator
+          const valueField = inputContainer.querySelector(`[data-column="${columnName}"]`);
+          if (valueField) {
+            valueField.value = select.value;
+          }
+        }
+        
+        // Handle operator changes
+        select.addEventListener('change', function() {
+          const columnName = this.name.match(/\[(.*?)_operator\]/)[1];
+          const filterForm = this.closest('form');
+          const inputContainer = this.closest('.filter-input-group');
+          const hiddenField = inputContainer.querySelector(`[data-column="${columnName}"]`);
+          const displayField = inputContainer.querySelector(`[data-column="${columnName}_display"]`);
+          const wasNullOperator = hiddenField && (hiddenField.value === 'is_null' || hiddenField.value === 'is_not_null');
+          const isNullOperator = this.value === 'is_null' || this.value === 'is_not_null';
+          
+          if (isNullOperator) {
+            // Configure for null operator
+            if (hiddenField) {
+              hiddenField.value = this.value;
+            }
+            // Submit immediately
+            filterForm.submit();
+          } else if (wasNullOperator) {
+            // Clear value when switching from null operator to regular operator
+            if (hiddenField) {
+              hiddenField.value = '';
+            }
+          }
+        });
+      });
+    }
+    
     // Function to submit the form
     const submitForm = debounce(function() {
       filterForm.submit();
     }, 500);
     
+    // Initialize the null operators handling
+    setupNullOperators();
+    
     // Add event listeners to all filter inputs
     columnFilters.forEach(function(filter) {
       // For text fields use input event

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

@@ -1357,6 +1357,27 @@
             <% end %>
           </ul>
           <ul class="navbar-nav ms-auto">
+            <li class="nav-item dropdown">
+              <a class="nav-link dropdown-toggle" href="#" id="navbarDatabaseDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                <i class="bi bi-database"></i> <%= (current_conn = available_connections.find { |c| c[:current] }) ? current_conn[:name] : "Database" %>
+              </a>
+              <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDatabaseDropdown">
+                <% 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"></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'></i> Manage Connections".html_safe, connections_path, class: "dropdown-item" %></li>
+              </ul>
+            </li>
             <li class="nav-item">
               <button type="button" class="theme-toggle nav-link" aria-label="<%= theme_toggle_label %>">
                 <%= theme_toggle_icon %>
@@ -1364,7 +1385,7 @@
             </li>
             <li class="nav-item">
               <span class="navbar-text ms-2 text-light d-flex align-items-center">
-                <small><i class="bi bi-database"></i> <%= Rails.env %> environment</small>
+                <small><i class="bi bi-tools"></i> <%= Rails.env %> environment</small>
               </span>
             </li>
           </ul>

data/config/routes.rb

@@ -10,6 +10,12 @@ Dbviewer::Engine.routes.draw do
 
   resources :entity_relationship_diagrams, only: [ :index ]
 
+  resources :connections, only: [ :index, :new, :create, :destroy ] do
+    member do
+      post :update
+    end
+  end
+
   resources :logs, only: [ :index ] do
     collection do
       delete :destroy_all
@@ -46,6 +52,12 @@ Dbviewer::Engine.routes.draw do
         get "recent"
       end
     end
+
+    resources :connections, only: [] do
+      member do
+        get "test"
+      end
+    end
   end
 
   root to: "home#index"

data/lib/dbviewer/configuration.rb

@@ -41,6 +41,16 @@ module Dbviewer
     # Default column to order table details by (e.g., 'updated_at')
     attr_accessor :default_order_column
 
+    # Multiple database connections configuration
+    # @example {
+    #   primary: { connection_class: "ActiveRecord::Base", name: "Primary DB" },
+    #   secondary: { connection_class: "SomeClass", name: "Secondary DB" }
+    # }
+    attr_accessor :database_connections
+
+    # The key of the current active connection
+    attr_accessor :current_connection
+
     def initialize
       @per_page_options = [ 10, 20, 50, 100 ]
       @default_per_page = 20
@@ -55,6 +65,13 @@ module Dbviewer
       @enable_query_logging = true
       @admin_credentials = nil
       @default_order_column = "updated_at"
+      @database_connections = {
+        default: {
+          connection_class: "ActiveRecord::Base",
+          name: "Default Database"
+        }
+      }
+      @current_connection = :default
     end
   end
 end

data/lib/dbviewer/database/dynamic_model_factory.rb

@@ -14,8 +14,7 @@ module Dbviewer
       # @param table_name [String] Name of the table
       # @return [Class] ActiveRecord model class for the table
       def get_model_for(table_name)
-        cached_model = @cache_manager.get_model(table_name)
-        return cached_model if cached_model
+        return @cache_manager.get_model(table_name) if @cache_manager.has_model?(table_name)
 
         model = create_model_for(table_name)
         @cache_manager.store_model(table_name, model)
@@ -28,10 +27,7 @@ module Dbviewer
       # @param table_name [String] Name of the table
       # @return [Class] ActiveRecord model class for the table
       def create_model_for(table_name)
-        model_name = table_name.classify
-
-        # Create a new model class dynamically
-        model = Class.new(ActiveRecord::Base) do
+        model = Dbviewer.const_set(table_name.classify, Class.new(ActiveRecord::Base) do
           self.table_name = table_name
 
           # Some tables might not have primary keys, so we handle that
@@ -47,13 +43,9 @@ module Dbviewer
 
           # Disable timestamps for better compatibility
           self.record_timestamps = false
-        end
+        end)
 
-        # Set model name constant if not already taken
-        # Use a namespace to avoid polluting the global namespace
-        unless Dbviewer.const_defined?("DynamicModel_#{model_name}")
-          Dbviewer.const_set("DynamicModel_#{model_name}", model)
-        end
+        model.establish_connection(@connection.instance_variable_get(:@config))
 
         model
       end

data/lib/dbviewer/database/manager.rb

@@ -3,10 +3,12 @@ module Dbviewer
     # Manager handles all database interactions for the DBViewer engine
     # It provides methods to access database structure and data
     class Manager
-      attr_reader :connection, :adapter_name, :table_query_operations
+      attr_reader :connection, :adapter_name, :table_query_operations, :connection_key
 
       # Initialize the database manager
-      def initialize
+      # @param connection_key [Symbol] The key identifying the connection in configuration
+      def initialize(connection_key = nil)
+        @connection_key = connection_key || Dbviewer.configuration.current_connection
         ensure_connection
         @cache_manager = ::Dbviewer::Database::CacheManager.new(configuration.cache_expiry)
         @table_metadata_manager = ::Dbviewer::Database::MetadataManager.new(@connection, @cache_manager)
@@ -151,6 +153,13 @@ module Dbviewer
         end
       end
 
+      # Get a dynamic AR model for a table
+      # @param table_name [String] Name of the table
+      # @return [Class] ActiveRecord model class
+      def get_model_for(table_name)
+        @dynamic_model_factory.get_model_for(table_name)
+      end
+
       private
 
       def fetch_mysql_size
@@ -182,8 +191,15 @@ module Dbviewer
       # @return [ActiveRecord::ConnectionAdapters::AbstractAdapter] The database connection
       def ensure_connection
         return @connection if @connection
+        connection_config = Dbviewer.configuration.database_connections[@connection_key]
+
+        if connection_config && connection_config[:connection_class]
+          @connection = connection_config[:connection_class].constantize.connection
+        else
+          Rails.logger.warn "DBViewer: Using default connection for key: #{@connection_key}"
+          @connection = ActiveRecord::Base.connection
+        end
 
-        @connection = ActiveRecord::Base.connection
         @adapter_name = @connection.adapter_name.downcase
         @connection
       end
@@ -192,13 +208,6 @@ module Dbviewer
       def reset_cache_if_needed
         @cache_manager.reset_if_needed
       end
-
-      # Get a dynamic AR model for a table
-      # @param table_name [String] Name of the table
-      # @return [Class] ActiveRecord model class
-      def get_model_for(table_name)
-        @dynamic_model_factory.get_model_for(table_name)
-      end
     end
   end
 end

data/lib/dbviewer/datatable/query_operations.rb

@@ -273,9 +273,29 @@ module Dbviewer
         # Apply remaining simple column filters
         filters.each do |column, value|
           next unless column_exists?(table_name, column)
-          next if value.blank?
+
+          # Check if this is a column operator field
+          if column.end_with?("_operator")
+            next  # Skip operator fields - they're processed with their column
+          end
 
           column_sym = column.to_sym
+          operator = filters["#{column}_operator"]
+
+          # Special handling for is_null and is_not_null operators that don't need a value
+          if operator == "is_null" || value == "is_null"
+            Rails.logger.debug("[DBViewer] Applying null filter: #{column} IS NULL")
+            query = query.where("#{column} IS NULL")
+            next
+          elsif operator == "is_not_null" || value == "is_not_null"
+            Rails.logger.debug("[DBViewer] Applying not null filter: #{column} IS NOT NULL")
+            query = query.where("#{column} IS NOT NULL")
+            next
+          end
+
+          # Skip if no value and we're not using a special operator
+          next if value.blank? || value == "is_null" || value == "is_not_null"
+
           Rails.logger.debug("[DBViewer] Applying filter: #{column} = #{value}")
 
           # Handle different types of filtering

data/lib/dbviewer/version.rb

@@ -1,3 +1,3 @@
 module Dbviewer
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/lib/dbviewer.rb

@@ -57,10 +57,43 @@ module Dbviewer
         query_logging_mode: configuration.query_logging_mode
       )
 
-      ActiveRecord::Base.connection
-      Rails.logger.info "DBViewer successfully connected to database"
-    rescue => e
-      Rails.logger.error "DBViewer could not connect to database: #{e.message}"
+      # Check all configured connections
+      connection_errors = []
+      configuration.database_connections.each do |key, config|
+        begin
+          connection_class = nil
+
+          if config[:connection]
+            connection_class = config[:connection]
+          elsif config[:connection_class].is_a?(String)
+            # Try to load the class if it's defined as a string
+            begin
+              connection_class = config[:connection_class].constantize
+            rescue NameError => e
+              Rails.logger.warn "DBViewer could not load connection class #{config[:connection_class]}: #{e.message}"
+              next
+            end
+          end
+
+          if connection_class
+            connection = connection_class.connection
+            adapter_name = connection.adapter_name
+            Rails.logger.info "DBViewer successfully connected to #{config[:name] || key.to_s} database (#{adapter_name})"
+
+            # Store the resolved connection class back in the config
+            config[:connection] = connection_class
+          else
+            raise "No valid connection configuration found for #{key}"
+          end
+        rescue => e
+          connection_errors << { key: key, error: e.message }
+          Rails.logger.error "DBViewer could not connect to #{config[:name] || key.to_s} database: #{e.message}"
+        end
+      end
+
+      if connection_errors.length == configuration.database_connections.length
+        raise "DBViewer could not connect to any configured database"
+      end
     end
 
     # Initialize engine with default values or user-provided configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbviewer
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Wailan Tirajoh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -49,6 +49,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/dbviewer/connections.js
 - app/assets/stylesheets/dbviewer/application.css
 - app/assets/stylesheets/dbviewer/dbviewer.css
 - app/assets/stylesheets/dbviewer/enhanced.css
@@ -61,6 +62,7 @@ files:
 - app/controllers/dbviewer/api/queries_controller.rb
 - app/controllers/dbviewer/api/tables_controller.rb
 - app/controllers/dbviewer/application_controller.rb
+- app/controllers/dbviewer/connections_controller.rb
 - app/controllers/dbviewer/entity_relationship_diagrams_controller.rb
 - app/controllers/dbviewer/home_controller.rb
 - app/controllers/dbviewer/logs_controller.rb
@@ -69,9 +71,12 @@ files:
 - app/jobs/dbviewer/application_job.rb
 - app/mailers/dbviewer/application_mailer.rb
 - app/models/dbviewer/application_record.rb
+- app/views/dbviewer/connections/index.html.erb
+- app/views/dbviewer/connections/new.html.erb
 - app/views/dbviewer/entity_relationship_diagrams/index.html.erb
 - app/views/dbviewer/home/index.html.erb
 - app/views/dbviewer/logs/index.html.erb
+- app/views/dbviewer/shared/_tables_sidebar.html.erb
 - app/views/dbviewer/tables/_table_structure.html.erb
 - app/views/dbviewer/tables/index.html.erb
 - app/views/dbviewer/tables/mini_erd.html.erb