real_data_tests 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f325960594ac352b4fbaae4adafb38256bde54feed249140838971e61c5fcef1
-  data.tar.gz: d977dda68eac4fa8d13c82dc5a00bba7dd3b27e9c876ab5847a3b3b254cc7d4f
+  metadata.gz: 3a45102a35d4a4d4bff64e68a4edef1b7e29d8c2ca68c0a957ac2589b8ce3b04
+  data.tar.gz: 506f07bccd0524de51819b128a6a707979e68723e513e829e0437a9d7b503b75
 SHA512:
-  metadata.gz: 40c69c54f989318441e697487673f7c019907cddcea3d81fa9b5775964fc2a6a76994b97093465d57f26521813780292f58d28f11ed75638222b458a75e514f8
-  data.tar.gz: bce1cd39d64e2501b222135477c7e10d38769ae26b47827c3c76efb8d2651cdffae689ad3c8e2bb9bd0bdd1315e9f2dbfcdd3dd576079589c75d3d7585c2668c
+  metadata.gz: e33a481a786ef940d50eabf13b23ddc8175af68ec16892f685809a7acec88a27786f4b54e6588a890167c90a058d690acc7d1ba7d264e0802549590516d499aa
+  data.tar.gz: 45dcce0d68ce3011521aea9ffcefc7d355af5544c0cc8cc385b37b897e953cd51d9af928536c8c901f7ff35ba33a52df9886ac186b5182aecc0821c83d6ceb91

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [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
+  - 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.7] - 2025-01-14
 ### Fixed
 - Corrected SQL value handling in native loader

data/lib/real_data_tests/rspec_helper.rb

@@ -103,36 +103,83 @@ module RealDataTests
       statements
     end
 
+    def extract_conflict_clause(statement)
+      # Use a more precise regex that handles multiple closing parentheses
+      if statement =~ /(.+?\))\s*(ON\s+CONFLICT\s+.*?)(?:;?\s*$)/i
+        [$1, $2.strip]
+      else
+        [statement.sub(/;?\s*$/, ''), nil]
+      end
+    end
+
     def clean_sql_statement(statement)
-      # Extract the ON CONFLICT clause if it exists
-      statement, conflict_clause = extract_conflict_clause(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
+          pre_values = $1
+          values_content = $2
+          post_values = $3
 
-      # 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])
+          # Clean the values content while preserving complex JSON
+          cleaned_values = clean_complex_values(values_content)
 
           # Reassemble the statement
-          statement = "#{parts[0]}VALUES (#{values})"
+          statement = "#{pre_values}#{cleaned_values}#{post_values}"
+          statement += ";" unless statement.end_with?(";")
         end
       end
-
-      # Add back the conflict clause if it existed
-      statement += " #{conflict_clause}" if conflict_clause
-      statement += ";"
-
       statement
     end
 
-    def extract_conflict_clause(statement)
-      if statement =~ /(.+?)(\s+ON\s+CONFLICT\s+.*?)(?:;?\s*$)/i
-        [$1, $2.strip]
-      else
-        [statement.sub(/;?\s*$/, ''), nil]
+    def clean_complex_values(values_str)
+      current_value = ''
+      values = []
+      in_quotes = false
+      in_json = false
+      json_brace_count = 0
+
+      chars = values_str.chars
+      i = 0
+      while i < chars.length
+        char = chars[i]
+
+        case char
+        when "'"
+          # Check if this is an escaped quote
+          if i > 0 && chars[i-1] != '\\'
+            in_quotes = !in_quotes
+          end
+          current_value << char
+        when '{'
+          if !in_quotes
+            in_json = true
+            json_brace_count += 1
+          end
+          current_value << char
+        when '}'
+          if !in_quotes
+            json_brace_count -= 1
+            in_json = json_brace_count > 0
+          end
+          current_value << char
+        when ','
+          if !in_quotes && !in_json
+            values << clean_value(current_value.strip)
+            current_value = ''
+          else
+            current_value << char
+          end
+        else
+          current_value << char
+        end
+        i += 1
       end
+
+      # Add the last value
+      values << clean_value(current_value.strip) unless current_value.strip.empty?
+
+      values.join(', ')
     end
 
     def clean_values(values_str)

data/lib/real_data_tests/version.rb

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

metadata

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