real_data_tests 0.3.14 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e142b478391e00c15f51378e09dd2b7e1429f8c7d1bdd2bb5d059ae8a968fb
-  data.tar.gz: a4464de621782aebfa90bac25e90458e4feca5c1007898d3537d44866a937c7b
+  metadata.gz: fbf98b8c1c4b72e614a490731c40ff4f56c36eb14b4b13cf19fc13b7c3022fe3
+  data.tar.gz: '029a17e72f0a42f34eae153cbf4a212e185100027e438b8a9e48efb112b7e349'
 SHA512:
-  metadata.gz: '078fcfb22739b26714d756e10afc54ce10a15b947706f1f8eccee31f65384695b770ea546e69a889c033378fff79d314b1b66c4d86b29b3eab2dbb62e6b93231'
-  data.tar.gz: c02a03e895d13a78e75adcf5c8ff5c6d9ea920d91dbaf463dad5e344bbe890e5877cb42385a65aa1f2df5c57b94cb595c96b78279cb9f1f66616e44e9a50a927
+  metadata.gz: 854233f093058fe510b0c37409a6a4c3445a2c65a70dc9c862d3a8eaec12a535ba435b354a5348b8e4f41bf15291caacabcb1d9b4274b506f02d1baeec97e2b0
+  data.tar.gz: ce700cb666714010f2622307da5321fac568eb32afbaf6795121d855e6e47409047192a0c38d3b0ed1f3b8e82d109988135c7c8b6a6cfb63c6e8e274c79a686e

data/lib/real_data_tests/rspec_helper.rb

@@ -1,5 +1,38 @@
 module RealDataTests
   module RSpecHelper
+    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
+        case @content
+        when /\AINSERT INTO/i
+          :insert
+        when /\ACOPY.*FROM stdin/i
+          :copy
+        when /\AALTER TABLE/i
+          :alter
+        when /\ASET/i
+          :set
+        else
+          :other
+        end
+      end
+
+      def extract_table_name
+        if @content =~ /INSERT INTO\s+"?([^\s"(]+)"?\s/i
+          $1
+        end
+      end
+    end
+
     def load_real_test_data(name)
       dump_path = File.join(RealDataTests.configuration.dump_path, "#{name}.sql")
       raise Error, "Test data file not found: #{dump_path}" unless File.exist?(dump_path)
@@ -17,11 +50,13 @@ module RealDataTests
       end
     end
 
-    # Native Ruby implementation
     def load_real_test_data_native(name)
       dump_path = File.join(RealDataTests.configuration.dump_path, "#{name}.sql")
       raise Error, "Test data file not found: #{dump_path}" unless File.exist?(dump_path)
 
+      sql_content = File.read(dump_path)
+      blocks = parse_sql_blocks(sql_content)
+
       ActiveRecord::Base.transaction do
         connection = ActiveRecord::Base.connection
 
@@ -29,17 +64,8 @@ module RealDataTests
         connection.execute('SET session_replication_role = replica;')
 
         begin
-          sql_content = File.read(dump_path)
-          statements = split_sql_statements(sql_content)
-
-          statements.each_with_index do |statement, index|
-            begin
-              cleaned_statement = clean_sql_statement(statement)
-              puts "Executing Statement ##{index + 1}: #{cleaned_statement}" # Debug log
-              connection.execute(cleaned_statement)
-            rescue ActiveRecord::StatementInvalid => e
-              raise Error, "Error executing statement ##{index + 1}: #{e.message}\nSQL: #{cleaned_statement}"
-            end
+          blocks.each_with_index do |block, index|
+            execute_block(block, index + 1, blocks.length)
           end
         ensure
           connection.execute('SET session_replication_role = DEFAULT;')
@@ -64,6 +90,147 @@ 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.chomp
+
+        # Skip empty lines and comments unless in COPY block
+        next if !in_copy_block && (line.empty? || line.start_with?('--'))
+
+        # 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
+          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 = []
+        end
+      end
+
+      # Handle any remaining block
+      blocks << SqlBlock.new(current_block.join("\n")) unless current_block.empty?
+      blocks
+    end
+
+    def execute_block(block, index, total)
+      case block.type
+      when :insert
+        execute_insert_block(block, index, total)
+      when :copy
+        execute_copy_block(block, index, total)
+      else
+        execute_regular_block(block, index, total)
+      end
+    end
+
+    def execute_insert_block(block, index, total)
+      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}"
+      ActiveRecord::Base.connection.execute(block.content)
+    end
+
+    def execute_regular_block(block, index, total)
+      puts "Executing block #{index}/#{total} of type: #{block.type}"
+      ActiveRecord::Base.connection.execute(block.content)
+    end
+
+    def normalize_insert_statement(statement)
+      # 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
+        # If no ON CONFLICT clause, just clean up the spacing
+        statement.strip.sub(/;?\s*$/, ';')
+      end
+    end
+
     def split_sql_statements(sql)
       statements = []
       current_statement = ''
@@ -206,41 +373,4 @@ module RealDataTests
       end
     end
   end
-
-  def import
-    @logger.info "Starting SQL import..."
-
-    ActiveRecord::Base.transaction do
-      begin
-        # Disable foreign key checks and triggers temporarily
-        ActiveRecord::Base.connection.execute('SET session_replication_role = replica;')
-
-        # Split the SQL content into individual statements
-        statements = split_sql_statements(@sql_content)
-
-        statements.each_with_index do |statement, index|
-          next if statement.strip.empty?
-
-          begin
-            @logger.info "Executing statement #{index + 1} of #{statements.length}"
-            cleaned_statement = clean_sql_statement(statement)
-            ActiveRecord::Base.connection.execute(cleaned_statement)
-          rescue ActiveRecord::StatementInvalid => e
-            @logger.error "Error executing statement #{index + 1}: #{e.message}"
-            @logger.error "Statement: #{cleaned_statement[0..100]}..."
-            raise
-          end
-        end
-
-        @logger.info "Successfully imported all SQL statements"
-      rescue StandardError => e
-        @logger.error "Error during import: #{e.message}"
-        @logger.error e.backtrace.join("\n")
-        raise
-      ensure
-        # Re-enable foreign key checks and triggers
-        ActiveRecord::Base.connection.execute('SET session_replication_role = DEFAULT;')
-      end
-    end
-  end
 end

data/lib/real_data_tests/version.rb

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

metadata

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