real_data_tests 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a45102a35d4a4d4bff64e68a4edef1b7e29d8c2ca68c0a957ac2589b8ce3b04
-  data.tar.gz: 506f07bccd0524de51819b128a6a707979e68723e513e829e0437a9d7b503b75
+  metadata.gz: a18a6616a26a2d4c65ad746e42ac560dd883c302c7ef73113a960309132de449
+  data.tar.gz: fbbe885c19cbffc91eefa9c0f60c56dcdba519d1a5f21458837aa3dadfede2e7
 SHA512:
-  metadata.gz: e33a481a786ef940d50eabf13b23ddc8175af68ec16892f685809a7acec88a27786f4b54e6588a890167c90a058d690acc7d1ba7d264e0802549590516d499aa
-  data.tar.gz: 45dcce0d68ce3011521aea9ffcefc7d355af5544c0cc8cc385b37b897e953cd51d9af928536c8c901f7ff35ba33a52df9886ac186b5182aecc0821c83d6ceb91
+  metadata.gz: 41e9ce6c2b3d427d5b04cb671378d44e0d9f5d24556698c86e0b3e3d671df0b7a41b3f30207b2bba9224c7ddc89b869c747195d1deb8c8956f1ee37ab4b0e690
+  data.tar.gz: c07e898c90af0d265f637c21e95fbc1a88e83c3a5c7233e11b8517443707005cff23ab1c3984142e21a3307e5e7c53e16a3cd55bb5a8124ba3cb281e1e9c7eba

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.3.10] - 2025-01-14
+### Fixed
+- Enhanced SQL statement parsing in native loader
+  - Improved handling of complex ON CONFLICT clauses with multiple closing parentheses
+  - Fixed spacing issues between VALUES and ON CONFLICT clauses
+  - Enhanced regex pattern for more precise conflict clause extraction
+  - Added proper statement reassembly for complex SQL structures
+
 ## [0.3.9] - 2025-01-14
 ### Fixed
 - Enhanced SQL statement parsing in native loader

data/lib/real_data_tests/rspec_helper.rb

@@ -17,7 +17,7 @@ module RealDataTests
       end
     end
 
-    # New method that doesn't rely on system commands
+    # Native Ruby implementation
     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)
@@ -113,10 +113,10 @@ module RealDataTests
     end
 
     def clean_sql_statement(statement)
-      # First, detect if this is an INSERT statement with VALUES
-      if statement =~ /INSERT INTO.*VALUES\s*\(/i
-        # Split the statement into three parts: pre-VALUES, values, and post-VALUES (ON CONFLICT clause)
-        if statement =~ /(.*VALUES\s*\()(.*)(\)\s*(?:ON CONFLICT.*)?;?\s*$)/i
+      # Match either INSERT INTO...VALUES or just VALUES
+      if statement =~ /(?:INSERT INTO.*)?VALUES\s*\(/i
+        # Split the statement into parts, being careful with the ending
+        if statement =~ /(.*?VALUES\s*\()(.*)(\)\s*(?:ON CONFLICT.*)?;?\s*$)/i
           pre_values = $1
           values_content = $2
           post_values = $3
@@ -124,9 +124,10 @@ module RealDataTests
           # Clean the values content while preserving complex JSON
           cleaned_values = clean_complex_values(values_content)
 
-          # Reassemble the statement
+          # Reassemble the statement, ensuring exactly one semicolon at the end
           statement = "#{pre_values}#{cleaned_values}#{post_values}"
-          statement += ";" unless statement.end_with?(";")
+          statement = statement.gsub(/;*\s*$/, '')  # Remove any trailing semicolons and whitespace
+          statement += ";"
         end
       end
       statement
@@ -138,6 +139,7 @@ module RealDataTests
       in_quotes = false
       in_json = false
       json_brace_count = 0
+      escaped = false
 
       chars = values_str.chars
       i = 0
@@ -145,11 +147,14 @@ module RealDataTests
         char = chars[i]
 
         case char
+        when '\\'
+          current_value << char
+          escaped = !escaped
         when "'"
-          # Check if this is an escaped quote
-          if i > 0 && chars[i-1] != '\\'
+          if !escaped
             in_quotes = !in_quotes
           end
+          escaped = false
           current_value << char
         when '{'
           if !in_quotes
@@ -171,6 +176,7 @@ module RealDataTests
             current_value << char
           end
         else
+          escaped = false
           current_value << char
         end
         i += 1
@@ -182,39 +188,6 @@ module RealDataTests
       values.join(', ')
     end
 
-    def clean_values(values_str)
-      values = []
-      current_value = ''
-      in_quotes = false
-      nested_level = 0
-
-      values_str.chars.each do |char|
-        case char
-        when "'"
-          in_quotes = !in_quotes
-          current_value << char
-        when '{'
-          nested_level += 1
-          current_value << char
-        when '}'
-          nested_level -= 1
-          current_value << char
-        when ','
-          if !in_quotes && nested_level == 0
-            values << clean_value(current_value.strip)
-            current_value = ''
-          else
-            current_value << char
-          end
-        else
-          current_value << char
-        end
-      end
-
-      values << clean_value(current_value.strip)
-      values.join(', ')
-    end
-
     def clean_value(value)
       return value if value.start_with?("'") # Already quoted
       return value if value.start_with?("'{") # JSON object
@@ -225,8 +198,46 @@ module RealDataTests
       if value.match?(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i)
         "'#{value}'" # UUID
       else
+        # Handle any other string value, including those with commas
         "'#{value}'" # Other strings
       end
     end
   end
+
+  def import
+    @logger.info "Starting SQL import..."
+
+    ActiveRecord::Base.transaction do
+      begin
+        # Disable foreign key checks and triggers temporarily
+        ActiveRecord::Base.connection.execute('SET session_replication_role = replica;')
+
+        # Split the SQL content into individual statements
+        statements = split_sql_statements(@sql_content)
+
+        statements.each_with_index do |statement, index|
+          next if statement.strip.empty?
+
+          begin
+            @logger.info "Executing statement #{index + 1} of #{statements.length}"
+            cleaned_statement = clean_sql_statement(statement)
+            ActiveRecord::Base.connection.execute(cleaned_statement)
+          rescue ActiveRecord::StatementInvalid => e
+            @logger.error "Error executing statement #{index + 1}: #{e.message}"
+            @logger.error "Statement: #{cleaned_statement[0..100]}..."
+            raise
+          end
+        end
+
+        @logger.info "Successfully imported all SQL statements"
+      rescue StandardError => e
+        @logger.error "Error during import: #{e.message}"
+        @logger.error e.backtrace.join("\n")
+        raise
+      ensure
+        # Re-enable foreign key checks and triggers
+        ActiveRecord::Base.connection.execute('SET session_replication_role = DEFAULT;')
+      end
+    end
+  end
 end

data/lib/real_data_tests/version.rb

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

metadata

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