ncs_mdes_warehouse 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 NCS Navigator MDES Warehouse History
 ====================================
 
+0.7.2
+-----
+
+- Correct behavior of FK index with database external key provider. (#2387)
+
+- Remove transaction handling in SqlTransformer. (Transformers are automatically
+  wrapped in a transaction, so it's redundant for the transformer to do it
+  itself.)
+
 0.7.1
 -----
 

data/lib/ncs_navigator/warehouse/transformers/foreign_key_index.rb

@@ -92,7 +92,7 @@ module NcsNavigator::Warehouse::Transformers
     def verify_relationship(record, belongs_to)
       reference_name  = belongs_to.child_key.first.name
       reference_value = record.send(reference_name)
-      foreign_model   = belongs_to.parent_model.to_s
+      foreign_model   = belongs_to.parent_model
 
       if reference_value && !seen?(foreign_model, reference_value)
         interim_unsatisfied << RelationshipInstance.new(

data/lib/ncs_navigator/warehouse/transformers/foreign_key_index/static_key_provider.rb

@@ -13,6 +13,8 @@ module NcsNavigator::Warehouse::Transformers
       end
 
       def existing_keys(model_class)
+        # validation is to help with the uses of this class in specs
+        fail 'model_class must be a string' unless Class === model_class
         known_keys[model_class.to_s]
       end
     end

data/lib/ncs_navigator/warehouse/transformers/sql_transformer.rb

@@ -29,6 +29,7 @@ module NcsNavigator::Warehouse::Transformers
     end
 
     extend Forwardable
+    include NcsNavigator::Warehouse::StringifyTrace
 
     def_delegators :@configuration, :shell, :log
     attr_reader :statements, :name
@@ -70,24 +71,23 @@ module NcsNavigator::Warehouse::Transformers
     # @return [void]
     # @param [TransformStatus] transform_status
     def transform(transform_status)
-      NcsNavigator::Warehouse::TransformStatus.transaction do |tx|
-        stmt_ct = statements.size
-        statements.each_with_index do |stmt, i|
-          log.debug("Executing SQL statement in SQL transformer: \n#{stmt}")
-          shell.clear_line_and_say("[#{name}] Executing statement #{i + 1}/#{stmt_ct}...")
-          begin
-            result = adapter.execute(stmt)
-            transform_status.record_count += result.affected_rows
-          rescue Exception => e
-            transform_status.transform_errors << NcsNavigator::Warehouse::TransformError.
-              for_exception(e, "Exception while executing SQL statement \"#{stmt}\" (#{i + 1} of #{stmt_ct}).")
-            shell.clear_line_and_say("[#{name}] Failed on #{i + 1}/#{stmt_ct}.")
-            tx.rollback
-            return
-          end
+      stmt_ct = statements.size
+      statements.each_with_index do |stmt, i|
+        log.info("Executing SQL statement in SQL transformer: \n#{stmt}")
+        shell.clear_line_and_say("[#{name}] Executing statement #{i + 1}/#{stmt_ct}...")
+        begin
+          result = adapter.execute(stmt)
+          transform_status.record_count += result.affected_rows
+          log.debug("Previous statement affected #{result.affected_rows} row#{result.affected_rows == 1 ? '' : 's'}.")
+        rescue Exception => e
+          transform_status.transform_errors << NcsNavigator::Warehouse::TransformError.
+            for_exception(e, "Exception while executing SQL statement \"#{stmt}\" (#{i + 1} of #{stmt_ct}).")
+          shell.clear_line_and_say("[#{name}] Failed on #{i + 1}/#{stmt_ct}.\n")
+          log.error("Previous statement failed with exception.\n#{e.class}: #{e}\n#{stringify_trace(e.backtrace)}")
+          return
         end
-        shell.clear_line_and_say("[#{name}] Executed #{stmt_ct} SQL statement#{stmt_ct == 1 ? '' : 's'}.")
       end
+      shell.clear_line_and_say("[#{name}] Executed #{stmt_ct} SQL statement#{stmt_ct == 1 ? '' : 's'}.\n")
     end
 
     private

data/lib/ncs_navigator/warehouse/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Warehouse
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
   end
 end

data/spec/ncs_navigator/warehouse/transformers/foreign_key_index_spec.rb

@@ -24,7 +24,7 @@ module NcsNavigator::Warehouse::Transformers
     end
 
     let(:fk_index) { ForeignKeyIndex.new(:existing_key_provider => key_provider) }
-    let(:key_provider) { ForeignKeyIndex::StaticKeyProvider.new(Addr.to_s => [120, 180]) }
+    let(:key_provider) { ForeignKeyIndex::StaticKeyProvider.new(Addr.to_s => [120, 180], Frob.to_s => [80]) }
     let(:transform_status) { NcsNavigator::Warehouse::TransformStatus.memory_only('test') }
     let(:errors) { transform_status.transform_errors }
 
@@ -73,6 +73,15 @@ module NcsNavigator::Warehouse::Transformers
         errors.should == []
       end
 
+      it 'does not report for a key which is provided by the external key provider when the associated model class has not previously been referenced' do
+        another_index = ForeignKeyIndex.new(:existing_key_provider => key_provider)
+
+        another_index.record_and_verify(Addr.new(:id => 8, :frob_id => 80))
+        another_index.report_errors(transform_status)
+
+        errors.should == []
+      end
+
       describe 'when a key is never satisfied' do
         before do
           fk_index.record_and_verify(Addr.new(:frob_id => 4, :id => 1))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes_warehouse
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncs_mdes
@@ -1817,7 +1817,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 614804368533218739
+      hash: -207131653451212377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1826,7 +1826,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 614804368533218739
+      hash: -207131653451212377
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24