real_data_tests 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9613e7cdfc987dd88b0726c3cfe9f9bc31cf4877267988c70fe2c52bf96b163
-  data.tar.gz: 654f32e804769aca3cc0415b0455d0d4f481b6fc8e01625a3bd52fc43e11ee6d
+  metadata.gz: e1ff52aca9c674699aa8e7d5cbe17de0db5860b69f0161b2408a1cd239abeadd
+  data.tar.gz: f8bdffcbd90e239bbf92cfc4fea32a0025a31d5a80b53e4c92c9db08c3babfa7
 SHA512:
-  metadata.gz: 80f42c596ef4fef11a44272c8a94089700428cc414030024410531e74ee6709d55fdff7b0de3b47a733b73aaf5e576cf519c746f9d4af60bfad978feefa5235f
-  data.tar.gz: 0656dede260673942b237c12e94566156fdbed104b864c23b2617c69871088af97afaf6d21fcce6772e3e4a25dcc80e24450f189600d863b6b7a4992c1e9d491
+  metadata.gz: cfbfb177889ae4ff86637eaa345c89a64faa9357cab0d0ec87a444b29d092fa1fc4750316d818c8afb5d679204a808abcfb6c71fdb47da53f0fdce43d2ebb156
+  data.tar.gz: 65c58cc33ef5c68579dd04196a6104d62cd97f3f5d764340bdcbeccbaf69c8181c9dfd6e08812e353ecbf0913467b965b86c3718d928d3abfb80a0be766a8b4a

data/lib/real_data_tests/rspec_helper.rb

@@ -75,41 +75,42 @@ module RealDataTests
       statements = []
       current_statement = ''
       in_string = false
-      in_conflict = false
-      quote_char = nil
+      escaped = false
 
       sql.each_char do |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'
+        if char == '\\'
+          escaped = !escaped
+        elsif char == "'" && !escaped
+          in_string = !in_string
+        elsif char == ';' && !in_string
+          # Add the completed statement
+          statements << current_statement.strip unless current_statement.strip.empty?
+          current_statement = ''
+          next
         end
-
+        escaped = false
         current_statement << char
+      end
 
-        # 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
+      # Add the last statement if it exists
+      statements << current_statement.strip unless current_statement.strip.empty?
+
+      # Ensure `ON CONFLICT` stays with the previous statement
+      statements = statements.each_with_object([]) do |stmt, result|
+        if stmt.strip.upcase.start_with?('ON CONFLICT')
+          result[-1] = "#{result.last.strip} #{stmt.strip}"
+        else
+          result << stmt.strip
         end
       end
 
-      # Add any remaining statement
-      statements << current_statement.strip if current_statement.strip.length > 0
-
-      statements.map do |stmt|
-        # Ensure each statement ends with a semicolon
-        stmt.end_with?(';') ? stmt : "#{stmt};"
+      # Normalize spacing around `ON CONFLICT` and ensure semicolons
+      statements.map! do |stmt|
+        stmt = stmt.gsub(/\)\s*ON CONFLICT/, ') ON CONFLICT') # Normalize spacing
+        stmt.strip.end_with?(';') ? stmt.strip : "#{stmt.strip};" # Ensure semicolon
       end
+
+      statements
     end
 
     def extract_conflict_clause(statement)

data/lib/real_data_tests/version.rb

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

metadata

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