real_data_tests 0.3.10 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76c93165cf56a1bb2e90311afc6bf92f42f17553271a977dec2e17f39afc67f
-  data.tar.gz: f1caa35f8eaa904dba0b608484d43d8beffaa7208646e067f046b8add97db10d
+  metadata.gz: e9613e7cdfc987dd88b0726c3cfe9f9bc31cf4877267988c70fe2c52bf96b163
+  data.tar.gz: 654f32e804769aca3cc0415b0455d0d4f481b6fc8e01625a3bd52fc43e11ee6d
 SHA512:
-  metadata.gz: 1097a749d0dd8ad287130dbab5a75c0f526de6689e9877d4f218657d6c03ad49ccd8c0c3cd02697306d1fee41c11c0915f11e4c264e2254cb21013e266d130aa
-  data.tar.gz: c0b6f6c9f84558801e5140eea8da6c5f068ad5adbe4dd3ba520e87fe2ef2259921374d52713e8e3a52775b64bb439f426be72a698d83e5a0144b16a6282cfc14
+  metadata.gz: 80f42c596ef4fef11a44272c8a94089700428cc414030024410531e74ee6709d55fdff7b0de3b47a733b73aaf5e576cf519c746f9d4af60bfad978feefa5235f
+  data.tar.gz: 0656dede260673942b237c12e94566156fdbed104b864c23b2617c69871088af97afaf6d21fcce6772e3e4a25dcc80e24450f189600d863b6b7a4992c1e9d491

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)
@@ -75,32 +75,41 @@ module RealDataTests
       statements = []
       current_statement = ''
       in_string = false
-      escaped = false
+      in_conflict = false
+      quote_char = nil
 
       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
+        # Detect start of quoted strings
+        if (char == "'" || char == '"') && !in_string
+          in_string = true
+          quote_char = char
+        # Detect end of quoted strings (matching quote type)
+        elsif (char == "'" || char == '"') && in_string && char == quote_char
+          in_string = false
+        # Track if we're in an ON CONFLICT clause
+        elsif char == 'O' && !in_string && current_statement.strip.end_with?(')')
+          # Look ahead to see if this is 'ON CONFLICT'
+          potential_conflict = sql[sql.index(char, sql.rindex(current_statement)), 11]
+          in_conflict = potential_conflict&.upcase == 'ON CONFLICT'
+        end
+
+        current_statement << char
+
+        # Only split on semicolon if we're not in a string and not in an ON CONFLICT clause
+        if char == ';' && !in_string && !in_conflict
+          statements << current_statement.strip
+          current_statement = ''
+          in_conflict = false
         end
       end
 
-      # Add the last statement if it doesn't end with a semicolon
+      # Add any remaining statement
       statements << current_statement.strip if current_statement.strip.length > 0
 
-      statements
+      statements.map do |stmt|
+        # Ensure each statement ends with a semicolon
+        stmt.end_with?(';') ? stmt : "#{stmt};"
+      end
     end
 
     def extract_conflict_clause(statement)
@@ -202,38 +211,42 @@ module RealDataTests
         "'#{value}'" # Other strings
       end
     end
+  end
 
-    def clean_values(values_str)
-      values = []
-      current_value = ''
-      in_quotes = false
-      nested_level = 0
+  def import
+    @logger.info "Starting SQL import..."
 
-      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
+    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
-        else
-          current_value << char
         end
-      end
 
-      values << clean_value(current_value.strip)
-      values.join(', ')
+        @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.10"
+  VERSION = "0.3.12"
 end

metadata

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