real_data_tests 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573f1753777e04a6168a09385b8332cedbb4d521d11f1807012a25b8b846013c
-  data.tar.gz: b884098abbc9134a22479d5e9211a2d8bb153622022ba9116acb0057419cbe4a
+  metadata.gz: 3a45102a35d4a4d4bff64e68a4edef1b7e29d8c2ca68c0a957ac2589b8ce3b04
+  data.tar.gz: 506f07bccd0524de51819b128a6a707979e68723e513e829e0437a9d7b503b75
 SHA512:
-  metadata.gz: 1d4bcb84f7d3ab3ee0901ae46763c912f3c86935930cc17607d500ae7a2e26649f8c6ff629e8215437d8f08ae93d482870e253b294e84e720971c9bf681c7b50
-  data.tar.gz: 67cad3bda841d3e1de61d61dd30121ef3b6ddfc96a3162438a2b25f904185e6e4c59206d2626e6b40d44a72d123ed123e4073a4fdfe10d04fea807a8702bf689
+  metadata.gz: e33a481a786ef940d50eabf13b23ddc8175af68ec16892f685809a7acec88a27786f4b54e6588a890167c90a058d690acc7d1ba7d264e0802549590516d499aa
+  data.tar.gz: 45dcce0d68ce3011521aea9ffcefc7d355af5544c0cc8cc385b37b897e953cd51d9af928536c8c901f7ff35ba33a52df9886ac186b5182aecc0821c83d6ceb91

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [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

data/lib/real_data_tests/rspec_helper.rb

@@ -113,29 +113,73 @@ 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})"
+      # 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
+
+          # Clean the values content while preserving complex JSON
+          cleaned_values = clean_complex_values(values_content)
+
+          # Reassemble the statement
+          statement = "#{pre_values}#{cleaned_values}#{post_values}"
+          statement += ";" unless statement.end_with?(";")
         end
       end
+      statement
+    end
 
-      # Add back the conflict clause if it existed
-      statement = "#{statement}#{conflict_clause ? ' ' + conflict_clause : ''}"
+    def clean_complex_values(values_str)
+      current_value = ''
+      values = []
+      in_quotes = false
+      in_json = false
+      json_brace_count = 0
 
-      # Ensure the statement ends with a semicolon
-      statement += ";" unless statement.end_with?(';')
+      chars = values_str.chars
+      i = 0
+      while i < chars.length
+        char = chars[i]
 
-      statement
+        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.8"
+  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.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Kevin Dias