real_data_tests 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c5ba3c2d2b4bb4f9ec9a6c539ddd809b6840d3eb7e6cbfb33d02f524177b3ff
-  data.tar.gz: e64f18ddd2a0bab9c0f3aad9ab628fb7bd86097644807c5d99596aa3c3af55c4
+  metadata.gz: 89206c96e781984f28f3efd5c3e138c15693367fcad3bf5a80bd525a7fdff88d
+  data.tar.gz: 40af166854587b8fe9c7e446d0ac1240aa73912bc8ebf4e21a2cebe28530b6ab
 SHA512:
-  metadata.gz: 14a8d12cb5fd01582b2bf22d47d7fa518f2f0be2258e15c477f42c29c1c95b9d362fc20f486fe583f655eeac5b15ceba48c888eb49e9bc47444ab3ffcf79feb6
-  data.tar.gz: 1c2a99d52fa1b740c07152bf12d6802711bba8af8af38d94924d66ddda06d2eab76e6f459b532af3c29e2a0767bfd4ee7977aa23293b3a616225a5b340010a89
+  metadata.gz: 97a33efa24925c0bd452be680119d55f03a4790f1b545aa1250a2388d26cb55482b09c310094eb3d07eb2f8c0c92eadfea2f2061a7b0611d1ff15df1367680eb
+  data.tar.gz: e4c69341c9a4a21b6d08649b393d5594d5c6e2066a8bbf981366e377a6f7b9f2bce6aac4394ccc86026853a821aa746630b2cc49a923aee5faa4da60bbf0d6c9

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 ## [Unreleased]
 
+## [0.3.3] - 2025-01-14
+### Fixed
+- Improved circular dependency handling in PgDumpGenerator for self-referential associations
+  - Added robust checks for self-referential associations during topological sort
+  - Updated dependency graph building to properly exclude prevented circular dependencies
+  - Fixed model name handling in circular dependency error messages
+  - Improved error reporting for circular dependency detection
+- Enhanced PresetConfiguration circular dependency prevention
+  - Added more reliable tracking of prevented reciprocal associations using Sets
+  - Improved handling of both class and string model names in prevention checks
+  - Better support for multiple prevented dependencies per model
+- Updated record collection depth handling
+  - Fixed max depth enforcement for nested associations
+  - Added proper depth tracking for self-referential relationships
+  - Improved interaction between max depth and circular dependency prevention
+
+## [0.3.2] - 2025-01-14
+### Fixed
+- Enhanced association statistics tracking in RecordCollector
+  - Added separate statistics tracking method to ensure accurate counts
+  - Stats are now tracked before circular dependency checks
+  - Fixed parent-child relationship counting in recursive associations
+  - Improved initialization of statistics structures for better reliability
+
 ## [0.3.1] - 2025-01-14
 ### Fixed
 - Fixed circular dependency handling in RecordCollector to correctly limit record collection

data/lib/real_data_tests/configuration.rb

@@ -64,7 +64,7 @@ module RealDataTests
                 :prevent_reciprocal_loading, :anonymization_rules,
                 :prevented_reciprocals
 
-    attr_accessor :max_depth
+    attr_accessor :max_depth, :max_self_ref_depth
 
     def initialize
       @association_filter_mode = nil
@@ -75,6 +75,7 @@ module RealDataTests
       @anonymization_rules = {}
       @prevented_reciprocals = Set.new
       @max_depth = 10
+      @max_self_ref_depth = 2
     end
 
     def prevent_circular_dependency(klass, association_name)
@@ -86,6 +87,14 @@ module RealDataTests
       @prevented_reciprocals << key
     end
 
+    def max_self_ref_depth=(depth)
+      @max_self_ref_depth = depth
+    end
+
+    def get_max_self_ref_depth(model)
+      @max_self_ref_depth
+    end
+
     def has_circular_dependency?(klass, association_name)
       key = if klass.is_a?(String)
         "#{klass}:#{association_name}"

data/lib/real_data_tests/pg_dump_generator.rb

@@ -34,15 +34,19 @@ module RealDataTests
 
     def build_dependency_graph(models)
       models.each_with_object({}) do |model, deps|
-        # We only need to consider belongs_to associations since they represent
-        # the true foreign key dependencies that affect insert order
+        # Get direct dependencies from belongs_to associations
         direct_dependencies = model.reflect_on_all_associations(:belongs_to)
           .reject(&:polymorphic?) # Skip polymorphic associations
+          .reject do |assoc|
+            # Skip self-referential associations that are configured to prevent circular deps
+            assoc.klass == model &&
+            RealDataTests.configuration.current_preset.prevent_reciprocal?(model, assoc.name)
+          end
           .map(&:klass)
-          .select { |klass| models.include?(klass) } # Only include models we actually have records for
+          .select { |klass| models.include?(klass) }
           .uniq
 
-        # For HABTM associations, we need to ensure the join tables are handled correctly
+        # Handle HABTM associations
         habtm_dependencies = model.reflect_on_all_associations(:has_and_belongs_to_many)
           .map { |assoc| assoc.join_table_model }
           .compact
@@ -69,9 +73,12 @@ module RealDataTests
       return if visited.include?(model)
 
       if temporary.include?(model)
-        # Provide more context in the error message
-        cycle = detect_cycle(model, dependencies, temporary)
-        raise "Circular dependency detected: #{cycle.map(&:name).join(' -> ')}"
+        # Only raise if this isn't a prevented self-reference
+        unless RealDataTests.configuration.current_preset.prevent_reciprocal?(model, model.model_name.singular)
+          cycle = detect_cycle(model, dependencies, temporary)
+          raise "Circular dependency detected: #{cycle.map(&:name).join(' -> ')}"
+        end
+        return
       end
 
       temporary.add(model)

data/lib/real_data_tests/record_collector.rb

@@ -10,28 +10,9 @@ module RealDataTests
       @association_path = []
       @current_depth = 0
       @visited_associations = {}
+      @processed_self_refs = Hash.new { |h, k| h[k] = Set.new }
 
-      # Initialize stats for the record's class
-      @collection_stats[record.class.name] = {
-        count: 0,
-        associations: Hash.new(0),
-        polymorphic_types: {}
-      }
-
-      record.class.reflect_on_all_associations(:belongs_to).each do |assoc|
-        if assoc.polymorphic?
-          @collection_stats[record.class.name][:polymorphic_types][assoc.name.to_s] ||= Set.new
-        end
-      end
-
-      puts "\nInitializing RecordCollector for #{record.class.name}##{record.id}"
-      record.class.reflect_on_all_associations(:belongs_to).each do |assoc|
-        if assoc.polymorphic?
-          type = record.public_send("#{assoc.name}_type")
-          id = record.public_send("#{assoc.name}_id")
-          puts "Found polymorphic belongs_to '#{assoc.name}' with type: #{type}, id: #{id}"
-        end
-      end
+      init_collection_stats(record)
     end
 
     def collect
@@ -46,6 +27,20 @@ module RealDataTests
 
     private
 
+    def init_collection_stats(record)
+      @collection_stats[record.class.name] = {
+        count: 0,
+        associations: Hash.new(0),
+        polymorphic_types: {}
+      }
+
+      record.class.reflect_on_all_associations(:belongs_to).each do |assoc|
+        if assoc.polymorphic?
+          @collection_stats[record.class.name][:polymorphic_types][assoc.name.to_s] ||= Set.new
+        end
+      end
+    end
+
     def collect_record(record, depth)
       return if @collected_records.include?(record)
       return unless record # Guard against nil records
@@ -119,12 +114,18 @@ module RealDataTests
     def should_process_association?(record, association, depth = 0)
       return false if depth >= RealDataTests.configuration.current_preset.max_depth
 
+      # Handle self-referential associations
+      if self_referential_association?(record.class, association)
+        track_key = "#{record.class.name}:#{association.name}"
+        return false if @processed_self_refs[track_key].include?(record.id)
+        @processed_self_refs[track_key].add(record.id)
+      end
+
       association_key = "#{record.class.name}##{record.id}:#{association.name}"
       return false if @processed_associations.include?(association_key)
 
       # Check if the association is allowed by configuration
       should_process = RealDataTests.configuration.current_preset.should_process_association?(record, association.name)
-      puts "  Configuration says: #{should_process}"
 
       if should_process
         @processed_associations.add(association_key)
@@ -138,17 +139,26 @@ module RealDataTests
       @association_path.push(association.name)
 
       begin
+        related_records = fetch_related_records(record, association)
+        count = related_records.length
+
+        # Track statistics even if we're going to skip processing
+        track_association_stats(record.class.name, association.name, count)
+
+        # Check for circular dependency after getting the related records
         if detect_circular_dependency?(record, association)
           puts "    Skipping circular dependency for #{association.name} on #{record.class.name}##{record.id}"
           return
         end
 
-        related_records = fetch_related_records(record, association)
-        count = related_records.length
-        puts "    Found #{count} related #{association.name} records"
-
-        @collection_stats[record.class.name][:associations][association.name.to_s] ||= 0
-        @collection_stats[record.class.name][:associations][association.name.to_s] += count
+        # For self-referential associations, check depth
+        if self_referential_association?(record.class, association)
+          max_self_ref_depth = 2  # Default max depth for self-referential associations
+          if depth >= max_self_ref_depth
+            puts "    Reached max self-referential depth for #{association.name}"
+            return
+          end
+        end
 
         related_records.each { |related_record| collect_record(related_record, depth + 1) }
       rescue => e
@@ -158,10 +168,30 @@ module RealDataTests
       end
     end
 
+    def track_association_stats(class_name, association_name, count)
+      # Initialize stats for this class if not already done
+      @collection_stats[class_name] ||= {
+        count: 0,
+        associations: Hash.new(0),
+        polymorphic_types: {}
+      }
+
+      # Update the association count
+      @collection_stats[class_name][:associations][association_name.to_s] ||= 0
+      @collection_stats[class_name][:associations][association_name.to_s] += count
+    end
+
     def self_referential_association?(klass, association)
       return false unless association.options[:class_name]
       return false if association.polymorphic?
-      association.options[:class_name] == klass.name
+
+      target_class_name = if association.options[:class_name].is_a?(String)
+        association.options[:class_name]
+      else
+        association.options[:class_name].name
+      end
+
+      klass.name == target_class_name
     end
 
     def detect_circular_dependency?(record, association)
@@ -171,6 +201,11 @@ module RealDataTests
       target_class = association.klass
       return false unless target_class
 
+      if self_referential_association?(record.class, association)
+        track_key = "#{target_class.name}:#{association.name}"
+        return @processed_self_refs[track_key].include?(record.id)
+      end
+
       path_key = "#{target_class.name}:#{association.name}"
       visited_count = @association_path.count { |assoc| "#{target_class.name}:#{assoc}" == path_key }
 

data/lib/real_data_tests/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RealDataTests
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: real_data_tests
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Kevin Dias