real_data_tests 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a45102a35d4a4d4bff64e68a4edef1b7e29d8c2ca68c0a957ac2589b8ce3b04
-  data.tar.gz: 506f07bccd0524de51819b128a6a707979e68723e513e829e0437a9d7b503b75
+  metadata.gz: f76c93165cf56a1bb2e90311afc6bf92f42f17553271a977dec2e17f39afc67f
+  data.tar.gz: f1caa35f8eaa904dba0b608484d43d8beffaa7208646e067f046b8add97db10d
 SHA512:
-  metadata.gz: e33a481a786ef940d50eabf13b23ddc8175af68ec16892f685809a7acec88a27786f4b54e6588a890167c90a058d690acc7d1ba7d264e0802549590516d499aa
-  data.tar.gz: 45dcce0d68ce3011521aea9ffcefc7d355af5544c0cc8cc385b37b897e953cd51d9af928536c8c901f7ff35ba33a52df9886ac186b5182aecc0821c83d6ceb91
+  metadata.gz: 1097a749d0dd8ad287130dbab5a75c0f526de6689e9877d4f218657d6c03ad49ccd8c0c3cd02697306d1fee41c11c0915f11e4c264e2254cb21013e266d130aa
+  data.tar.gz: c0b6f6c9f84558801e5140eea8da6c5f068ad5adbe4dd3ba520e87fe2ef2259921374d52713e8e3a52775b64bb439f426be72a698d83e5a0144b16a6282cfc14

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

@@ -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,6 +188,21 @@ module RealDataTests
       values.join(', ')
     end
 
+    def clean_value(value)
+      return value if value.start_with?("'") # Already quoted
+      return value if value.start_with?("'{") # JSON object
+      return 'NULL' if value.upcase == 'NULL'
+      return value.downcase if ['true', 'false'].include?(value.downcase)
+      return value if value.match?(/^\d+$/) # Numbers
+
+      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 = ''
@@ -214,19 +235,5 @@ module RealDataTests
       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
-      return 'NULL' if value.upcase == 'NULL'
-      return value.downcase if ['true', 'false'].include?(value.downcase)
-      return value if value.match?(/^\d+$/) # Numbers
-
-      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
-        "'#{value}'" # Other strings
-      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.10"
 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.10
 platform: ruby
 authors:
 - Kevin Dias