real_data_tests 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89206c96e781984f28f3efd5c3e138c15693367fcad3bf5a80bd525a7fdff88d
-  data.tar.gz: 40af166854587b8fe9c7e446d0ac1240aa73912bc8ebf4e21a2cebe28530b6ab
+  metadata.gz: 35d81ac18056a163df010e92d75c5bd36896836d070f8c74041048ab98918cdf
+  data.tar.gz: 50d5df4a36a88f58b6dbc76494db155bc68b5b9ca1cf8cbd45b22a4bd8cd6166
 SHA512:
-  metadata.gz: 97a33efa24925c0bd452be680119d55f03a4790f1b545aa1250a2388d26cb55482b09c310094eb3d07eb2f8c0c92eadfea2f2061a7b0611d1ff15df1367680eb
-  data.tar.gz: e4c69341c9a4a21b6d08649b393d5594d5c6e2066a8bbf981366e377a6f7b9f2bce6aac4394ccc86026853a821aa746630b2cc49a923aee5faa4da60bbf0d6c9
+  metadata.gz: fb2bf7729c1b3a0c86a073924b8c50b0a2005885d93acb7bdd419f12db87e858801222235c6a1c437144b53f57b9375ee56e76c467e6b1d4e643a403131153c9
+  data.tar.gz: ff37ab1ab9d6c2b33efb657905bb682c4d99cd22a7533e8b19db95d9949f11e621f0d750fbb829f8d61c377faa64d008c66bcdd703a072fae349d4d80c369ab2

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.3.5] - 2025-01-14
+### Fixed
+- Enhanced SQL statement handling in native loader
+  - Added proper UUID value quoting in VALUES clauses
+  - Fixed string value formatting in SQL statements
+  - Improved error reporting with detailed SQL statement context
+  - Added robust SQL statement cleaning and normalization
+
+## [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

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,43 @@ 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
+              # Clean up any formatting issues that might cause syntax errors
+              cleaned_statement = clean_sql_statement(statement)
+              connection.execute(cleaned_statement)
+            rescue ActiveRecord::StatementInvalid => e
+              # Provide detailed error information
+              raise Error, "Failed to execute SQL statement: #{e.message}\nStatement: #{cleaned_statement}"
+            end
+          end
+        ensure
+          # Re-enable foreign key checks
+          connection.execute('SET session_replication_role = DEFAULT;')
+        end
+      end
+    end
+
     private
 
     def connection_options
@@ -28,7 +62,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 +70,56 @@ 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
+
+    def clean_sql_statement(statement)
+      # Handle VALUES clause formatting
+      if statement.include?('VALUES')
+        # Split into pre-VALUES and VALUES parts
+        parts = statement.split(/VALUES\s*\(/i, 2)
+        if parts.length == 2
+          # Properly quote UUIDs and strings in the VALUES part
+          values_part = parts[1]
+          values_part = values_part.gsub(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?=[,\s)])/i, "'\\1'")
+          # Quote unquoted string values
+          values_part = values_part.gsub(/,\s*([^',\s][^,\s]*)(?=[,\s)])/, ", '\\1'")
+          # Reassemble the statement
+          statement = parts[0] + 'VALUES (' + values_part
+        end
+      end
+
+      statement
+    end
   end
 end

data/lib/real_data_tests/version.rb

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

metadata

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