real_data_tests 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573f1753777e04a6168a09385b8332cedbb4d521d11f1807012a25b8b846013c
-  data.tar.gz: b884098abbc9134a22479d5e9211a2d8bb153622022ba9116acb0057419cbe4a
+  metadata.gz: f76c93165cf56a1bb2e90311afc6bf92f42f17553271a977dec2e17f39afc67f
+  data.tar.gz: f1caa35f8eaa904dba0b608484d43d8beffaa7208646e067f046b8add97db10d
 SHA512:
-  metadata.gz: 1d4bcb84f7d3ab3ee0901ae46763c912f3c86935930cc17607d500ae7a2e26649f8c6ff629e8215437d8f08ae93d482870e253b294e84e720971c9bf681c7b50
-  data.tar.gz: 67cad3bda841d3e1de61d61dd30121ef3b6ddfc96a3162438a2b25f904185e6e4c59206d2626e6b40d44a72d123ed123e4073a4fdfe10d04fea807a8702bf689
+  metadata.gz: 1097a749d0dd8ad287130dbab5a75c0f526de6689e9877d4f218657d6c03ad49ccd8c0c3cd02697306d1fee41c11c0915f11e4c264e2254cb21013e266d130aa
+  data.tar.gz: c0b6f6c9f84558801e5140eea8da6c5f068ad5adbe4dd3ba520e87fe2ef2259921374d52713e8e3a52775b64bb439f426be72a698d83e5a0144b16a6282cfc14

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [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
+  - 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.8] - 2025-01-14
 ### Fixed
 - Enhanced SQL statement parsing in native loader

data/lib/real_data_tests/rspec_helper.rb

@@ -113,61 +113,78 @@ module RealDataTests
     end
 
     def clean_sql_statement(statement)
-      # Extract the ON CONFLICT clause if it exists
-      statement, conflict_clause = extract_conflict_clause(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
-          # Clean and process the values
-          values = clean_values(parts[1].split(/\)\s*$/)[0])
-
-          # Make sure we properly close the VALUES parentheses
-          statement = "#{parts[0]}VALUES (#{values})"
+      # 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
+
+          # Clean the values content while preserving complex JSON
+          cleaned_values = clean_complex_values(values_content)
+
+          # Reassemble the statement, ensuring exactly one semicolon at the end
+          statement = "#{pre_values}#{cleaned_values}#{post_values}"
+          statement = statement.gsub(/;*\s*$/, '')  # Remove any trailing semicolons and whitespace
+          statement += ";"
         end
       end
-
-      # Add back the conflict clause if it existed
-      statement = "#{statement}#{conflict_clause ? ' ' + conflict_clause : ''}"
-
-      # Ensure the statement ends with a semicolon
-      statement += ";" unless statement.end_with?(';')
-
       statement
     end
 
-    def clean_values(values_str)
-      values = []
+    def clean_complex_values(values_str)
       current_value = ''
+      values = []
       in_quotes = false
-      nested_level = 0
+      in_json = false
+      json_brace_count = 0
+      escaped = false
+
+      chars = values_str.chars
+      i = 0
+      while i < chars.length
+        char = chars[i]
 
-      values_str.chars.each do |char|
         case char
+        when '\\'
+          current_value << char
+          escaped = !escaped
         when "'"
-          in_quotes = !in_quotes
+          if !escaped
+            in_quotes = !in_quotes
+          end
+          escaped = false
           current_value << char
         when '{'
-          nested_level += 1
+          if !in_quotes
+            in_json = true
+            json_brace_count += 1
+          end
           current_value << char
         when '}'
-          nested_level -= 1
+          if !in_quotes
+            json_brace_count -= 1
+            in_json = json_brace_count > 0
+          end
           current_value << char
         when ','
-          if !in_quotes && nested_level == 0
+          if !in_quotes && !in_json
             values << clean_value(current_value.strip)
             current_value = ''
           else
             current_value << char
           end
         else
+          escaped = false
           current_value << char
         end
+        i += 1
       end
 
-      values << clean_value(current_value.strip)
+      # Add the last value
+      values << clean_value(current_value.strip) unless current_value.strip.empty?
+
       values.join(', ')
     end
 
@@ -181,8 +198,42 @@ 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
+
+    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
   end
 end

data/lib/real_data_tests/version.rb

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

metadata

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