real_data_tests 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f2ee14eda8fe0a048506c0ac7948c0f1c3cacb603ddb9c6490f1abef0e7fda
-  data.tar.gz: '0698d429e6feb3f2dfd358014ff71b7cca4415d2393cbab950f99776191ec43c'
+  metadata.gz: 2a75133368f84b08bf44ad4f2ee73ed4eaf5636a7f19dbafdc5e6c47478055d8
+  data.tar.gz: 7693fa53c25af6c928ce61cb33e14667bf580fb18a32182452917932ca539bf2
 SHA512:
-  metadata.gz: 7839506386159938f4d5764bc0871876d7bb02ebac18ed522f23fc822e137757ea5a8a8dda7c36c4c43a91e48fa44cc0b8d69dfdca6fde402a12fe743c606fc9
-  data.tar.gz: bc74ab0ab3c19d1766714ebe35b25c310360a7b2d0154b675b223b46e0ee8610dd37ada15de1620867895fb922cba7edaf63a3d252e2d86dcaeb070bb9716b5b
+  metadata.gz: 366de9d95f5d8582c83cebcb89e20af819a6516dc6a1a30e3e560b3ba6de5e300404a781a08fc6b1063b562dd2519ce83ce80a0976844dfd09e0ce94551641ca
+  data.tar.gz: be867e1b473e90ea4bcb9041704fe6e4edac3d4e371c283dda8ac6c32b2903cd2d5b81a326f4aaa6bcb36859c2125ec995d6d115b594441bb6f23b1cbc019e5b

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 ## [Unreleased]
 
+## [0.3.4] - 2025-01-14
+### Added
+- Alternative native SQL loading method for CI environments
+  - Added `load_real_test_data_native` method that doesn't rely on system commands
+  - Works in restricted environments like GitHub Actions
+  - Uses ActiveRecord's native connection for SQL execution
+  - Maintains same transaction and foreign key handling behavior
+
+## [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

data/lib/real_data_tests/configuration.rb

@@ -87,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/rspec_helper.rb

@@ -3,16 +3,13 @@ module RealDataTests
     def load_real_test_data(name)
       dump_path = File.join(RealDataTests.configuration.dump_path, "#{name}.sql")
       raise Error, "Test data file not found: #{dump_path}" unless File.exist?(dump_path)
-
       ActiveRecord::Base.transaction do
         # Disable foreign key checks
         ActiveRecord::Base.connection.execute('SET session_replication_role = replica;')
-
         begin
           # Load the SQL dump quietly
           result = system("psql #{connection_options} -q < #{dump_path}")
           raise Error, "Failed to load test data: #{dump_path}" unless result
-
         ensure
           # Re-enable foreign key checks
           ActiveRecord::Base.connection.execute('SET session_replication_role = DEFAULT;')
@@ -20,6 +17,40 @@ module RealDataTests
       end
     end
 
+    # New method that doesn't rely on system commands
+    def load_real_test_data_native(name)
+      dump_path = File.join(RealDataTests.configuration.dump_path, "#{name}.sql")
+      raise Error, "Test data file not found: #{dump_path}" unless File.exist?(dump_path)
+
+      ActiveRecord::Base.transaction do
+        connection = ActiveRecord::Base.connection
+
+        # Disable foreign key checks
+        connection.execute('SET session_replication_role = replica;')
+
+        begin
+          # Read the SQL file content
+          sql_content = File.read(dump_path)
+
+          # Split the file into individual statements
+          statements = split_sql_statements(sql_content)
+
+          # Execute each statement
+          statements.each do |statement|
+            next if statement.strip.empty?
+            begin
+              connection.execute(statement)
+            rescue ActiveRecord::StatementInvalid => e
+              raise Error, "Failed to execute SQL statement: #{e.message}"
+            end
+          end
+        ensure
+          # Re-enable foreign key checks
+          connection.execute('SET session_replication_role = DEFAULT;')
+        end
+      end
+    end
+
     private
 
     def connection_options
@@ -28,7 +59,6 @@ module RealDataTests
       else
         ActiveRecord::Base.connection_config
       end
-
       options = []
       options << "-h #{config[:host]}" if config[:host]
       options << "-p #{config[:port]}" if config[:port]
@@ -37,5 +67,37 @@ module RealDataTests
       options << "-q"
       options.join(" ")
     end
+
+    def split_sql_statements(sql)
+      statements = []
+      current_statement = ''
+      in_string = false
+      escaped = false
+
+      sql.each_char do |char|
+        case char
+        when '\\'
+          escaped = !escaped
+        when "'"
+          in_string = !in_string unless escaped
+          escaped = false
+        when ';'
+          if !in_string
+            statements << current_statement.strip
+            current_statement = ''
+          else
+            current_statement << char
+          end
+        else
+          escaped = false
+          current_statement << char
+        end
+      end
+
+      # Add the last statement if it doesn't end with a semicolon
+      statements << current_statement.strip if current_statement.strip.length > 0
+
+      statements
+    end
   end
 end

data/lib/real_data_tests/version.rb

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

metadata

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