dbviewer 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7607c650d549f8b7b0e7fb6ec8aa4c710028a7f9ca40f1524b41594c4e22dc68
-  data.tar.gz: 00c9b8b1063ecd3584b5d53d0471b87130a63900760cb089b8b5537b4cea80b0
+  metadata.gz: b378480a03f4c61f60ee8e6b918b81bfabb09fcb3f7256010d6ee7d59795feb3
+  data.tar.gz: 0ed1b725b27aa7c1290f767ce900ee8d5be1e2dd54df5edcaecef71f8945658f
 SHA512:
-  metadata.gz: 2d07a11c5481917f3b80c893ac7b0e3a4ceefa5e502ccd843d08881ab1d0cdd62989e8a6a7d2eda9e225a27e87187511c698dde1cfbddca33215d3dd2560721a
-  data.tar.gz: 84830ff63c74c5792adff5d3d0656c45a4c0f11805fb4b21899b979812530223f29f3045d8be359f355846190b2933fea845eb59a308a3ddeac500e7e5ce7288
+  metadata.gz: d7e70b3cb0c7ad44b8d5dee1fc476d85738a3169b1aaccac9e9aea242f0e1cf2801836341f4c391f9dd7d184985606376ca09366dada9944cd8058111a407105
+  data.tar.gz: 9914b89d8c4678cf949edad75d713d74cdc9aa9ece9f67cabe967afd42d411730d8d34839ee9c006393ec0f35bc2a3cfe88d8195b49caaec99d6aab09f5c9d03

data/README.md

@@ -373,7 +373,7 @@ graph TB
     subgraph "DBViewer Engine"
         Engine[Engine<br/>Rails::Engine]
         Config[Configuration<br/>Settings & Defaults]
-        SqlValidator[SqlValidator<br/>Query Validation]
+        Validator::Sql[Validator::Sql<br/>Query Validation]
     end
 
     subgraph "Controllers Layer"

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

@@ -239,31 +239,33 @@ module Dbviewer
 
     # Fetch relationships between tables for ERD visualization
     def fetch_table_relationships
-      relationships = []
-
-      @tables.each do |table|
-        table_name = table[:name]
-
-        # Get foreign keys defined in this table pointing to others
-        begin
-          metadata = database_manager.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
-          end
-        rescue => e
-          Rails.logger.error("Error fetching relationships for #{table_name}: #{e.message}")
-        end
+      # Use functional approach: flat_map to extract all relationships from all tables
+      @tables.flat_map do |table|
+        extract_table_relationships_from_metadata(table[:name])
       end
+    end
 
-      relationships
+    private
+
+    # Extract relationships for a single table from its metadata
+    # @param table_name [String] The name of the table to process
+    # @return [Array<Hash>] Array of relationship hashes for this table
+    def extract_table_relationships_from_metadata(table_name)
+      metadata = database_manager.table_metadata(table_name)
+      return [] unless metadata&.dig(:foreign_keys)&.present?
+
+      metadata[:foreign_keys].map do |fk|
+        {
+          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("Error fetching relationships for #{table_name}: #{e.message}")
+      [] # Return empty array to continue processing other tables
     end
 
     # Get mini ERD data for a specific table and its relationships
@@ -399,7 +401,7 @@ module Dbviewer
       @query = params[:query].present? ? params[:query].to_s : default_query
 
       # Validate query for security
-      unless ::Dbviewer::SqlValidator.safe_query?(@query)
+      unless ::Dbviewer::Validator::Sql.safe_query?(@query)
         @query = default_query
         flash.now[:warning] = "Only SELECT queries are allowed. Your query contained potentially unsafe operations. Using default query instead."
       end
@@ -439,8 +441,71 @@ module Dbviewer
       csv_data
     end
 
+    # Consolidated method to fetch all datatable-related data in one call
+    # Returns a hash containing all necessary datatable information
+    def fetch_datatable_data(table_name, query_params)
+      # Fetch all required data using functional programming patterns
+      columns = fetch_table_columns(table_name)
+
+      # Handle case where table has no columns (should rarely happen)
+      return default_datatable_structure(table_name) if columns.empty?
+
+      # Fetch records with error handling for null cases
+      records = begin
+        fetch_table_records(table_name, query_params)
+      rescue => e
+        Rails.logger.error("Error fetching table records for #{table_name}: #{e.message}")
+        nil
+      end
+
+      # Calculate total count - use filtered count if filters are present
+      total_count = begin
+        if query_params.column_filters.empty?
+          fetch_table_record_count(table_name)
+        else
+          fetch_filtered_record_count(table_name, query_params.column_filters)
+        end
+      rescue => e
+        Rails.logger.error("Error fetching record count for #{table_name}: #{e.message}")
+        0
+      end
+
+      # Calculate pagination data functionally with safety check
+      total_pages = total_count > 0 ? (total_count.to_f / query_params.per_page).ceil : 0
+
+      # Get metadata with error handling
+      metadata = fetch_table_metadata(table_name)
+
+      {
+        columns: columns,
+        records: records,
+        total_count: total_count,
+        total_pages: total_pages,
+        metadata: metadata,
+        current_page: query_params.page,
+        per_page: query_params.per_page,
+        order_by: query_params.order_by,
+        direction: query_params.direction
+      }
+    end
+
     private
 
+    # Default structure for tables with no data/columns
+    def default_datatable_structure(table_name)
+      {
+        columns: [],
+        records: [],
+        total_count: 0,
+        total_pages: 0,
+        metadata: {},
+        current_page: 1,
+        per_page: 25,
+        order_by: nil,
+        direction: "ASC"
+      }
+    end
+
     # Format cell values for CSV export to handle nil values and special characters
     def format_csv_value(value)
       return "" if value.nil?
@@ -452,81 +517,5 @@ module Dbviewer
       columns = fetch_table_columns(table_name)
       columns.any? { |col| col[:name] == "created_at" && [ :datetime, :timestamp ].include?(col[:type]) }
     end
-
-    # Fetch timestamp data for visualization (hourly, daily, weekly)
-    def fetch_timestamp_data(table_name, grouping = "daily")
-      return nil unless has_timestamp_column?(table_name)
-
-      quoted_table = safe_quote_table_name(table_name)
-      adapter = database_manager.connection.adapter_name.downcase
-
-      sql_query = case grouping
-      when "hourly"
-        case adapter
-        when /mysql/
-          "SELECT DATE_FORMAT(created_at, '%Y-%m-%d %H:00:00') as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 48"
-        when /postgres/
-          "SELECT date_trunc('hour', created_at) as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 48"
-        else # SQLite and others
-          "SELECT strftime('%Y-%m-%d %H:00:00', created_at) as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 48"
-        end
-      when "daily"
-        case adapter
-        when /mysql/
-          "SELECT DATE_FORMAT(created_at, '%Y-%m-%d') as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 30"
-        when /postgres/
-          "SELECT date_trunc('day', created_at) as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 30"
-        else # SQLite and others
-          "SELECT strftime('%Y-%m-%d', created_at) as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 30"
-        end
-      when "weekly"
-        case adapter
-        when /mysql/
-          "SELECT DATE_FORMAT(created_at, '%Y-%u') as time_group, YEARWEEK(created_at) as sort_key, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY sort_key DESC LIMIT 26"
-        when /postgres/
-          "SELECT date_trunc('week', created_at) as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 26"
-        else # SQLite and others
-          "SELECT strftime('%Y-%W', created_at) as time_group, COUNT(*) as count FROM #{quoted_table} GROUP BY time_group ORDER BY time_group DESC LIMIT 26"
-        end
-      else
-        return nil
-      end
-
-      begin
-        result = database_manager.execute_query(sql_query)
-
-        # Format the data for the chart
-        result.map do |row|
-          time_str = row["time_group"].to_s
-          count = row["count"].to_i
-
-          # Format the label based on grouping type
-          label = case grouping
-          when "hourly"
-            # For hourly, show "May 10, 2PM"
-            time = time_str.is_a?(Time) ? time_str : Time.parse(time_str)
-            time.strftime("%b %d, %l%p")
-          when "daily"
-            # For daily, show "May 10"
-            time = time_str.is_a?(Time) ? time_str : (time_str.include?("-") ? Time.parse(time_str) : Time.now)
-            time.strftime("%b %d")
-          when "weekly"
-            # For weekly, show "Week 19" or the week's start date
-            if time_str.include?("-")
-              week_num = time_str.split("-").last.to_i
-              "Week #{week_num}"
-            else
-              time = time_str.is_a?(Time) ? time_str : Time.parse(time_str)
-              "Week #{time.strftime('%W')}"
-            end
-          end
-
-          { label: label, value: count, raw_date: time_str }
-        end
-      rescue => e
-        Rails.logger.error("[DBViewer] Error fetching timestamp data: #{e.message}")
-        nil
-      end
-    end
   end
 end

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

@@ -13,29 +13,10 @@ module Dbviewer
 
       def table_relationships
         table_names = params[:tables]&.split(",") || []
-        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
-            end
-          rescue => e
-            Rails.logger.error("[DBViewer] Error fetching relationships for #{table_name}: #{e.message}")
-            # Continue with other tables even if one fails
-          end
-        end
+
+        relationships = table_names
+          .filter { |table_name| @tables.any? { |t| t[:name] == table_name } }
+          .flat_map { |table_name| extract_table_relationships(table_name) }
 
         render_success({
           relationships: relationships,
@@ -49,6 +30,27 @@ module Dbviewer
       def set_tables
         @tables = fetch_tables
       end
+
+      # Extract relationships for a single table, handling errors gracefully
+      # @param table_name [String] The name of the table to process
+      # @return [Array<Hash>] Array of relationship hashes for this table
+      def extract_table_relationships(table_name)
+        metadata = fetch_table_metadata(table_name)
+        return [] unless metadata&.dig(:foreign_keys)&.present?
+
+        metadata[:foreign_keys].map do |fk|
+          {
+            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}")
+        [] # Return empty array to continue processing other tables
+      end
     end
   end
 end

data/app/controllers/dbviewer/tables_controller.rb

@@ -18,16 +18,16 @@ module Dbviewer
         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)
-      @columns = fetch_table_columns(@table_name)
-      @metadata = fetch_table_metadata(@table_name)
 
-      if @records.nil?
-        column_names = @columns.map { |column| column[:name] }
-        @records = ActiveRecord::Result.new(column_names, [])
-      end
+      # Get all datatable data in one method call
+      datatable_data = fetch_datatable_data(@table_name, query_params)
+
+      # Assign to instance variables for view access
+      @total_count = datatable_data[:total_count]
+      @records = datatable_data[:records]
+      @total_pages = datatable_data[:total_pages]
+      @columns = datatable_data[:columns]
+      @metadata = datatable_data[:metadata]
 
       respond_to do |format|
         format.html # Default HTML response

data/app/helpers/dbviewer/application_helper.rb

@@ -505,19 +505,39 @@ module Dbviewer
       end
 
       content_tag(:td, class: "text-center action-column") do
-        button_tag(
-          type: "button",
-          class: "btn btn-sm btn-primary view-record-btn",
-          title: "View Record Details",
-          data: {
-            bs_toggle: "modal",
-            bs_target: "#recordDetailModal",
-            record_data: data_attributes.to_json,
-            foreign_keys: metadata && metadata[:foreign_keys] ? metadata[:foreign_keys].to_json : "[]",
-            reverse_foreign_keys: metadata && metadata[:reverse_foreign_keys] ? metadata[:reverse_foreign_keys].to_json : "[]"
-          }
-        ) do
-          content_tag(:i, "", class: "bi bi-eye")
+        content_tag(:div, class: "d-flex gap-1 justify-content-center") do
+          # View Record button (existing)
+          view_button = button_tag(
+            type: "button",
+            class: "btn btn-sm btn-primary view-record-btn",
+            title: "View Record Details",
+            data: {
+              bs_toggle: "modal",
+              bs_target: "#recordDetailModal",
+              record_data: data_attributes.to_json,
+              foreign_keys: metadata && metadata[:foreign_keys] ? metadata[:foreign_keys].to_json : "[]",
+              reverse_foreign_keys: metadata && metadata[:reverse_foreign_keys] ? metadata[:reverse_foreign_keys].to_json : "[]"
+            }
+          ) do
+            content_tag(:i, "", class: "bi bi-eye")
+          end
+
+          # Copy FactoryBot button (new)
+          copy_factory_button = button_tag(
+            type: "button",
+            class: "btn btn-sm btn-outline-secondary copy-factory-btn",
+            title: "Copy to JSON",
+            data: {
+              record_data: data_attributes.to_json,
+              table_name: @table_name
+            },
+            onclick: "copyToJson(this)"
+          ) do
+            content_tag(:i, "", class: "bi bi-clipboard")
+          end
+
+          # Concatenate both buttons
+          view_button + copy_factory_button
         end
       end
     end