activefacts-compositions 1.9.17 → 1.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629d91efc99ba1f54872c6c668a1ee0f86bf7d04
-  data.tar.gz: b2e8c929798553e24d7bf1e8fe0e81718c0b811b
+  metadata.gz: 9264168bcd4294c87277a11fde73ba06c0e490e6
+  data.tar.gz: 40f2da7b5f7a72066b13ed7bc2de790e3717af82
 SHA512:
-  metadata.gz: a5ebe59af26c890d1f5771400d3dced9c123c96b252b10ee0805c04612fed3f7eac0ef4018ecfbdfe09882b43605fa6109307b831c2fce15541c0a5ff43311be
-  data.tar.gz: bd9f2f20c79718881cf6a8f7c42b21cb37f6b0d5346302f77d9453341f6aff7768acc9f0e495c7b4e1850879935bddecf72d14e5fb98ce0740b62fa23e7973d1
+  metadata.gz: ecb7fb4562dbe1e8bef8924abc26a19c2aa4816eca5d09fd609b34a060acd11bef1d72642fe32ef631a5af2c1bd82bc968fbe8c48d386c0f409d41aba624c5bc
+  data.tar.gz: 46e7e8d45dadc6154867d2ce6ccd605bbcd897ab86f063481b8680b0fec4284ccd529edbd38fa86cabadeaad1584e82090fd89fc3f3a430da6dce47d61950106

data/activefacts-compositions.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "activefacts", "~> 1", ">= 1.8"
   spec.add_runtime_dependency "activefacts-api", "~> 1", ">= 1.9.11"
-  spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.20"
-  spec.add_runtime_dependency "activefacts-cql", "~> 1", ">= 1.9.3"
+  spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.22"
+  spec.add_runtime_dependency "activefacts-cql", "~> 1", ">= 1.9.5"
 end

data/lib/activefacts/compositions/binary.rb

@@ -1,4 +1,4 @@
-### Composition
+#
 # ActiveFacts Compositions, Binary Compositor.
 #
 #       Fans of RDF will like this one.

data/lib/activefacts/compositions/compositor.rb

@@ -6,6 +6,8 @@
 #       The term "reference" used here means either an Absorption
 #       (one direction of a binary fact type relating two object types),
 #       or an Indicator (for a unary fact type).
+#       Later processes may create references for bare Mappings,
+#       or may replace several Indicators by a Discriminator.
 #
 #       n-ary fact types and other objectified fact types are factored out by using the associated LinkFactTypes.
 #
@@ -48,11 +50,12 @@ module ActiveFacts
       end
 
       def populate_reference role
-        return if (@reference_populated ||= {})[role]
+        component = (@reference_populated ||= {})[role]
+        return component if component
         @reference_populated[role] = true
 
         parent = @binary_mappings[role.object_type]
-        return if role.fact_type.all_role.size > 2
+        return nil if role.fact_type.all_role.size > 2
         if role.fact_type.all_role.size != 1
           counterpart = role.counterpart
           rt = role_type(counterpart)
@@ -60,7 +63,7 @@ module ActiveFacts
             raise "Fact type must be objectified: #{role.fact_type.default_reading}"
           end
 
-          a = @constellation.Absorption(
+          component = @constellation.Absorption(
               :new,
               name: role_name(counterpart),
               parent: parent,
@@ -68,29 +71,30 @@ module ActiveFacts
               parent_role: role,
               child_role: counterpart
             )
-          # Populate the absorption/reverse_absorption (putting the "many" or optional side as reverse)
+          # Populate the absorption/reverse_mapping (putting the "many" or optional side as reverse)
           if r = @component_by_fact[role.fact_type]
             # Second occurrence of this fact type, set the direction:
-            if a.is_preferred_direction
-              a.reverse_absorption = r
+            if component.is_preferred_direction
+              component.reverse_mapping = r
             else  # Set this as the reverse absorption
-              a.forward_absorption = r
+              component.forward_mapping = r
             end
           else
             # First occurrence of this fact type
-            @component_by_fact[role.fact_type] = a
+            @component_by_fact[role.fact_type] = component
           end
         else    # It's an indicator
-          a = @constellation.Indicator(
+          component = @constellation.Indicator(
               :new,
               name: role.name,
               parent: parent,
               role: role
             )
-          @component_by_fact[role.fact_type] = a  # For completeness, in case a subclass uses it
+          @component_by_fact[role.fact_type] = component  # For completeness, in case a subclass uses it
         end
-        @reference_populated[role] = a
-        trace :binarize, "Populating #{a.inspect}"
+        @reference_populated[role] = component
+        trace :binarize, "Populated #{component.inspect}"
+        component
       end
 
     private

data/lib/activefacts/compositions/datavault.rb

@@ -16,7 +16,7 @@ module ActiveFacts
 
       BDV_ANNOTATIONS = /same as link|hierarchy link|computed link|exploration link|computed satellite|point in time|bridge/
       BDV_LINK_ANNOTATIONS = /same as link|hierarchy link|computed link|exploration link/
-      BDV_SAT_ANNOTATIONS = /computed satellite/
+      BDV_SAT_ANNOTATIONS = /computed satellite/    # Not used yet
       BDV_PIT_ANNOTATIONS = /point in time/
       BDV_BRIDGE_ANNOTATIONS = /bridge/
 
@@ -25,7 +25,7 @@ module ActiveFacts
         datavault_options.
         merge({
           reference: ['Boolean', "Emit the reference (static) tables as well. Default is to omit them"],
-          id: ['String', "Append this to data vault surrogate keys (default HID)"],
+          id: ['String', "Append this to data vault surrogate key names (default HID)"],
           hubname: ['String', "Suffix or pattern for naming hub tables. Include a + to insert the name. Default 'HUB'"],
           linkname: ['String', "Suffix or pattern for naming link tables. Include a + to insert the name. Default 'LINK'"],
           satname: ['String', "Suffix or pattern for naming satellite tables. Include a + to insert the name. Default 'SAT'"],
@@ -34,14 +34,18 @@ module ActiveFacts
           refname: ['String', "Suffix or pattern for naming reference tables. Include a + to insert the name. Default '+'"],
         }).
         merge(Relational.options).
-        reject{|k,v| [:surrogates].include?(k) }  # Datavault surrogates are not optional
+        reject{|k,v| [:fk, :surrogates].include?(k) }.  # Datavault surrogates are not optional
+        merge({
+          fk: [%w{hash}, "Enforce foreign keys using a hash of the natural keys (ala Data Vault 2)"],
+        })
       end
 
       def initialize constellation, name, options = {}
         # Extract recognised options:
         datavault_initialize options
+
         @option_reference = options.delete('reference')
-        @option_id = ' ' + (options.delete('id') || 'HID')
+        @option_id = '+ ' + (options.delete('id') || 'HID')
         @option_hub_name = options.delete('hubname') || 'HUB'
         @option_hub_name.sub!(/^/,'+ ') unless @option_hub_name =~ /\+/
         @option_link_name = options.delete('linkname') || 'LINK'
@@ -60,10 +64,8 @@ module ActiveFacts
         @option_surrogates = true   # Always inject surrogates regardless of superclass
       end
 
-      # We need to find links that need surrogate keys before we inject the surrogates
-      def inject_surrogates
-        classify_composites
-
+      def generate
+        create_loadbatch if @option_audit == 'batch'
         super
       end
 
@@ -94,8 +96,14 @@ module ActiveFacts
         super
       end
 
+      def inject_surrogates
+        # We need to find links that need surrogate keys before we inject the surrogates
+        classify_composites
+        super
+      end
+
       # Change the default extension from our superclass':
-      def inject_surrogate composite, extension = @option_id
+      def inject_surrogate composite, name_pattern = @option_id
         super
       end
 
@@ -202,7 +210,7 @@ module ActiveFacts
                 mapped_to =
                 composite_key_structure composite
 
-              # It's a Link if the preferred identifier includes more than non_reference_composite.
+              # It's a Link if the preferred identifier includes more than one non_reference_composite.
               mapped_to.compact.size > 1
             end
           end
@@ -250,7 +258,7 @@ module ActiveFacts
       end
 
       def detect_reference_tables
-        initial_composites = @composition.all_composite.to_a
+        initial_composites = @composition.all_composite.select{|c| c != loadbatch_composite }
         @reference_composites, @non_reference_composites =
           initial_composites.partition { |composite| composite_is_reference(composite) }
       end
@@ -299,14 +307,16 @@ module ActiveFacts
         # For each hub and link, move each non-identifying member
         # to a new satellite or promote it to a new link.
         (@hub_composites + @link_composites).each do |composite|
-          devolve composite
+          split_satellites_from composite
         end
 
         # Rename parents for rdv and bdv
         apply_composite_name_pattern
 
-        # inject datetime and record source for rdv hubs and links
-        inject_all_datetime_recordsource
+        # Inject datetime and record source into the LoadBatch table
+        if @option_audit == 'batch'
+          inject_audit_fields(loadbatch_composite)
+        end
 
         unless @option_reference
           if trace :reference_retraction
@@ -326,14 +336,16 @@ module ActiveFacts
           @constellation.loggers.pop if trace :reference_retraction
         end
 
-        # Devolve point in time tables, if any
+        # Populate fields of any point in time tables
         @pit_composites.each do |composite|
-          devolve_pit(composite)
+          populate_pit(composite)
         end
 
+        super
       end
 
-      def devolve_pit(pit_composite)
+      # A Point-In-Time table links a hub to its satellites applicable at a particular time
+      def populate_pit(pit_composite)
         # inject standard PIT components: surrogate key, hub hash key and snapshot date time
         inject_surrogate(pit_composite)
 
@@ -342,14 +354,16 @@ module ActiveFacts
         pit_hub_field = hub_hash_field.fork_to_new_parent(pit_composite.mapping)
         date_field = @constellation.ValidFrom(:new,
           parent: pit_composite.mapping,
-          name: "Snapshot"+datestamp_type_name,
-          object_type: datestamp_type
+          name: "Snapshot "+datestamp_type_name,
+          object_type: datestamp_type,
+          injection_annotation: "datavault"
         )
 
         natural_index =
-          @constellation.Index(:new, composite: pit_composite, is_unique: true,
-            presence_constraint: nil, composite_as_natural_index: pit_composite #, composite_as_primary_index: pit_composite
-            )
+          @constellation.Index(
+            :new, composite: pit_composite, is_unique: true,
+            composite_as_natural_index: pit_composite #, composite_as_primary_index: pit_composite
+          )
         @constellation.IndexField(access_path: natural_index, ordinal: 0, component: pit_hub_field)
         @constellation.IndexField(access_path: natural_index, ordinal: 1, component: date_field)
 
@@ -357,8 +371,7 @@ module ActiveFacts
         fk = @constellation.ForeignKey(
             :new,
             source_composite: pit_composite,
-            composite: hub_composite,
-            absorption: nil           # REVISIT: This is a ForeignKey without its mandatory Absorption. That's gonna hurt
+            composite: hub_composite
           )
         @constellation.ForeignKeyField(foreign_key: fk, ordinal: 0, component: pit_hub_field)
         # This should be filled in by complete_foreign_keys, but there is no Absorption
@@ -370,14 +383,15 @@ module ActiveFacts
 
         sat_composites.each do |sat_composite|
           sat_name = sat_composite.mapping.name
-          sat_hash_name = "#{sat_name}#{@option_id}"
+          sat_hash_name = patterned_name(@option_id, sat_name)
 
           src_hash_field = hub_hash_field.fork_to_new_parent(pit_composite.mapping)
           src_hash_field.name = sat_hash_name
           src_load_field = @constellation.ValidFrom(:new,
             parent: pit_composite.mapping,
-            name: "#{sat_name} Load"+datestamp_type_name,
-            object_type: datestamp_type
+            name: "#{sat_name} Load "+datestamp_type_name,
+            object_type: datestamp_type,
+            injection_annotation: "datavault"
           )
 
           sat_index_fields = sat_composite.primary_index.all_index_field.to_a
@@ -388,8 +402,7 @@ module ActiveFacts
           fk = @constellation.ForeignKey(
               :new,
               source_composite: pit_composite,
-              composite: sat_composite,
-              absorption: nil           # REVISIT: This is a ForeignKey without its mandatory Absorption. That's gonna hurt
+              composite: sat_composite
             )
           @constellation.ForeignKeyField(foreign_key: fk, ordinal: 0, component: src_hash_field)
           @constellation.IndexField(access_path: fk, ordinal: 0, component: sat_hash_field)
@@ -408,19 +421,20 @@ module ActiveFacts
         end
       end
 
-      def prefer_natural_key building_natural_key, source_composite, target_composite
-        return false if building_natural_key && (@link_composites.include?(source_composite) || @bdv_link_composites.include?(source_composite))
-        building_natural_key && @hub_composites.include?(target_composite)
+      def preferred_fk_type building_natural_key, source_composite, target_composite
+        return :hash if @option_fk == :hash
+        return :primary if building_natural_key && (@link_composites+@bdv_link_composites).include?(source_composite)
+        building_natural_key && @hub_composites.include?(target_composite) ? :natural : :primary
       end
 
-      # For each member of this composite, decide whether to devolve it to a satellite
+      # For each member of this composite, decide whether to split it to a satellite
       # or to a new link. If it goes to a link that's still part of this natural key,
       # we need to leave that key intact, but remove the foreign key it entails.
       #
       # New links and satellites get new fields for the load date-time and a
       # references to the surrogate(s) on the hub or link, and add an index over
       # those two fields.
-      def devolve composite, devolve_links = true
+      def split_satellites_from composite, split_off_links = true
         trace :datavault?, "Devolving non-identifying fields for #{composite.inspect}" do
           # Find the members of this mapping that contain identifying leaves:
           pi = composite.primary_index
@@ -433,20 +447,23 @@ module ActiveFacts
 
           satellites = {}
           is_link = @link_composites.include?(composite) || @links_as_hubs.include?(composite)
-          composite.mapping.all_member.to_a.each do |member|
+          member_snapshot = composite.mapping.all_member.to_a
+          version_field = inject_audit_fields(composite)
+          absorb_nested composite.mapping, version_field, {} if MM::Absorption === version_field
+          member_snapshot.each do |member|
 
             # Any member that is the absorption of a foreign key to a hub or link
             # (which is all, since we removed FKs to reference tables)
             # must be converted to a Mapping for a new Entity Type that notionally
             # objectifies the absorbed fact type. This Mapping is a new link composite.
-            if devolve_links && member.is_a?(MM::Absorption) && member.foreign_key
+            if split_off_links && member.is_a?(MM::Absorption) && member.foreign_key
               next if is_link
-              devolve_absorption_to_link member, identifiers.include?(member)
+              split_off_absorption_to_link member, identifiers.include?(member)
               next
             end
 
             # If this member is in the natural or surrogate key, leave it there
-            # REVISIT: But if it is an FK to another hub, devolve it to a link as well.
+            # REVISIT: But if it is an FK to another hub, split it to a link as well.
             next if identifiers.include?(member)
 
             # We may absorb a subtype that has no contents. There's no point moving these to a satellite.
@@ -455,13 +472,14 @@ module ActiveFacts
             satellite_name, is_computed = *name_satellite(member)
             if !(satellite = satellites[satellite_name])
               satellite = satellites[satellite_name] = create_satellite(satellite_name, composite)
+              identify_satellite composite, satellite
               satellite.composite_group = (is_computed ? 'bdv' : 'rdv')
               if member.is_a?(MM::Absorption) && check_pit(member)
                 @pit_satellite[member] = satellite
               end
             end
 
-            devolve_member_to_satellite satellite, member
+            split_off_member_to_satellite satellite, member
           end
           composite.mapping.re_rank
 
@@ -470,49 +488,41 @@ module ActiveFacts
             composite.all_foreign_key_as_source_composite.to_a.each(&:retract)
           end
 
-          # Add the audit and identity fields for the satellite:
+          # Add the audit and identity fields for the satellites:
           satellites.values.each do |satellite|
-            audit_satellite composite, satellite
+            remove_satellite_validations satellite
           end
         end
       end
 
       # Add the audit and foreign key fields to a satellite for this composite
-      def audit_satellite composite, satellite
+      def identify_satellite composite, satellite
         trace :datavault, "Adding parent key and load time to satellite #{satellite.mapping.name.inspect}" do
-
-          # Add a Surrogate foreign Key to the parent composite
-          fk_target = composite.primary_index.all_index_field.single
-          fk_field = fk_target.component.fork_to_new_parent satellite.mapping
-
-          # Add a load DateTime value and record source
-          date_field = inject_datetime_recordsource(satellite.mapping)
-
-          # Add a primary and natural key:
+          # Add a primary (which is also natural) key:
           natural_index =
             @constellation.Index(:new, composite: satellite, is_unique: true,
-              presence_constraint: nil, composite_as_natural_index: satellite, composite_as_primary_index: satellite)
-          @constellation.IndexField(access_path: natural_index, ordinal: 0, component: fk_field)
-          @constellation.IndexField(access_path: natural_index, ordinal: 1, component: date_field)
+              # composite_as_natural_index: satellite,  # Must not be natural for the absorption to work correctly
+              composite_as_primary_index: satellite)
 
-          # REVISIT: re-ranking members without a preferred_identifier does not rank the PK fields in order.
+          # Absorb and index a foreign key to the hub or link. We'll add the version_field to the index.
+          # REVISIT: The name here should be the renamed version of the parent's name AFTER it's been adjusted
+          object_type = composite.mapping.object_type
+          member = @constellation.Mapping(guid: :new, parent: satellite.mapping, name: composite.mapping.name, object_type: object_type)
+          paths = {object_type.preferred_identifier => natural_index}
+          absorb_nested satellite.mapping, member, paths
+          # Satellites don't really have a natural key, but never mind...
+          satellite.natural_index = satellite.primary_index
+
+          # Add the audit and time-versioning fields
+          version_field =
+            if @option_audit == 'batch'
+              inject_audit_fields satellite, composite
+            else
+              inject_audit_fields satellite
+            end
+          @constellation.IndexField(access_path: natural_index, ordinal: natural_index.all_index_field.size, component: version_field)
           satellite.mapping.re_rank
 
-          # Add a foreign key to the hub
-          fk = @constellation.ForeignKey(
-              :new,
-              source_composite: satellite,
-              composite: composite,
-              absorption: nil           # REVISIT: This is a ForeignKey without its mandatory Absorption. That's gonna hurt
-            )
-          @constellation.ForeignKeyField(foreign_key: fk, ordinal: 0, component: fk_field)
-          # This should be filled in by complete_foreign_keys, but there is no Absorption
-          @constellation.IndexField(access_path: fk, ordinal: 0, component: fk_target.component)
-
-          satellite.classify_constraints
-          satellite.all_local_constraint.map(&:local_constraint).each(&:retract)
-          leaf_constraints = satellite.mapping.all_leaf.flat_map(&:all_leaf_constraint).map(&:leaf_constraint).each(&:retract)
-
           if satellite.composite_group == 'bdv'
             @bdv_sat_composites << satellite
           else
@@ -521,6 +531,12 @@ module ActiveFacts
         end
       end
 
+      def remove_satellite_validations satellite
+        satellite.classify_constraints
+        satellite.all_local_constraint.map(&:local_constraint).each(&:retract)
+        leaf_constraints = satellite.mapping.all_leaf.flat_map(&:all_leaf_constraint).map(&:leaf_constraint).each(&:retract)
+      end
+
       # Decide what to call a new satellite that will adopt this component
       def satellite_base_name_and_type component
         computed_name = nil
@@ -539,7 +555,7 @@ module ActiveFacts
 
       def name_satellite component
         name, is_computed = *satellite_base_name_and_type(component)
-        [apply_name(@option_sat_name, name), is_computed != nil]
+        [patterned_name(@option_sat_name, name), is_computed != nil]
       end
 
       # Create a new satellite for the same object_type as this composite
@@ -568,7 +584,7 @@ module ActiveFacts
       end
 
       # Move this member from its current parent to the satellite
-      def devolve_member_to_satellite satellite, member
+      def split_off_member_to_satellite satellite, member
         remove_indices member
 
         member.parent = satellite.mapping
@@ -578,7 +594,7 @@ module ActiveFacts
 
       # This absorption reflects a time-varying fact type that involves another Hub, which becomes a new link.
       # REVISIT: "make_copy" says that the original field must remain, because it's in its parent's natural key.
-      def devolve_absorption_to_link absorption, make_copy
+      def split_off_absorption_to_link absorption, make_copy
         trace :datavault, "Promote #{absorption.inspect} to a new Link" do
 
           # REVISIT: Here we need a new objectified fact type with the same two players and the same readings,
@@ -614,8 +630,13 @@ module ActiveFacts
             if absorption.foreign_key
               trace :datavault, "Setting new source composite for #{absorption.foreign_key.inspect}"
               absorption.foreign_key.source_composite = link
-              debugger unless absorption.foreign_key.all_foreign_key_field.single
-              fk2_component = absorption.foreign_key.all_foreign_key_field.single.component
+              if absorption.foreign_key.all_foreign_key_field.single
+                fk2_component = absorption.foreign_key.all_foreign_key_field.single.component
+              else
+                p absorption.foreign_key
+                debugger
+                absorption.foreign_key.retract
+              end
             end
           end
 
@@ -642,8 +663,7 @@ module ActiveFacts
 
           # Add a natural key:
           natural_index =
-            @constellation.Index(:new, composite: link, is_unique: true,
-              presence_constraint: nil, composite_as_natural_index: link)
+            @constellation.Index(:new, composite: link, is_unique: true, composite_as_natural_index: link)
           @constellation.IndexField(access_path: natural_index, ordinal: 0, component: fk1_component)
           @constellation.IndexField(access_path: natural_index, ordinal: 1, component: fk2_component)
 
@@ -651,8 +671,7 @@ module ActiveFacts
           fk1 = @constellation.ForeignKey(
               :new,
               source_composite: link,
-              composite: link_from,
-              absorption: nil       # REVISIT: This is a ForeignKey without its mandatory Absorption. That's gonna hurt
+              composite: link_from
             )
           @constellation.ForeignKeyField(foreign_key: fk1, ordinal: 0, component: fk1_component)
           # REVISIT: This should be filled in by complete_foreign_keys, but it has no Absorption
@@ -662,67 +681,43 @@ module ActiveFacts
             fk2 = @constellation.ForeignKey(
                 :new,
                 source_composite: link,
-                composite: link_to,
-                absorption: nil       # REVISIT: This is a ForeignKey without its mandatory Absorption. That's gonna hurt
+                composite: link_to
               )
             @constellation.ForeignKeyField(foreign_key: fk2, ordinal: 0, component: fk2_component)
-            # REVISIT: This should be filled in by complete_foreign_keys, but it has no Absorption
+            # This can't be filled in by complete_foreign_keys because it has no Absorption
             @constellation.IndexField(access_path: fk2, ordinal: 0, component: fk2_target.component)
             absorption.foreign_key.retract
           end
+          inject_audit_fields link, link_from
 
-=begin
-          issues = 0
-          link.validate do |object, problem|
-            $stderr.puts "#{object.inspect}: #{problem}"
-            issues += 1
-          end
-          debugger if issues > 0
-=end
-
-
-          # # Add a load DateTime value
-          # date_field = add_datetime_recordsource(mapping)
-
-          #link.mapping.re_rank
-
-          # devolve link, false
+          # split_satellites_from link, false
           @link_composites << link
         end
       end
 
-      def apply_name pattern, name
-        pattern.sub(/\+/, name)
-      end
-
       def apply_composite_name_pattern
         @reference_composites.each do |composite|
-          composite.mapping.name = apply_name(@option_ref_name, composite.mapping.name)
+          composite.mapping.name = patterned_name(@option_ref_name, composite.mapping.name)
         end
         @hub_composites.each do |composite|
-          composite.mapping.name = apply_name(@option_hub_name, composite.mapping.name)
+          composite.mapping.name = patterned_name(@option_hub_name, composite.mapping.name)
         end
         @link_composites.each do |composite|
-          composite.mapping.name = apply_name(@option_link_name, composite.mapping.name)
+          composite.mapping.name = patterned_name(@option_link_name, composite.mapping.name)
         end
         @bdv_link_composites.each do |composite|
-          composite.mapping.name = apply_name(@option_link_name, composite.mapping.name)
+          composite.mapping.name = patterned_name(@option_link_name, composite.mapping.name)
         end
         @pit_composites.each do |composite|
-          composite.mapping.name = apply_name(@option_pit_name, composite.mapping.name)
+          composite.mapping.name = patterned_name(@option_pit_name, composite.mapping.name)
         end
         @bridge_composites.each do |composite|
-          composite.mapping.name = apply_name(@option_bridge_name, composite.mapping.name)
+          composite.mapping.name = patterned_name(@option_bridge_name, composite.mapping.name)
         end
       end
 
-      def inject_all_datetime_recordsource
-        @link_composites.each do |composite|
-          inject_datetime_recordsource(composite.mapping)
-        end
-        @hub_composites.each do |composite|
-          inject_datetime_recordsource(composite.mapping)
-        end
+      def inject_loadbatch_relationships
+        # We can't do it the way our trait does, we treat hub+links, satellites, and fact links all differently
       end
 
     end