real_data_tests 0.3.15 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6d2be28f1fa0fc3982e0d8bb4927ea8f25eb1701d0c77059ec6a4059cb33ee
-  data.tar.gz: 19f5865fbb86760845c079a5b46ba49231533a33a91596e2b7c73438ca3941eb
+  metadata.gz: 52310e31cdfaa0e019824607ff10a0b06a99381ab559cbe50f5922a9f7f8cea1
+  data.tar.gz: 777d70960ae3d1905cff453d7b6ea96ffc581492907691bd38a9a9d205ed63cb
 SHA512:
-  metadata.gz: 6d68fbb46440b6950ec57363bbd995ea64503c41c9c66955ad1ad28b9338f51798a7aad945238e0a61c7654651a365b80056b3108e4dff1d2486b5c77cfad91c
-  data.tar.gz: e82c24d4082fb0d5e4e56e6de6cfd0e7130029057f2fa993e4f9bffdc2c5583bde94ee7c224535890f7e74ae01d8dd08ad670e2daef20041d572bf9845955fe8
+  metadata.gz: 042425555c4a9b6d538217aefb9faa2502cbd7753ccdb68169ff4a45d08cc1af1b0258737d3c79e5c4be19f1754e8efe11764eac5d0130ab0ed6606b0823b0aa
+  data.tar.gz: 49c59d9646ccdafbad9ab00c18261f5fee1310059e4e10ffc2505a1fc65913c4918d6e22ef94a8fb727cf4e7bfcfba8eecd813945bf09fbda80801c723fef4e8

data/CHANGELOG.md

@@ -1,46 +1,6 @@
 ## [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
-  - 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
-  - Fixed boolean value handling, particularly at the end of VALUES clauses
-  - Improved handling of NULL values and numbers
-  - Added proper whitespace cleaning for values
-  - Enhanced value type detection for correct quoting
-
-## [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
+## [0.3.5 - 0.3.17] - 2025-01-14
 ### Fixed
 - Enhanced SQL statement handling in native loader
   - Added proper UUID value quoting in VALUES clauses

data/lib/real_data_tests/rspec_helper.rb

@@ -90,36 +90,80 @@ module RealDataTests
       options.join(" ")
     end
 
+    class SqlBlock
+      attr_reader :type, :content, :table_name
+
+      def initialize(content)
+        @content = content.strip
+        @type = determine_block_type
+        @table_name = extract_table_name if @type == :insert
+      end
+
+      private
+
+      def determine_block_type
+        if @content.match?(/\AINSERT INTO/i)
+          :insert
+        elsif @content.match?(/\ACOPY.*FROM stdin/i)
+          :copy
+        elsif @content.match?(/\AALTER TABLE/i)
+          :alter
+        elsif @content.match?(/\ASET/i)
+          :set
+        else
+          :other
+        end
+      end
+
+      def extract_table_name
+        if @content =~ /INSERT INTO\s+"?([^\s"(]+)"?\s/i
+          $1
+        end
+      end
+    end
+
     def parse_sql_blocks(content)
       blocks = []
       current_block = []
       in_copy_block = false
 
       content.each_line do |line|
-        line = line.strip
-        next if line.empty? || line.start_with?('--')
+        line = line.chomp
+
+        # Skip empty lines and comments unless in COPY block
+        next if !in_copy_block && (line.empty? || line.start_with?('--'))
 
-        if line.upcase.start_with?('COPY') && line.upcase.include?('FROM stdin')
+        # Handle start of COPY block
+        if !in_copy_block && line.upcase.match?(/\ACOPY.*FROM stdin/i)
+          current_block = [line]
           in_copy_block = true
+          next
+        end
+
+        # Handle end of COPY block
+        if in_copy_block && line == '\\.'
           current_block << line
-        elsif line == '\.' && in_copy_block
+          blocks << SqlBlock.new(current_block.join("\n"))
+          current_block = []
           in_copy_block = false
+          next
+        end
+
+        # Accumulate lines in COPY block
+        if in_copy_block
           current_block << line
+          next
+        end
+
+        # Handle regular SQL statements
+        current_block << line
+        if line.end_with?(';')
           blocks << SqlBlock.new(current_block.join("\n"))
           current_block = []
-        elsif in_copy_block
-          current_block << line
-        else
-          # Handle regular SQL statements
-          current_block << line
-          if line.end_with?(';') && !in_copy_block
-            blocks << SqlBlock.new(current_block.join("\n"))
-            current_block = []
-          end
         end
       end
 
-      # Add any remaining block
+      # Handle any remaining block
       blocks << SqlBlock.new(current_block.join("\n")) unless current_block.empty?
       blocks
     end
@@ -136,29 +180,54 @@ module RealDataTests
     end
 
     def execute_insert_block(block, index, total)
-      puts "Executing INSERT block #{index}/#{total} for table: #{block.table_name}"
-      statement = normalize_insert_statement(block.content)
-      ActiveRecord::Base.connection.execute(statement)
+      # puts "Executing INSERT block #{index}/#{total} for table: #{block.table_name}"
+      # Don't modify statements that already end with semicolon
+      statement = if block.content.strip.end_with?(';')
+        block.content
+      else
+        "#{block.content};"
+      end
+
+      begin
+        ActiveRecord::Base.connection.execute(statement)
+      rescue ActiveRecord::StatementInvalid => e
+        if e.message.include?('syntax error at or near "ON"')
+          # Try alternative formatting for ON CONFLICT
+          modified_statement = statement.gsub(/\)\s+ON\s+CONFLICT/, ') ON CONFLICT')
+          ActiveRecord::Base.connection.execute(modified_statement)
+        else
+          raise
+        end
+      end
     end
 
     def execute_copy_block(block, index, total)
-      puts "Executing COPY block #{index}/#{total}"
+      # puts "Executing COPY block #{index}/#{total}"
       ActiveRecord::Base.connection.execute(block.content)
     end
 
     def execute_regular_block(block, index, total)
-      puts "Executing block #{index}/#{total} of type: #{block.type}"
+      # puts "Executing block #{index}/#{total} of type: #{block.type}"
       ActiveRecord::Base.connection.execute(block.content)
     end
 
     def normalize_insert_statement(statement)
-      # Handle ON CONFLICT clauses properly
-      if statement =~ /(.*?)\s+(ON\s+CONFLICT.*?)\s*;\s*\z/i
-        main_insert = $1
-        conflict_clause = $2
-        "#{main_insert} #{conflict_clause};"
+      # First clean up any excess whitespace around parentheses
+      statement = statement.gsub(/\(\s+/, '(')
+                          .gsub(/\s+\)/, ')')
+                          .gsub(/\)\s+ON\s+CONFLICT/, ') ON CONFLICT')
+
+      # Ensure proper spacing around ON CONFLICT
+      if statement =~ /(.*?)\s*ON\s+CONFLICT\s+(.*?)\s*(?:DO\s+.*?)?\s*;\s*\z/i
+        base = $1.strip
+        conflict_part = $2.strip
+        action_part = $3&.strip || 'DO NOTHING'
+
+        # Rebuild the statement with consistent formatting
+        "#{base} ON CONFLICT #{conflict_part} #{action_part};"
       else
-        statement
+        # If no ON CONFLICT clause, just clean up the spacing
+        statement.strip.sub(/;?\s*$/, ';')
       end
     end
 

data/lib/real_data_tests/version.rb

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

metadata

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