real_data_tests 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35d81ac18056a163df010e92d75c5bd36896836d070f8c74041048ab98918cdf
-  data.tar.gz: 50d5df4a36a88f58b6dbc76494db155bc68b5b9ca1cf8cbd45b22a4bd8cd6166
+  metadata.gz: 179a591f6a485c397255c0cbec27e18757e2f7fdc450f7292f279cd681f91e0b
+  data.tar.gz: bb9b9f4f60b609f2ea8a901689b4b9b8d5ddfdc7d36e867c18ebbe24855cb5aa
 SHA512:
-  metadata.gz: fb2bf7729c1b3a0c86a073924b8c50b0a2005885d93acb7bdd419f12db87e858801222235c6a1c437144b53f57b9375ee56e76c467e6b1d4e643a403131153c9
-  data.tar.gz: ff37ab1ab9d6c2b33efb657905bb682c4d99cd22a7533e8b19db95d9949f11e621f0d750fbb829f8d61c377faa64d008c66bcdd703a072fae349d4d80c369ab2
+  metadata.gz: a47d49d690958e70cd324ede48dadce7d3e9e7bd39471ee052879d6fe5646ad308aebbf05f79cb92ebe3c9b7ede94b0163c74efdddf3f518ef47518a489a2ee6
+  data.tar.gz: a4c6a97cff1bd02096064fd1da67580dd9307ce29f4e7d5a8be4d82c9f352b97009ef1fc22eb555dc39b1b87599947680a61bc2bc376c2cd14a7f8cc5397892d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.3.6] - 2025-01-14
+### Fixed
+- Further enhanced SQL statement handling in native loader
+  - Fixed handling of SQL statements with ON CONFLICT clauses
+  - Improved quoting for company names containing spaces
+  - Added proper handling of trailing semicolons
+  - Enhanced detection and preservation of SQL statement structure
+
 ## [0.3.5] - 2025-01-14
 ### Fixed
 - Enhanced SQL statement handling in native loader

data/lib/real_data_tests/rspec_helper.rb

@@ -103,23 +103,81 @@ module RealDataTests
       statements
     end
 
-    def clean_sql_statement(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
-          # Properly quote UUIDs and strings in the VALUES part
-          values_part = parts[1]
-          values_part = values_part.gsub(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?=[,\s)])/i, "'\\1'")
-          # Quote unquoted string values
-          values_part = values_part.gsub(/,\s*([^',\s][^,\s]*)(?=[,\s)])/, ", '\\1'")
-          # Reassemble the statement
-          statement = parts[0] + 'VALUES (' + values_part
+          def clean_sql_statement(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
+            # Get the column names from the first part
+            column_names = parts[0].scan(/\((.*?)\)/).flatten.first&.split(',')&.map(&:strip) || []
+
+            # Split values into individual items
+            values_part = parts[1]
+            values = split_values(values_part)
+
+            # Process each value according to its column and position
+            values.each_with_index do |value, i|
+              # Skip if already properly quoted
+              next if value.start_with?("'") && value.end_with?("'")
+
+              # Quote UUIDs
+              if value.match?(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i)
+                values[i] = "'#{value}'"
+              # Quote any non-NULL string values that contain spaces or special characters
+              elsif !['NULL', 'true', 'false'].include?(value) &&
+                    !value.match?(/^\d+$/) && # not a number
+                    !value.start_with?("'{") && # not a JSON object
+                    !value.start_with?("'") # not already quoted
+                values[i] = "'#{value}'"
+              end
+            end
+
+            # Reassemble the statement with any trailing ON CONFLICT clause
+            remainder = values_part.match(/\)\s*(ON\s+CONFLICT.*?)(;?\s*$)/i)
+            statement = parts[0] + 'VALUES (' + values.join(', ') + ')'
+            statement += " #{remainder[1]};" if remainder
+          end
         end
+
+        statement
       end
 
-      statement
-    end
+      def split_values(values_part)
+        values = []
+        current_value = ''
+        in_quotes = false
+        in_json = false
+        depth = 0
+
+        values_part.chars.each_with_index do |char, i|
+          case char
+          when "'"
+            # Toggle quote state if not escaped
+            if i == 0 || values_part[i-1] != '\\'
+              in_quotes = !in_quotes
+            end
+          when '{'
+            depth += 1 unless in_quotes
+            in_json = true unless in_quotes
+          when '}'
+            depth -= 1 unless in_quotes
+          when ','
+            if !in_quotes && depth == 0
+              values << current_value.strip
+              current_value = ''
+              next
+            end
+          end
+          current_value << char
+        end
+
+        # Add the last value (remove trailing ';' or ')')
+        last_value = current_value.strip
+        last_value = last_value[0..-2] if last_value.end_with?(';', ')')
+        values << last_value
+
+        values
+      end
   end
 end

data/lib/real_data_tests/version.rb

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

metadata

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