activefacts-metamodel 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e18edf07c9d30ebe02c45d63b87d1dabc328bcc0
-  data.tar.gz: 775315e7031db7f4b6f30cdf0efbac0cef5e2547
+  metadata.gz: 191d182dcc1294a8a95c45837cb280eb7c5f6aa5
+  data.tar.gz: dc363ab895323a22cdecc5f6e475a5ca5e833346
 SHA512:
-  metadata.gz: 37f78ca38e9bfa027e90114db134f23b022ae0bb6d8b45f28460cb63ce4d728a54df61f9d0fe104ad55a5b80a8b8c776fd4dd70b24e863144c55f3911d0c519c
-  data.tar.gz: 1efd187a64997af03320b3efb48e068f4ea7ac037bffcf5765e92eded11b88ff1ba136fd196cd6cdf78d0a89b382f6a89485189d2c24e3198a6f2d8a70f9d341
+  metadata.gz: 620e4357c3c17757a3e62267350aaa7d8270176dd07ef32ef1a618ab9cbbf35c82f1ad251fc133e1e848351bf88ed44a608ff47fe351d522fe2f8645d9939246
+  data.tar.gz: 3f2721be2e27a9ec39b00054c83176add5122f18814b9ef5c6a6c29d00288ba80298043a90b60506bb847c111d45c9db58b474685aa8570e199bc95abfaa69dc

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
-  $stdout.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-metamodel"
+  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-metamodel"
   gem 'activefacts-api', path: '/Users/cjh/work/activefacts/api'
   # gem 'activefacts-api', git: 'git://github.com/cjheath/activefacts-api.git'
 end

data/Rakefile

@@ -6,6 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
+desc "Bump gem version patch number"
 task :bump do
   path = File.expand_path('../lib/activefacts/metamodel/version.rb', __FILE__)
   lines = File.open(path) do |fp| fp.readlines; end
@@ -21,3 +22,25 @@ task :bump do
     )
   end
 end
+
+desc "Generate new CQL from the ORM file"
+task :cql do
+  system "afgen --cql orm/Metamodel.orm > Metamodel.cql"
+  system "afgen --cql cql/Metamodel.cql 2>/dev/null | diff -ub - Metamodel.cql | tee Metamodel.cql.diffs"
+end
+
+desc "Generate new Ruby from the ORM file"
+task :ruby do
+  system %q{
+    afgen --ruby cql/Metamodel.cql 2>/dev/null |
+      sed '2a\
+module ActiveFacts
+	
+	3s/:://
+	3,$s/^/  /
+	$a\
+end
+      ' > metamodel.rb
+  }
+  system "diff -ub lib/activefacts/metamodel/metamodel.rb metamodel.rb"
+end

data/activefacts-metamodel.gemspec

@@ -24,5 +24,6 @@ This gem provides the core representations for the Fact Modeling tools of Active
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency "activefacts-api", ">= 1.8", "~> 1.8.4"
+  spec.add_runtime_dependency "activefacts-api", ">= 1.8", "~> 1.8.5"
+  spec.add_development_dependency "activefacts", "~> 1.8", "~> 1.8.0"
 end

data/cql/Metamodel.cql

@@ -22,6 +22,7 @@ Implication Rule Name is written as String;
 Length is written as Unsigned Integer(32);
 Literal is written as String;
 Name is written as String(64);
+Nesting Mode is written as String restricted to {'Array', 'Bag', 'Map', 'Repetition'};
 Numerator is written as Decimal;
 Offset is written as Decimal;
 Ordinal is written as Unsigned Integer(16);
@@ -57,6 +58,7 @@ Component is identified by Guid where
 	Component has one Guid,
 	Guid is of at most one Component;
 Component projects at most one Name;
+Component has at most one Ordinal rank;
 
 Composition is identified by Guid where
 	Composition has one Guid,
@@ -311,6 +313,7 @@ Fact Type Shape is for one Fact Type,
 Fact Type Shape has at most one Rotation Setting;
 
 Injection is a kind of Mapping;
+ValueField is a kind of Injection;
 
 Mirror Role is a kind of Role;
 Mirror Role is for at most one Role (as Base Role),
@@ -323,6 +326,11 @@ Nesting is where
 	Absorption is nested under index-Role in Ordinal position,
 	Absorption in Ordinal position is nested under one Role,
 	Role keys nesting of Absorption at Ordinal priority;
+Absorption uses at most one Nesting Mode;
+Nesting has at most one key-Name;
+Absorption is nested under index Role in Ordinal position
+	if and only if
+	that Absorption uses some Nesting Mode;
 
 ORM Diagram is a kind of Diagram;
 Shape is in one ORM Diagram,

data/lib/activefacts/metamodel/extensions.rb

@@ -267,9 +267,7 @@ module ActiveFacts
       end
 
       def is_mandatory
-	# REVISIT: An objectification role is always mandatory
-	# REVISIT: Handle mirror roles
-        return fact_type.implying_role.is_mandatory if fact_type.is_a?(LinkFactType)
+	return true if fact_type.is_a?(LinkFactType) # Handle objectification roles
         all_role_ref.detect{|rr|
           rs = rr.role_sequence
           rs.all_role_ref.size == 1 and
@@ -286,7 +284,8 @@ module ActiveFacts
       # Return true if this role is functional (has only one instance wrt its player)
       # A role in an objectified fact type is deemed to refer to the implicit role of the objectification.
       def is_functional
-	# REVISIT: Handle mirror and objectification roles
+	return true if fact_type.is_a?(LinkFactType) # Handle objectification roles
+
         fact_type.entity_type or
         fact_type.all_role.size != 2 or
         uniqueness_constraint
@@ -305,7 +304,8 @@ module ActiveFacts
 
       # Is there are internal uniqueness constraint on this role only?
       def is_unique
-	# REVISIT: Handle objectification roles
+	return true if fact_type.is_a?(LinkFactType) # Handle objectification roles
+
 	uniqueness_constraint ? true : false
       end
 
@@ -600,6 +600,10 @@ module ActiveFacts
         end
       end
 
+      def rank_in_preferred_identifier(role)
+	preferred_identifier.role_sequence.all_role_ref_in_order.map(&:role).index(role)
+      end
+
       # An array of all direct subtypes:
       def subtypes
         # REVISIT: There's no sorting here. Should there be?
@@ -1120,15 +1124,15 @@ module ActiveFacts
 
     class MirrorRole
       def is_mandatory
-	true  # An objectified fact type must have a player for each role
+	base_role.is_mandatory 
       end
 
       def is_unique
-	true  # A mirror role exists is played exactly once for each objectification
+	base_role.is_unique
       end
 
       def is_functional
-	true
+	base_role.is_functional
       end
 
       def uniqueness_constraint
@@ -1343,5 +1347,180 @@ module ActiveFacts
       end
     end
 
+    class Mapping
+      def inspect
+	"#{self.class.basename} (#{rank_kind}) of #{object_type.name}"
+      end
+
+      def show_trace
+	trace :composition, "#{ordinal ? "#{ordinal}: " : ''}#{inspect} #{name ? " (as #{name})" : ''}" do
+	  yield if block_given?
+	  all_member.sort_by{|member| [member.ordinal, member.name]}.each do |member|
+	    member.show_trace
+	  end
+	end
+      end
+    end
+
+    class Nesting
+      def show_trace
+	# The index role has a counterpart played by the parent object in the enclosing Absorption
+	reading = index_role.fact_type.default_reading
+	trace :composition, "#{ordinal}: Nesting under #{index_role.object_type.name}#{key_name ? " (as #{key_name})" : ''} in #{reading.inspect}}"
+      end
+    end
+
+    class Absorption
+      def inspect
+	"#{super} in #{parent_role.fact_type.reading_preferably_starting_with_role(parent_role).expand.inspect}"
+      end
+
+      def show_trace
+	super() do
+	  if nesting_mode || all_nesting.size > 0
+	    trace :composition, "Nested using #{nesting_mode || 'unspecified'} mode" do
+	      all_nesting.sort_by(&:ordinal).each(&:show_trace)
+	    end
+	  end
+	end
+      end
+
+      def is_type_inheritance
+	child_role.fact_type.is_a?(TypeInheritance) && child_role.fact_type
+      end
+
+      def is_supertype_absorption
+	is_type_inheritance && child_role.fact_type.supertype == object_type
+      end
+
+      def is_subtype_absorption
+	is_type_inheritance && parent_role.fact_type.supertype == object_type
+      end
+    end
+
+    class Indicator
+      def inspect
+	"#{self.class.basename} #{role.fact_type.default_reading.inspect}"
+      end
+
+      def show_trace
+	trace :composition, "#{ordinal ? "#{ordinal}: " : ''}#{inspect} #{name ? " (as #{name})" : ''}"
+      end
+    end
+
+    class Discriminator
+      def inspect
+	"#{self.class.basename} #{role.fact_type.default_reading.inspect}"
+      end
+
+      def show_trace
+	trace :composition, "#{ordinal ? "#{ordinal}: " : ''}#{inspect} #{name ? " (as #{name})" : ''}"
+      end
+    end
+
+    class ValueField
+      def inspect
+	"#{self.class.basename} #{object_type.name.inspect}"
+      end
+
+      def show_trace
+	trace :composition, "#{ordinal}: #{inspect} #{name ? " (as #{name})" : ''}"
+      end
+    end
+
+    class Component
+      # The ranking key of a component indicates its importance to its parent:
+      # Ranking assigns a total order, but is computed in groups:
+      RANK_SUPER = 0		# Supertypes, with the identifying supertype first, others alphabetical
+      RANK_IDENT = 1		# Identifying components (absorptions, indicator), in order of the identifier
+      RANK_VALUE = 2		# A ValueField
+      RANK_INJECTION = 3	# Injections, in alphabetical order
+      RANK_DISCRIMINATOR = 4	# Discriminator components, in alphabetical order
+      RANK_FOREIGN = 5		# REVISIT: Foreign key components
+      RANK_INDICATOR = 6	# Indicators in alphabetical order
+      RANK_MANDATORY = 7	# Absorption: unique mandatory
+      RANK_NON_MANDATORY = 8	# Absorption: unique optional
+      RANK_MULTIPLE = 9		# Absorption: manifold
+      RANK_SUBTYPE = 10		# Subtypes in alphabetical order
+      RANK_SCOPING = 11		# Scoping in alphabetical order
+
+      def rank_key
+	parent_et = parent &&
+	  parent.object_type.is_a?(EntityType) &&
+	  parent.object_type
+
+	case self
+	when Indicator
+	  if parent_et && (position = parent_et.rank_in_preferred_identifier(role))
+	    [RANK_IDENT, position]     # An identifying unary
+	  else
+	    [RANK_INDICATOR, name || role.role_name || role.fact_type.default_reading]	      # A non-identifying unary
+	  end
+
+	when Discriminator
+	  [RANK_DISCRIMINATOR, name || object_type.name]
+
+	when ValueField
+	  [RANK_IDENT]
+
+	when Injection
+	  [RANK_INJECTION, name || object_type.name]	      # REVISIT: A different sub-key for ranking may be needed
+
+	when Absorption
+	  if is_type_inheritance
+	    # We are traversing a type inheritance fact type. Is this object_type the subtype or supertype?
+	    if is_supertype_absorption
+	      # What's the rank of this supertype?
+	      tis = parent_role.object_type.all_type_inheritance_as_subtype.sort_by{|ti| ti.provides_identification ? '' : ti.supertype.name }
+	      [RANK_SUPER, child_role.fact_type.provides_identification ? 0 : 1+tis.index(parent_role.fact_type)]
+	    else
+	      # What's the rank of this subtype?
+	      tis = parent_role.object_type.all_type_inheritance_as_supertype.sort_by{|ti| ti.subtype.name }
+	      [RANK_SUBTYPE, tis.index(parent_role.fact_type)]
+	    end
+	  elsif parent_et && (position = parent_et.rank_in_preferred_identifier(child_role))
+	    [RANK_IDENT, position]
+	  else
+	    if parent_role.is_unique
+	      [parent_role.is_mandatory ? RANK_MANDATORY : RANK_NON_MANDATORY, name || child_role.role_name || object_type.name]
+	    else
+	      [RANK_MULTIPLE, name || child_role.role_name || object_type.name]
+	    end
+	  end
+
+	when Scoping
+	  [RANK_SCOPING, name || object_type.name]
+
+	else
+	  raise "unexpected #{self.class.basename} in Component#rank_key"
+	end
+      end
+
+      def rank_kind
+	return "composite" if self.class == Mapping
+	case rank_key[0]
+	when RANK_SUPER; "supertype"
+	when RANK_IDENT; "existential"
+	when RANK_VALUE; "self-value"
+	when RANK_INJECTION; "injection"
+	when RANK_DISCRIMINATOR; "discriminator"
+	when RANK_FOREIGN; "foreignkey"
+	when RANK_INDICATOR; "indicator"
+	when RANK_MANDATORY; "mandatory"
+	when RANK_NON_MANDATORY; "optional"
+	when RANK_MULTIPLE; "multiple"
+	when RANK_SUBTYPE; "subtype"
+	when RANK_SCOPING; "scoping"
+	end
+      end
+
+      def inspect
+	"#{self.class.basename}"
+      end
+
+      def show_trace
+	trace :composition, "#{ordinal ? "#{ordinal}: " : ''}#{inspect}#{name ? " (as #{name})" : ''}"
+      end
+    end
   end
 end

data/lib/activefacts/metamodel/metamodel.rb

@@ -2,68 +2,68 @@ require 'activefacts/api'
 
 module ActiveFacts
   module Metamodel
-
+  
     class Adjective < String
       value_type :length => 64
     end
-
+  
     class AgentName < String
       value_type 
       one_to_one :agent                           # See Agent.agent_name
     end
-
+  
     class AggregateCode < String
       value_type :length => 32
       one_to_one :aggregate                       # See Aggregate.aggregate_code
     end
-
+  
     class Annotation < String
       value_type 
     end
-
+  
     class Assimilation < String
       value_type 
       restrict 'absorbed', 'partitioned', 'separate'
     end
-
+  
     class ContextNoteKind < String
       value_type 
       restrict 'as_opposed_to', 'because', 'so_that', 'to_avoid'
     end
-
+  
     class Date < ::Date
       value_type 
     end
-
+  
     class Denominator < UnsignedInteger
       value_type :length => 32
     end
-
+  
     class Discussion < String
       value_type 
     end
-
+  
     class DisplayRoleNamesSetting < String
       value_type 
       restrict 'false', 'true'
     end
-
+  
     class EnforcementCode < String
       value_type :length => 16
     end
-
+  
     class EphemeraURL < String
       value_type 
     end
-
+  
     class Exponent < SignedInteger
       value_type :length => 16
     end
-
+  
     class Frequency < UnsignedInteger
       value_type :length => 32
     end
-
+  
     class Guid < ::Guid
       value_type 
       one_to_one :alternative_set                 # See AlternativeSet.guid
@@ -74,20 +74,20 @@ module ActiveFacts
       one_to_one :shape                           # See Shape.guid
       one_to_one :step                            # See Step.guid
     end
-
+  
     class ImplicationRuleName < String
       value_type 
       one_to_one :implication_rule                # See ImplicationRule.implication_rule_name
     end
-
+  
     class Length < UnsignedInteger
       value_type :length => 32
     end
-
+  
     class Literal < String
       value_type 
     end
-
+  
     class Name < String
       value_type :length => 64
       one_to_one :composition                     # See Composition.name
@@ -96,118 +96,124 @@ module ActiveFacts
       one_to_one :unit                            # See Unit.name
       one_to_one :vocabulary                      # See Vocabulary.name
     end
-
+  
+    class NestingMode < String
+      value_type 
+      restrict 'Array', 'Bag', 'Map', 'Repetition'
+    end
+  
     class Numerator < Decimal
       value_type 
     end
-
+  
     class Offset < Decimal
       value_type 
     end
-
+  
     class Ordinal < UnsignedInteger
       value_type :length => 16
     end
-
+  
     class Pronoun < String
       value_type :length => 20
       restrict 'feminine', 'masculine', 'neuter', 'personal'
     end
-
+  
     class RegularExpression < String
       value_type 
     end
-
+  
     class RingType < String
       value_type 
     end
-
+  
     class RotationSetting < String
       value_type 
       restrict 'left', 'right'
     end
-
+  
     class Scale < UnsignedInteger
       value_type :length => 32
     end
-
+  
     class Subscript < UnsignedInteger
       value_type :length => 16
     end
-
+  
     class Text < String
       value_type :length => 256
     end
-
+  
     class TransactionPhase < String
       value_type 
       restrict 'assert', 'commit'
     end
-
+  
     class X < SignedInteger
       value_type :length => 32
     end
-
+  
     class Y < SignedInteger
       value_type :length => 32
     end
-
+  
     class Agent
       identified_by :agent_name
       one_to_one :agent_name, :mandatory => true  # See AgentName.agent
     end
-
+  
     class Aggregate
       identified_by :aggregate_code
       one_to_one :aggregate_code, :mandatory => true  # See AggregateCode.aggregate
     end
-
+  
     class AlternativeSet
       identified_by :guid
       one_to_one :guid, :mandatory => true        # See Guid.alternative_set
       maybe :members_are_exclusive
     end
-
+  
     class Coefficient
       identified_by :numerator, :denominator, :is_precise
       has_one :denominator, :mandatory => true    # See Denominator.all_coefficient
       maybe :is_precise
       has_one :numerator, :mandatory => true      # See Numerator.all_coefficient
     end
-
+  
     class Component
       identified_by :guid
       one_to_one :guid, :mandatory => true        # See Guid.component
       has_one :name                               # See Name.all_component
+      has_one :ordinal                            # See Ordinal.all_component
       has_one :parent, :class => "Mapping", :counterpart => :member  # See Mapping.all_member
     end
-
+  
     class Composition
       identified_by :guid
       one_to_one :guid, :mandatory => true        # See Guid.composition
       one_to_one :name, :mandatory => true        # See Name.composition
     end
-
+  
     class Concept
       identified_by :guid
       one_to_one :guid, :mandatory => true        # See Guid.concept
       has_one :implication_rule                   # See ImplicationRule.all_concept
       has_one :topic                              # See Topic.all_concept
     end
-
+  
     class ConceptAnnotation
       identified_by :concept, :mapping_annotation
       has_one :concept, :mandatory => true        # See Concept.all_concept_annotation
       has_one :mapping_annotation, :class => Annotation, :mandatory => true  # See Annotation.all_concept_annotation_as_mapping_annotation
     end
-
+  
     class Constraint
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.constraint
       has_one :name                               # See Name.all_constraint
       has_one :vocabulary                         # See Vocabulary.all_constraint
     end
-
+  
     class ContextNote
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.context_note
@@ -215,38 +221,38 @@ module ActiveFacts
       has_one :discussion, :mandatory => true     # See Discussion.all_context_note
       has_one :relevant_concept, :class => Concept  # See Concept.all_context_note_as_relevant_concept
     end
-
+  
     class Discriminator < Component
     end
-
+  
     class Enforcement
       identified_by :constraint
       has_one :agent                              # See Agent.all_enforcement
       one_to_one :constraint, :mandatory => true  # See Constraint.enforcement
       has_one :enforcement_code, :mandatory => true  # See EnforcementCode.all_enforcement
     end
-
+  
     class Fact
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.fact
       has_one :fact_type, :mandatory => true      # See FactType.all_fact
       has_one :population, :mandatory => true     # See Population.all_fact
     end
-
+  
     class FactType
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.fact_type
     end
-
+  
     class ImplicationRule
       identified_by :implication_rule_name
       one_to_one :implication_rule_name, :mandatory => true  # See ImplicationRuleName.implication_rule
     end
-
+  
     class Indicator < Component
       has_one :role, :mandatory => true           # See Role.all_indicator
     end
-
+  
     class Instance
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.instance
@@ -255,20 +261,20 @@ module ActiveFacts
       has_one :population, :mandatory => true     # See Population.all_instance
       has_one :value                              # See Value.all_instance
     end
-
+  
     class LinkFactType < FactType
     end
-
+  
     class Location
       identified_by :x, :y
       has_one :x, :mandatory => true              # See X.all_location
       has_one :y, :mandatory => true              # See Y.all_location
     end
-
+  
     class Mapping < Component
       has_one :object_type, :mandatory => true    # See ObjectType.all_mapping
     end
-
+  
     class PresenceConstraint < Constraint
       maybe :is_mandatory
       maybe :is_preferred_identifier
@@ -276,12 +282,12 @@ module ActiveFacts
       has_one :min_frequency, :class => Frequency  # See Frequency.all_presence_constraint_as_min_frequency
       has_one :role_sequence, :mandatory => true  # See RoleSequence.all_presence_constraint
     end
-
+  
     class Query
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.query
     end
-
+  
     class Reading
       identified_by :fact_type, :ordinal
       has_one :fact_type, :mandatory => true      # See FactType.all_reading
@@ -290,13 +296,13 @@ module ActiveFacts
       has_one :role_sequence, :mandatory => true  # See RoleSequence.all_reading
       has_one :text, :mandatory => true           # See Text.all_reading
     end
-
+  
     class RingConstraint < Constraint
       has_one :other_role, :class => "Role"       # See Role.all_ring_constraint_as_other_role
       has_one :ring_type, :mandatory => true      # See RingType.all_ring_constraint
       has_one :role                               # See Role.all_ring_constraint
     end
-
+  
     class Role
       identified_by :fact_type, :ordinal
       one_to_one :concept, :mandatory => true     # See Concept.role
@@ -306,13 +312,13 @@ module ActiveFacts
       has_one :ordinal, :mandatory => true        # See Ordinal.all_role
       has_one :role_name, :class => Name          # See Name.all_role_as_role_name
     end
-
+  
     class RoleSequence
       identified_by :guid
       one_to_one :guid, :mandatory => true        # See Guid.role_sequence
       maybe :has_unused_dependency_to_force_table_in_norma
     end
-
+  
     class RoleValue
       identified_by :fact, :role
       has_one :fact, :mandatory => true           # See Fact.all_role_value
@@ -320,13 +326,13 @@ module ActiveFacts
       has_one :population, :mandatory => true     # See Population.all_role_value
       has_one :role, :mandatory => true           # See Role.all_role_value
     end
-
+  
     class Scoping < Mapping
     end
-
+  
     class SetConstraint < Constraint
     end
-
+  
     class Shape
       identified_by :guid
       one_to_one :guid, :mandatory => true        # See Guid.shape
@@ -334,7 +340,7 @@ module ActiveFacts
       has_one :location                           # See Location.all_shape
       has_one :orm_diagram, :class => "ORMDiagram", :mandatory => true  # See ORMDiagram.all_shape
     end
-
+  
     class Step
       identified_by :guid
       has_one :alternative_set                    # See AlternativeSet.all_step
@@ -343,17 +349,17 @@ module ActiveFacts
       maybe :is_disallowed
       maybe :is_optional
     end
-
+  
     class SubsetConstraint < SetConstraint
       has_one :subset_role_sequence, :class => RoleSequence, :mandatory => true  # See RoleSequence.all_subset_constraint_as_subset_role_sequence
       has_one :superset_role_sequence, :class => RoleSequence, :mandatory => true  # See RoleSequence.all_subset_constraint_as_superset_role_sequence
     end
-
+  
     class Topic
       identified_by :topic_name
       one_to_one :topic_name, :class => Name, :mandatory => true  # See Name.topic_as_topic_name
     end
-
+  
     class Unit
       identified_by :concept
       has_one :coefficient                        # See Coefficient.all_unit
@@ -365,7 +371,7 @@ module ActiveFacts
       one_to_one :plural_name, :class => Name, :counterpart => :plural_named_unit  # See Name.plural_named_unit
       has_one :vocabulary, :mandatory => true     # See Vocabulary.all_unit
     end
-
+  
     class Value
       identified_by :literal, :is_literal_string, :unit
       maybe :is_literal_string
@@ -373,12 +379,12 @@ module ActiveFacts
       has_one :unit                               # See Unit.all_value
       has_one :value_type, :mandatory => true     # See ValueType.all_value
     end
-
+  
     class ValueConstraint < Constraint
       has_one :regular_expression                 # See RegularExpression.all_value_constraint
       one_to_one :role, :counterpart => :role_value_constraint  # See Role.role_value_constraint
     end
-
+  
     class Variable
       identified_by :query, :ordinal
       has_one :object_type, :mandatory => true    # See ObjectType.all_variable
@@ -390,109 +396,111 @@ module ActiveFacts
       has_one :subscript                          # See Subscript.all_variable
       has_one :value                              # See Value.all_variable
     end
-
+  
     class Vocabulary
       identified_by :name
       one_to_one :name, :mandatory => true        # See Name.vocabulary
     end
-
+  
     class Absorption < Mapping
       one_to_one :absorption, :counterpart => :reverse_absorption  # See Absorption.reverse_absorption
       has_one :child_role, :class => Role, :mandatory => true  # See Role.all_absorption_as_child_role
       maybe :flattens
+      has_one :nesting_mode                       # See NestingMode.all_absorption
       has_one :parent_role, :class => Role, :mandatory => true  # See Role.all_absorption_as_parent_role
       one_to_one :reverse_absorption, :class => Absorption  # See Absorption.absorption_as_reverse_absorption
     end
-
+  
     class Aggregation
       identified_by :aggregate, :aggregated_variable
       has_one :aggregate, :mandatory => true      # See Aggregate.all_aggregation
       has_one :aggregated_variable, :class => Variable, :mandatory => true  # See Variable.all_aggregation_as_aggregated_variable
       has_one :variable, :mandatory => true       # See Variable.all_aggregation
     end
-
+  
     class Agreement
       identified_by :context_note
       one_to_one :context_note, :mandatory => true  # See ContextNote.agreement
       has_one :date                               # See Date.all_agreement
     end
-
+  
     class Bound
       identified_by :value, :is_inclusive
       maybe :is_inclusive
       has_one :value, :mandatory => true          # See Value.all_bound
     end
-
+  
     class Composite
       identified_by :mapping
       has_one :composition, :mandatory => true    # See Composition.all_composite
       one_to_one :mapping, :mandatory => true     # See Mapping.composite
     end
-
+  
     class ConstraintShape < Shape
       has_one :constraint, :mandatory => true     # See Constraint.all_constraint_shape
     end
-
+  
     class ContextAccordingTo
       identified_by :context_note, :agent
       has_one :agent, :mandatory => true          # See Agent.all_context_according_to
       has_one :context_note, :mandatory => true   # See ContextNote.all_context_according_to
       has_one :date                               # See Date.all_context_according_to
     end
-
+  
     class ContextAgreedBy
       identified_by :agreement, :agent
       has_one :agent, :mandatory => true          # See Agent.all_context_agreed_by
       has_one :agreement, :mandatory => true      # See Agreement.all_context_agreed_by
     end
-
+  
     class Derivation
       identified_by :derived_unit, :base_unit
       has_one :base_unit, :class => Unit, :mandatory => true  # See Unit.all_derivation_as_base_unit
       has_one :derived_unit, :class => Unit, :mandatory => true  # See Unit.all_derivation_as_derived_unit
       has_one :exponent                           # See Exponent.all_derivation
     end
-
+  
     class Diagram
       identified_by :vocabulary, :name
       has_one :name, :mandatory => true           # See Name.all_diagram
       has_one :vocabulary, :mandatory => true     # See Vocabulary.all_diagram
     end
-
+  
     class DiscriminatedRole
       identified_by :discriminator, :role
       has_one :discriminator, :mandatory => true  # See Discriminator.all_discriminated_role
       has_one :role, :mandatory => true           # See Role.all_discriminated_role
       has_one :value, :mandatory => true          # See Value.all_discriminated_role
     end
-
+  
     class FactTypeShape < Shape
       has_one :display_role_names_setting         # See DisplayRoleNamesSetting.all_fact_type_shape
       has_one :fact_type, :mandatory => true      # See FactType.all_fact_type_shape
       has_one :rotation_setting                   # See RotationSetting.all_fact_type_shape
     end
-
+  
     class Injection < Mapping
     end
-
+  
     class MirrorRole < Role
       one_to_one :base_role, :class => Role       # See Role.mirror_role_as_base_role
     end
-
+  
     class ModelNoteShape < Shape
       has_one :context_note, :mandatory => true   # See ContextNote.all_model_note_shape
     end
-
+  
     class Nesting
       identified_by :absorption, :ordinal
       has_one :absorption, :mandatory => true     # See Absorption.all_nesting
       has_one :index_role, :class => Role, :mandatory => true  # See Role.all_nesting_as_index_role
       has_one :ordinal, :mandatory => true        # See Ordinal.all_nesting
+      has_one :key_name, :class => Name           # See Name.all_nesting_as_key_name
     end
-
+  
     class ORMDiagram < Diagram
     end
-
+  
     class ObjectType
       identified_by :vocabulary, :name
       one_to_one :concept, :mandatory => true     # See Concept.object_type
@@ -501,16 +509,16 @@ module ActiveFacts
       has_one :pronoun                            # See Pronoun.all_object_type
       has_one :vocabulary, :mandatory => true     # See Vocabulary.all_object_type
     end
-
+  
     class ObjectTypeShape < Shape
       maybe :has_expanded_reference_mode
       has_one :object_type, :mandatory => true    # See ObjectType.all_object_type_shape
     end
-
+  
     class ObjectifiedFactTypeNameShape < Shape
       one_to_one :fact_type_shape, :mandatory => true  # See FactTypeShape.objectified_fact_type_name_shape
     end
-
+  
     class Play
       identified_by :step, :role
       has_one :role, :mandatory => true           # See Role.all_play
@@ -518,34 +526,34 @@ module ActiveFacts
       has_one :variable, :mandatory => true       # See Variable.all_play
       maybe :is_input
     end
-
+  
     class Population
       identified_by :vocabulary, :name
       one_to_one :concept, :mandatory => true     # See Concept.population
       has_one :name, :mandatory => true           # See Name.all_population
       has_one :vocabulary                         # See Vocabulary.all_population
     end
-
+  
     class ReadingShape < Shape
       one_to_one :fact_type_shape, :mandatory => true  # See FactTypeShape.reading_shape
       has_one :reading, :mandatory => true        # See Reading.all_reading_shape
     end
-
+  
     class RingConstraintShape < ConstraintShape
       has_one :fact_type_shape, :mandatory => true  # See FactTypeShape.all_ring_constraint_shape
     end
-
+  
     class RoleDisplay
       identified_by :fact_type_shape, :ordinal
       has_one :fact_type_shape, :mandatory => true  # See FactTypeShape.all_role_display
       has_one :ordinal, :mandatory => true        # See Ordinal.all_role_display
       has_one :role, :mandatory => true           # See Role.all_role_display
     end
-
+  
     class RoleNameShape < Shape
       one_to_one :role_display, :mandatory => true  # See RoleDisplay.role_name_shape
     end
-
+  
     class RoleRef
       identified_by :role_sequence, :ordinal
       has_one :ordinal, :mandatory => true        # See Ordinal.all_role_ref
@@ -555,48 +563,51 @@ module ActiveFacts
       one_to_one :play                            # See Play.role_ref
       has_one :trailing_adjective, :class => Adjective  # See Adjective.all_role_ref_as_trailing_adjective
     end
-
+  
     class SetComparisonConstraint < SetConstraint
     end
-
+  
     class SetComparisonRoles
       identified_by :set_comparison_constraint, :ordinal
       has_one :ordinal, :mandatory => true        # See Ordinal.all_set_comparison_roles
       has_one :role_sequence, :mandatory => true  # See RoleSequence.all_set_comparison_roles
       has_one :set_comparison_constraint, :mandatory => true  # See SetComparisonConstraint.all_set_comparison_roles
     end
-
+  
     class SetEqualityConstraint < SetComparisonConstraint
     end
-
+  
     class SetExclusionConstraint < SetComparisonConstraint
       maybe :is_mandatory
     end
-
+  
     class ValueConstraintShape < ConstraintShape
       has_one :object_type_shape                  # See ObjectTypeShape.all_value_constraint_shape
       one_to_one :role_display                    # See RoleDisplay.value_constraint_shape
     end
-
+  
+    class ValueField < Injection
+    end
+  
     class ValueRange
       identified_by :minimum_bound, :maximum_bound
       has_one :maximum_bound, :class => Bound     # See Bound.all_value_range_as_maximum_bound
       has_one :minimum_bound, :class => Bound     # See Bound.all_value_range_as_minimum_bound
     end
-
+  
     class AllowedRange
       identified_by :value_constraint, :value_range
       has_one :value_constraint, :mandatory => true  # See ValueConstraint.all_allowed_range
       has_one :value_range, :mandatory => true    # See ValueRange.all_allowed_range
     end
-
+  
     class DomainObjectType < ObjectType
     end
-
+  
     class EntityType < DomainObjectType
       one_to_one :fact_type                       # See FactType.entity_type
     end
-
+  
     class TypeInheritance < FactType
       identified_by :subtype, :supertype
       has_one :subtype, :class => EntityType, :mandatory => true  # See EntityType.all_type_inheritance_as_subtype
@@ -604,7 +615,7 @@ module ActiveFacts
       has_one :assimilation                       # See Assimilation.all_type_inheritance
       maybe :provides_identification
     end
-
+  
     class ValueType < DomainObjectType
       has_one :length                             # See Length.all_value_type
       has_one :scale                              # See Scale.all_value_type
@@ -613,20 +624,20 @@ module ActiveFacts
       has_one :unit                               # See Unit.all_value_type
       one_to_one :value_constraint                # See ValueConstraint.value_type
     end
-
+  
     class ValueTypeParameter
       identified_by :value_type, :name
       has_one :name, :mandatory => true           # See Name.all_value_type_parameter
       has_one :value_type, :mandatory => true     # See ValueType.all_value_type_parameter
       has_one :facet_value_type, :class => ValueType, :mandatory => true  # See ValueType.all_value_type_parameter_as_facet_value_type
     end
-
+  
     class ValueTypeParameterRestriction
       identified_by :value_type, :value_type_parameter
       has_one :value_type, :mandatory => true     # See ValueType.all_value_type_parameter_restriction
       has_one :value_type_parameter, :mandatory => true  # See ValueTypeParameter.all_value_type_parameter_restriction
       has_one :value, :mandatory => true          # See Value.all_value_type_parameter_restriction
     end
-
+  
   end
 end