activefacts 0.8.15 → 0.8.16

data/examples/CQL/Metamodel.cql

@@ -6,22 +6,16 @@ vocabulary Metamodel;
 Adjective is written as String(64);
 Agent Name is written as String;
 Assimilation is written as String restricted to {'partitioned', 'separate'};
-Constraint Id is written as Auto Counter;
-Context Note Id is written as Auto Counter;
 Context Note Kind is written as String restricted to {'as_opposed_to', 'because', 'so_that', 'to_avoid'};
 Date is written as Date;
 Denominator is written as Unsigned Integer(32);
 Discussion is written as String;
-Disjunction Id is written as Auto Counter;
 Display Role Names Setting is written as String restricted to {'false', 'true'};
 Enforcement Code is written as String(16);
 Ephemera URL is written as String;
 Exponent is written as Signed Integer(16);
-Fact Id is written as Auto Counter;
-Fact Type Id is written as Auto Counter;
 Frequency is written as Unsigned Integer(32);
-Instance Id is written as Auto Counter;
-Join Id is written as Auto Counter;
+Guid is written as Guid;
 Length is written as Unsigned Integer(32);
 Literal is written as String;
 Name is written as String(64);
@@ -30,14 +24,11 @@ Offset is written as Decimal;
 Ordinal is written as Unsigned Integer(16);
 Pronoun is written as String(20) restricted to {'feminine', 'masculine', 'neuter', 'personal'};
 Ring Type is written as String;
-Role Sequence Id is written as Auto Counter;
 Rotation Setting is written as String restricted to {'left', 'right'};
 Scale is written as Unsigned Integer(32);
-Shape Id is written as Auto Counter;
 Subscript is written as Unsigned Integer(16);
 Text is written as String(256);
 Transaction Timing is written as String restricted to {'assert', 'commit'};
-Unit Id is written as Auto Counter;
 X is written as Signed Integer(32);
 Y is written as Signed Integer(32);
 
@@ -46,25 +37,31 @@ Y is written as Signed Integer(32);
  */
 Agent is identified by its Name;
 
+Alternative Set is identified by Guid where
+	Alternative Set has one Guid,
+	Guid is of at most one Alternative Set;
+
 Coefficient is identified by Numerator and Denominator and Coefficient is precise where
 	Coefficient has one Numerator,
 	Coefficient has one Denominator,
 	Coefficient is precise;
 
-Constraint is identified by its Id;
+Concept is identified by Guid where
+	Concept has one Guid,
+	Guid is of at most one Concept;
+
+Constraint is a kind of Concept [partitioned];
 Name is of Constraint,
 	Constraint is called at most one Name;
 
-Context Note is identified by its Id;
-Constraint has Context Note,
-	Context Note applies to at most one Constraint;
+Context Note is a kind of Concept [partitioned];
+Concept has Context Note,
+	Context Note applies to at most one Concept;
 Context Note has one Context Note Kind,
 	Context Note Kind is of Context Note;
 Context Note has one Discussion,
 	Discussion is for Context Note;
 
-Disjunction is identified by its Id;
-
 Enforcement is identified by Constraint where
 	Constraint requires at most one Enforcement,
 	Enforcement applies to one Constraint;
@@ -72,20 +69,18 @@ Enforcement notifies at most one Agent;
 Enforcement has one Enforcement Code,
 	Enforcement Code is of Enforcement;
 
-Fact is identified by its Id;
+Fact is a kind of Concept [partitioned];
 
-Fact Type is identified by its Id;
+Fact Type is a kind of Concept [partitioned];
 Fact is of one Fact Type;
-Fact Type has Context Note,
-	Context Note applies to at most one Fact Type;
 
 Implicit Fact Type is a kind of Fact Type;
 
-Instance is identified by its Id;
+Instance is a kind of Concept [partitioned];
 Instance objectifies at most one Fact,
 	Fact is objectified as at most one Instance;
 
-Join is identified by its Id;
+Join is a kind of Concept [partitioned];
 
 Join Node is identified by Join and Ordinal where
 	Join includes Join Node,
@@ -116,8 +111,11 @@ Reading has one Text;
 Ring Constraint is a kind of Constraint;
 Ring Constraint is of one Ring Type;
 
-Role is where
-	Fact Type has at least one Ordinal role;
+Role is a kind of Concept identified by Fact Type and Ordinal [partitioned] where
+	Role belongs to one Fact Type,
+	Fact Type contains Role,
+	Role fills one Ordinal,
+	Ordinal applies to Role;
 Implicit Fact Type is implied by one Role (as Implying Role),
 	Implying Role implies at most one Implicit Fact Type;
 Ring Constraint has at most one other-Role,
@@ -128,7 +126,9 @@ Role is of Ring Constraint,
 Role has at most one role-Name,
 	role-Name is name of at least one Role;
 
-Role Sequence is identified by its Id;
+Role Sequence is identified by Guid where
+	Role Sequence has one Guid,
+	Guid is of at most one Role Sequence;
 Presence Constraint covers one Role Sequence;
 Reading is in one Role Sequence,
 	Role Sequence is for Reading;
@@ -143,7 +143,9 @@ Role Value is of one Role;
 
 Set Constraint is a kind of Constraint;
 
-Shape is identified by its Id;
+Shape is identified by Guid where
+	Shape has one Guid,
+	Guid is of at most one Shape;
 Shape is at at most one Position;
 Shape is expanded;
 
@@ -151,7 +153,7 @@ Subset Constraint is a kind of Set Constraint;
 Subset Constraint covers one subset-Role Sequence;
 Subset Constraint covers one superset-Role Sequence;
 
-Unit is identified by its Id;
+Unit is a kind of Concept [partitioned];
 Ephemera URL provides Unit coefficient,
 	Unit uses coefficient from at most one Ephemera URL;
 Name is of at most one Unit,
@@ -230,8 +232,8 @@ Join Role is independent where
 Join Step is identified by input-Join Role and output-Join Role where
 	Join Step has one input-Join Role,
 	Join Step has one output-Join Role;
-Join Step falls under at most one Disjunction,
-	Disjunction covers at least one Join Step;
+Join Step falls under at most one Alternative Set,
+	Alternative Set covers at least one Join Step;
 Join Step traverses one Fact Type,
 	Fact Type directs Join Step;
 Join Step involves incidental-Join Role,
@@ -242,15 +244,12 @@ Join Step is outer;
 Model Note Shape is a kind of Shape;
 Model Note Shape is for one Context Note;
 
-Object Type is identified by Vocabulary and Name where
+Object Type is a kind of Concept identified by Vocabulary and Name [partitioned] where
 	Object Type belongs to one Vocabulary,
-	Vocabulary contains Object Type,
 	Object Type is called one Name;
 Instance is of one Object Type;
 Join Node is for one Object Type,
 	Object Type is referenced in Join Node;
-Object Type has Context Note,
-	Context Note applies to at most one Object Type;
 Object Type uses at most one Pronoun;
 Object Type plays Role,
 	Role is played by one Object Type;
@@ -265,7 +264,7 @@ Objectified Fact Type Name Shape is a kind of Shape identified by Fact Type Shap
 	Objectified Fact Type Name Shape is for one Fact Type Shape,
 	Fact Type Shape has at most one Objectified Fact Type Name Shape;
 
-Population is identified by Vocabulary and Name where
+Population is a kind of Concept identified by Vocabulary and Name [partitioned] where
 	Vocabulary includes Population,
 	Population belongs to at most one Vocabulary,
 	Population has one Name,
@@ -335,7 +334,7 @@ Value Type is of at most one Unit;
 Value Type has at most one Value Constraint,
 	Value Constraint constrains at most one Value Type;
 Value Type has at most one auto-- assigned Transaction Timing;
-Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic],
+Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic, transitive],
 	Supertype is supertype of Value Type;
 
 Allowed Range is where
@@ -366,14 +365,21 @@ Type Inheritance provides identification;
 /*
  * Constraints:
  */
+for each Concept exactly one of these holds:
+	Concept is an Instance,
+	Concept is a Fact,
+	Concept is an Object Type,
+	Concept is a Role,
+	Concept is a Fact Type,
+	Concept is a Constraint,
+	Concept is a Population,
+	Concept is an Unit,
+	Concept is a Join,
+	Concept is a Context Note;
 for each Constraint exactly one of these holds:
 	Constraint is a Presence Constraint,
 	Constraint is a Set Constraint,
 	Constraint is a Ring Constraint;
-for each Context Note exactly one of these holds:
-	Context Note applies to Object Type,
-	Context Note applies to Fact Type,
-	Context Note applies to Constraint;
 either Object Type is an Entity Type or Object Type is a Value Type but not both;
 for each Role Sequence exactly one of these holds:
 	Role Sequence is for Reading,
@@ -404,7 +410,7 @@ Role Value is of Instance that is of Object Type
 	Role Value is of Role that is played by Object Type;
 Role Value fulfils Fact that is of Fact Type
 	if and only if
-	Role Value is of Role (in which Fact Type has Ordinal role);
+	Role Value is of Role that belongs to Fact Type;
 Entity Type is implied by objectification
 	only if Entity Type nests Fact Type;
 Presence Constraint is preferred identifier

data/lib/activefacts/cql.rb

@@ -6,6 +6,7 @@
 #
 require 'rubygems'
 require 'polyglot'
+require 'stringio'
 require 'activefacts/support'
 require 'activefacts/input/cql'
 require 'activefacts/generate/ruby'

data/lib/activefacts/cql/CQLParser.treetop

@@ -70,7 +70,7 @@ module ActiveFacts
         s import S vocabulary_name alias_list ';'
         {
 	  def ast
-	    Compiler::Import.new(id.value, alias_list.value)
+	    Compiler::Import.new(import.input.parser, vocabulary_name.value, alias_list.value)
 	  end
         }
       end

data/lib/activefacts/cql/compiler.rb

@@ -66,6 +66,27 @@ module ActiveFacts
         vocabulary
       end
 
+      def compile_import file, aliases
+        saved_index = @index
+        saved_block = @block
+        old_filename = @filename
+        @filename = file+'.cql'
+
+        File.open(@filename) do |f|
+          ok = parse_all(f.read, nil, &@block)
+        end
+
+      rescue => e
+        ne = StandardError.new("In #{@filename} #{e.message.strip}")
+        ne.set_backtrace(e.backtrace)
+        raise ne
+      ensure
+        @block = saved_block
+        @index = saved_index
+        @filename = old_filename
+        nil
+      end
+
       def compile_definition ast
         ast.compile
       end

data/lib/activefacts/cql/compiler/clause.rb

@@ -523,7 +523,7 @@ module ActiveFacts
           debug :matching, "Making new fact type for #{@phrases.inspect}" do
             @phrases.each do |phrase|
               next unless phrase.respond_to?(:player)
-              phrase.role = vocabulary.constellation.Role(fact_type, fact_type.all_role.size, :object_type => phrase.player)
+              phrase.role = vocabulary.constellation.Role(fact_type, fact_type.all_role.size, :object_type => phrase.player, :guid => :new)
               phrase.role.role_name = phrase.role_name if phrase.role_name && phrase.role_name.is_a?(String)
             end
           end

data/lib/activefacts/cql/compiler/constraint.rb

@@ -28,16 +28,10 @@ module ActiveFacts
               :context_note_kind => @context_kind,
               :discussion => @discussion
             )
-          case target
-          when ActiveFacts::Metamodel::ObjectType
-            context_note.object_type = target
-          when ActiveFacts::Metamodel::Constraint
-            context_note.constraint = target
-          when ActiveFacts::Metamodel::FactType
-            context_note.fact_type = target
-          end
+          context_note.concept = target
           if @agreed_date || @agreed_agents
-            agreement = constellation.Agreement(context_note, :date => @agreed_date)
+            agreement = constellation.Agreement(context_note)
+            agreement.date = @agreed_date if @agreed_date
             @agreed_agents.each do |agent|
               constellation.ContextAgreedBy(agreement, agent)
             end
@@ -426,7 +420,12 @@ module ActiveFacts
 
       class RingConstraint < Constraint
         Types = %w{acyclic intransitive symmetric asymmetric transitive antisymmetric irreflexive reflexive}
-        Pairs = { :intransitive => [:acyclic, :asymmetric, :symmetric], :irreflexive => [:symmetric] }
+        Pairs = {
+          :intransitive => [:acyclic, :asymmetric, :symmetric],
+          :transitive => [:acyclic],
+          :acyclic => [:transitive],
+          :irreflexive => [:symmetric]
+        }
 
         def initialize role_sequence, qualifiers
           super nil, nil
@@ -464,7 +463,7 @@ module ActiveFacts
           # Ensure that the keys in Pairs follow others:
           @rings = @rings.partition{|rc| !Pairs.keys.include?(rc.downcase.to_sym) }.flatten
 
-          if @rings.size > 1 and !Pairs[@rings[-1].to_sym].include?(@rings[0].to_sym)
+          if @rings.size > 1 and !(p = Pairs[@rings[-1].to_sym]) and !p.include?(@rings[0].to_sym)
             raise "incompatible ring constraint types (#{@rings*", "})"
           end
           ring_type = @rings.map{|c| c.capitalize}*""

data/lib/activefacts/cql/compiler/entity_type.rb

@@ -28,7 +28,7 @@ module ActiveFacts
         end
 
         def compile
-          @entity_type = @constellation.EntityType(@vocabulary, @name)
+          @entity_type = @constellation.EntityType(@vocabulary, @name, :guid => :new)
           @entity_type.is_independent = true if (@pragmas.include? 'independent')
 
           # REVISIT: CQL needs a way to indicate whether subtype migration can occur.
@@ -214,7 +214,7 @@ module ActiveFacts
 
         def add_supertype(supertype_name, not_identifying)
           debug :supertype, "Adding supertype #{supertype_name}" do
-            supertype = @constellation.EntityType(@vocabulary, supertype_name)
+            supertype = @constellation.EntityType(@vocabulary, supertype_name, :guid => :new)
 
             # Did we already know about this supertype?
             return if @entity_type.all_type_inheritance_as_subtype.detect{|ti| ti.supertype == supertype}
@@ -222,15 +222,15 @@ module ActiveFacts
             # By default, the first supertype identifies this entity type
             is_identifying_supertype = !not_identifying && @entity_type.all_type_inheritance_as_subtype.size == 0
 
-            inheritance_fact = @constellation.TypeInheritance(@entity_type, supertype, :fact_type_id => :new)
+            inheritance_fact = @constellation.TypeInheritance(@entity_type, supertype, :guid => :new)
 
             assimilations = @pragmas.select { |p| ['absorbed', 'separate', 'partitioned'].include? p}
             raise "Conflicting assimilation pragmas #{assimilations*', '}" if assimilations.size > 1
             inheritance_fact.assimilation = assimilations[0]
 
             # Create a reading:
-            sub_role = @constellation.Role(inheritance_fact, 0, :object_type => @entity_type)
-            super_role = @constellation.Role(inheritance_fact, 1, :object_type => supertype)
+            sub_role = @constellation.Role(inheritance_fact, 0, :object_type => @entity_type, :guid => :new)
+            super_role = @constellation.Role(inheritance_fact, 1, :object_type => supertype, :guid => :new)
 
             rs = @constellation.RoleSequence(:new)
             @constellation.RoleRef(rs, 0, :role => sub_role)
@@ -279,8 +279,8 @@ module ActiveFacts
             # Find or Create an appropriate ValueType called '#{vt_name}', of the supertype '#{mode}'
             unless vt = @constellation.ObjectType[[@vocabulary.identifying_role_values, vt_name]] or
                    vt = @constellation.ObjectType[[@vocabulary.identifying_role_values, vt_name = "#{name} #{mode}"]]
-              base_vt = @constellation.ValueType(@vocabulary, mode)
-              vt = @constellation.ValueType(@vocabulary, vt_name, :supertype => base_vt)
+              base_vt = @constellation.ValueType(@vocabulary, mode, :guid => :new)
+              vt = @constellation.ValueType(@vocabulary, vt_name, :supertype => base_vt, :guid => :new)
               if parameters
                 length, scale = *parameters
                 vt.length = length if length
@@ -313,8 +313,8 @@ module ActiveFacts
           unless fact_type
             fact_type = @constellation.FactType(:new)
             fact_types << fact_type
-            entity_role = @constellation.Role(fact_type, 0, :object_type => @entity_type)
-            identifying_role = @constellation.Role(fact_type, 1, :object_type => identifying_type)
+            entity_role = @constellation.Role(fact_type, 0, :object_type => @entity_type, :guid => :new)
+            identifying_role = @constellation.Role(fact_type, 1, :object_type => identifying_type, :guid => :new)
           end
           @identification[0].role = identifying_role
 

data/lib/activefacts/cql/compiler/expression.rb

@@ -87,7 +87,7 @@ module ActiveFacts
         def result_value_type(context, name)
           vocabulary = context.vocabulary
           constellation = vocabulary.constellation
-          constellation.ValueType(vocabulary, name)
+          constellation.ValueType(vocabulary, name, :guid => :new)
         end
 
         def is_naked_object_type
@@ -180,7 +180,7 @@ module ActiveFacts
               raise "REVISIT: The player is the projected expression"
             end
             v = context.vocabulary
-            @player = v.constellation.ValueType(v, 'Boolean')
+            @player = v.constellation.ValueType(v, 'Boolean', :guid => :new)
           end
         end
 
@@ -308,7 +308,7 @@ module ActiveFacts
             # REVISIT: Calculate the units of the result from the units in @divisor
             # REVISIT: Do we want integer division?
             v = context.vocabulary
-            @player = v.constellation.ValueType(v, 'Real')
+            @player = v.constellation.ValueType(v, 'Real', :guid => :new)
           end
         end
 
@@ -396,7 +396,7 @@ module ActiveFacts
               when TrueClass, FalseClass; 'Boolean'
               end
             v = context.vocabulary
-            @player = v.constellation.ValueType(v, player_name)
+            @player = v.constellation.ValueType(v, player_name, :guid => :new)
           end
         end
 

data/lib/activefacts/cql/compiler/fact.rb

@@ -9,7 +9,7 @@ module ActiveFacts
         end
 
         def compile
-          @population = @constellation.Population(@vocabulary, @population_name)
+          @population = @constellation.Population(@vocabulary, @population_name, :guid => :new)
 
           @context = CompilationContext.new(@vocabulary)
           @context.bind @clauses
@@ -276,12 +276,10 @@ module ActiveFacts
               #}
               debug :instance, "This #{object_type.name} value already exists" if instance
               unless instance
-                instance = @constellation.Instance(
-                    :new,
-                    :object_type => object_type,
-                    :population => @population,
-                    :value => [literal.to_s, is_a_string, nil]
-                  )
+                instance = @constellation.Instance(:new)
+                instance.object_type = object_type
+                instance.population = @population
+                instance.value = [literal.to_s, is_a_string, nil]
                 @bound_facts << instance
               end
               instance

data/lib/activefacts/cql/compiler/fact_type.rb

@@ -140,7 +140,7 @@ module ActiveFacts
             end
             e = @constellation.EntityType[[@vocabulary, @name]]
             raise "You can't objectify #{@name}, it already exists" if e
-            e = @constellation.EntityType(@vocabulary, @name, :fact_type => @fact_type)
+            e = @constellation.EntityType(@vocabulary, @name, :fact_type => @fact_type, :guid => :new)
             e.create_implicit_fact_types
             if @pragmas
               e.is_independent = true if @pragmas.delete('independent')
@@ -192,6 +192,8 @@ module ActiveFacts
           # REVISIT: If we have conditions, we must match all given clauses exactly (no side-effects)
           @existing_clauses = @clauses.
             select{ |clause| clause.match_existing_fact_type @context }.
+            # subtyping match is not allowed for fact type extension:
+            reject{ |clause| clause.side_effects.role_side_effects.detect{|se| se.common_supertype } }.
             sort_by{ |clause| clause.side_effects.cost }
           fact_types = @existing_clauses.map{ |clause| clause.fact_type }.uniq.compact
 

data/lib/activefacts/cql/compiler/shared.rb

@@ -64,7 +64,7 @@ module ActiveFacts
           player ||= @player_by_role_name[name]
 
           if !player && @allowed_forward_terms.include?(name)
-            player = constellation.EntityType(@vocabulary, name)
+            player = constellation.EntityType(@vocabulary, name, :guid => :new)
           end
 
           player
@@ -111,13 +111,18 @@ module ActiveFacts
       end
 
       class Import < Definition
-        def initialize name, alias_list
+        def initialize parser, name, alias_hash
+          @parser = parser
           @name = name
-          @alias_list = alias_list
+          @alias_hash = alias_hash
         end
 
         def to_s
-          "#{@vocabulary.to_s} imports #{alias_list*', '};"
+          "#{@vocabulary.to_s} imports #{@alias_hash.map{|k,v| "#{k} as #{v}" }*', '};"
+        end
+
+        def compile
+          @parser.compile_import(@name, @alias_hash)
         end
       end
 

data/lib/activefacts/cql/compiler/value_type.rb

@@ -103,13 +103,13 @@ module ActiveFacts
           base_type = nil
           if (@base_type_name != @name)
             unless base_type = @constellation.ValueType[[@vocabulary.identifying_role_values, @constellation.Name(@base_type_name)]]
-              base_type = @constellation.ValueType(@vocabulary, @base_type_name)
+              base_type = @constellation.ValueType(@vocabulary, @base_type_name, :guid => :new)
               return base_type if @base_type_name == @name
             end
           end
 
           # Create and initialise the ValueType:
-          vt = @constellation.ValueType(@vocabulary, @name)
+          vt = @constellation.ValueType(@vocabulary, @name, :guid => :new)
           vt.is_independent = true if (@pragmas.include? 'independent')
           vt.supertype = base_type if base_type
           vt.length = length if length

data/lib/activefacts/cql/parser.rb

@@ -164,11 +164,12 @@ module ActiveFacts
       end
 
       class InputProxy
-        attr_reader :context
+        attr_reader :context, :parser
 
-        def initialize(input, context)
+        def initialize(input, context, parser)
           @input = input
           @context = context
+          @parser = parser
         end
 
         def length
@@ -206,7 +207,7 @@ module ActiveFacts
       end
 
       def parse(input, options = {})
-        input = InputProxy.new(input, context) unless input.respond_to?(:context)
+        input = InputProxy.new(input, context, self) unless input.respond_to?(:context)
         super(input, options)
       end
 
@@ -214,18 +215,19 @@ module ActiveFacts
         self.root = rule_name if rule_name
 
         @index = 0  # Byte offset to start next parse
+        @block = block
         self.consume_all_input = false
         nodes = []
         begin
-          node = parse(InputProxy.new(input, context), :index => @index)
+          node = parse(InputProxy.new(input, context, self), :index => @index)
           return nil unless node
-          if block
-            block.call(node)
+          if @block
+            @block.call(node)
           else
             nodes << node
           end
         end until self.index == @input_length
-        block ? true : nodes
+        @block ? true : nodes
       end
     end
 

data/lib/activefacts/generate/ordered.rb

@@ -51,7 +51,7 @@ module ActiveFacts
             when ActiveFacts::Metamodel::PresenceConstraint
               fact_types = c.role_sequence.all_role_ref.map{|rr| rr.role.fact_type}.uniq  # All fact types spanned by this constraint
               if fact_types.size == 1     # There's only one, save it:
-                # debug "Single-fact constraint on #{fact_types[0].fact_type_id}: #{c.name}"
+                # debug "Single-fact constraint on #{fact_types[0].guid}: #{c.name}"
                 (@presence_constraints_by_fact[fact_types[0]] ||= []) << c
               end
             when ActiveFacts::Metamodel::RingConstraint
@@ -348,7 +348,7 @@ module ActiveFacts
 
         # debug "for fact type #{fact_type.to_s}, considering\n\t#{fact_constraints.map(&:to_s)*",\n\t"}"
         # debug "#{fact_type.name} has readings:\n\t#{fact_type.readings.map(&:name)*"\n\t"}"
-        # debug "Dumping #{fact_type.fact_type_id} as a fact type"
+        # debug "Dumping #{fact_type.guid} as a fact type"
 
         # Fact types that aren't nested have no names
         name = fact_type.entity_type && fact_type.entity_type.name
@@ -501,8 +501,6 @@ module ActiveFacts
               !c.role_sequence.all_role_ref.detect{|rr| rr.join_role } &&
               c.max_frequency == 1 &&         # Uniqueness
               fact_types[0].all_role.size == c.role_sequence.all_role_ref.size
-              # debugger if !$constraint_id || c.constraint_id.object_id == $foo
-              # $constraint_id ||= 1
               next
             end
 

data/lib/activefacts/input/orm.rb

@@ -63,8 +63,8 @@ module ActiveFacts
         "DateAndTimeTemporal" => "Date Time",
         "TrueOrFalseLogical" => "Boolean",
         "YesOrNoLogical" => "Boolean",
-        "RowIdOther" => "Integer(8)",
-        "ObjectIdOther" => "Integer(8)"
+        "RowIdOther" => "Guid",
+        "ObjectIdOther" => "Guid"
       }
     RESERVED_WORDS = %w{
       and but each each either false if maybe no none not one or some that true where
@@ -155,7 +155,7 @@ module ActiveFacts
           entity_types <<
             @by_id[id] =
               entity_type =
-              @constellation.EntityType(@vocabulary, name)
+              @constellation.EntityType(@vocabulary, name, :guid => :new)
             independent = x['IsIndependent']
             entity_type.is_independent = true if independent && independent == 'true'
             personal = x['IsPersonal']
@@ -216,14 +216,14 @@ module ActiveFacts
           supertype_name = x_supertype['Name']
           raise "Supertype of #{name} is post-defined but recursiving processing failed" unless supertype
           raise "Supertype #{supertype_name} of #{name} is not a value type" unless supertype.kind_of? ActiveFacts::Metamodel::ValueType
-          value_super_type = @constellation.ValueType(@vocabulary, supertype_name)
+          value_super_type = @constellation.ValueType(@vocabulary, supertype_name, :guid => :new)
         else
           # REVISIT: Need to handle standard types better here:
-          value_super_type = type_name != name ? @constellation.ValueType(@vocabulary, type_name) : nil
+          value_super_type = type_name != name ? @constellation.ValueType(@vocabulary, type_name, :guid => :new) : nil
         end
 
         @by_id[id] =
-          vt = @constellation.ValueType(@vocabulary, name)
+          vt = @constellation.ValueType(@vocabulary, name, :guid => :new)
         vt.supertype = value_super_type
         vt.length = length if length
         vt.scale = scale if scale && scale != 0
@@ -316,7 +316,7 @@ module ActiveFacts
             next if subtype.kind_of? ActiveFacts::Metamodel::ValueType or
                         supertype.kind_of? ActiveFacts::Metamodel::ValueType
 
-            inheritance_fact = @constellation.TypeInheritance(subtype, supertype, :fact_type_id => :new)
+            inheritance_fact = @constellation.TypeInheritance(subtype, supertype, :guid => :new)
             if x["IsPrimary"] == "true" or           # Old way
               x["PreferredIdentificationPath"] == "true"   # Newer
               debug :orm, "#{supertype.name} is primary supertype of #{subtype.name}"
@@ -328,8 +328,8 @@ module ActiveFacts
             facts << @by_id[id] = inheritance_fact
 
             # Create the new Roles so we can find constraints on them:
-            subtype_role = @by_id[subtype_role_id] = @constellation.Role(inheritance_fact, 0, :object_type => subtype)
-            supertype_role = @by_id[supertype_role_id] = @constellation.Role(inheritance_fact, 1, :object_type => supertype)
+            subtype_role = @by_id[subtype_role_id] = @constellation.Role(inheritance_fact, 0, :object_type => subtype, :guid => :new)
+            supertype_role = @by_id[supertype_role_id] = @constellation.Role(inheritance_fact, 1, :object_type => supertype, :guid => :new)
 
             # Create readings, so constraints can be verbalised for example:
             rs = @constellation.RoleSequence(:new)
@@ -368,10 +368,10 @@ module ActiveFacts
             next if x.xpath("orm:DerivationRule").size > 0
             throw "Nested fact #{fact_id} not found" if !fact_type
 
-            debug :orm, "NestedType #{name} is #{id}, nests #{fact_type.fact_type_id}"
+            debug :orm, "NestedType #{name} is #{id}, nests #{fact_type.guid}"
             @nested_types <<
               @by_id[id] =
-              nested_type = @constellation.EntityType(@vocabulary, name)
+              nested_type = @constellation.EntityType(@vocabulary, name, :guid => :new)
             independent = x['IsIndependent']
             nested_type.is_independent = true if independent && independent == 'true' && !is_implied
             nested_type.is_implied_by_objectification = is_implied
@@ -443,11 +443,11 @@ module ActiveFacts
                 debug :orm, "#{@vocabulary.name}, RoleName=#{x['Name'].inspect} played by object_type=#{object_type.name}"
                 throw "Role is played by #{object_type.class} not ObjectType" if !(@constellation.vocabulary.object_type(:ObjectType) === object_type)
 
-                debug :orm, "Creating role #{name} nr#{fact_type.all_role.size} of #{fact_type.fact_type_id} played by #{object_type.name}"
+                debug :orm, "Creating role #{name} nr#{fact_type.all_role.size} of #{fact_type.guid} played by #{object_type.name}"
 
-                role = @by_id[id] = @constellation.Role(fact_type, fact_type.all_role.size, :object_type => object_type)
+                role = @by_id[id] = @constellation.Role(fact_type, fact_type.all_role.size, :object_type => object_type, :guid => :new)
                 role.role_name = name if name && name != object_type.name
-                debug :orm, "Fact #{fact_name} (id #{fact_type.fact_type_id.object_id}) role #{x['Name']} is played by #{object_type.name}, role is #{role.object_id}"
+                debug :orm, "Fact #{fact_name} (id #{fact_type.guid.object_id}) role #{x['Name']} is played by #{object_type.name}, role is #{role.object_id}"
 
                 x_vr = x.xpath("orm:ValueRestriction/orm:RoleValueConstraint")
                 x_vr.each{|vr|
@@ -1190,7 +1190,7 @@ module ActiveFacts
 
       def read_instances
         debug :orm, "Reading sample data" do
-          population = @constellation.Population(@vocabulary, "sample")
+          population = @constellation.Population(@vocabulary, "sample", :guid => :new)
 
           # Value instances first, then entities then facts:
 
@@ -1436,9 +1436,9 @@ module ActiveFacts
           position = convert_position(xr_shape['AbsoluteBounds'])
           case xr_shape.name
           when 'ObjectifiedFactTypeNameShape'
-            @constellation.ObjectifiedFactTypeNameShape(shape, :shape_id => :new, :diagram => diagram, :position => position, :is_expanded => false)
+            @constellation.ObjectifiedFactTypeNameShape(shape, :guid => :new, :diagram => diagram, :position => position, :is_expanded => false)
           when 'ReadingShape'
-            @constellation.ReadingShape(shape, :shape_id => :new, :fact_type_shape=>shape, :diagram => diagram, :position => position, :is_expanded => false, :reading => fact_type.preferred_reading)
+            @constellation.ReadingShape(shape, :guid => :new, :fact_type_shape=>shape, :diagram => diagram, :position => position, :is_expanded => false, :reading => fact_type.preferred_reading)
           when 'RoleNameShape'
             role = @by_id[xr_shape.xpath("ormDiagram:Subject")[0]['ref']]
             role_display = role_display_for_role(shape, x_role_display, role)

data/lib/activefacts/persistence/reference.rb

@@ -203,7 +203,7 @@ module ActiveFacts
   end
 
   module Metamodel          #:nodoc:
-    class ObjectType
+    class ObjectType < Concept
       # Say whether the independence of this object is still under consideration
       # This is used in detecting dependency cycles, such as occurs in the Metamodel
       attr_accessor :tentative          #:nodoc:

data/lib/activefacts/persistence/tables.rb

@@ -158,12 +158,22 @@ module ActiveFacts
     end
 
     class Vocabulary
+      @@relational_transforms = []
+
       # return an Array of ObjectTypes that will have their own tables
       def tables
         decide_tables if !@tables
+        @@relational_transforms.each{|tr| tr.call(self)}
         @tables
       end
 
+      def self.relational_transform &block
+        # Add this block to the additional transformations which wil be applied
+        # to the relational schema after the initial absorption.
+        # For example, to perform injection of surrogate keys to replace composite keys...
+        @@relational_transforms << block
+      end
+
       def decide_tables #:nodoc:
         # Strategy:
         # 1) Populate references for all ObjectTypes

data/lib/activefacts/version.rb

@@ -8,7 +8,7 @@ module ActiveFacts
   module Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 15
+    PATCH = 16
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/activefacts/vocabulary/extensions.rb

@@ -44,8 +44,8 @@ module ActiveFacts
         # NORMA doesn't create an implicit fact type here, rather the fact type has an implicit extra role, so looks like a binary
         # We only do it when the unary fact type is not objectified
         implicit_fact_type = @constellation.ImplicitFactType(:new, :implying_role => role)
-        entity_type = @entity_type || @constellation.ImplicitBooleanValueType(role.object_type.vocabulary, "_ImplicitBooleanValueType")
-        phantom_role = @constellation.Role(implicit_fact_type, 0, :object_type => entity_type)
+        entity_type = @entity_type || @constellation.ImplicitBooleanValueType(role.object_type.vocabulary, "_ImplicitBooleanValueType", :guid => :new)
+        phantom_role = @constellation.Role(implicit_fact_type, 0, :object_type => entity_type, :guid => :new)
       end
 
       def reading_preferably_starting_with_role role
@@ -372,7 +372,7 @@ module ActiveFacts
         fact_type.all_role.each do |role|
           next if role.implicit_fact_type     # Already exists
           implicit_fact_type = @constellation.ImplicitFactType(:new, :implying_role => role)
-          phantom_role = @constellation.Role(implicit_fact_type, 0, :object_type => self)
+          phantom_role = @constellation.Role(implicit_fact_type, 0, :object_type => self, :guid => :new)
           # We could create a copy of the visible external role here, but there's no need yet...
           # Nor is there a need for a presence constraint, readings, etc.
         end
@@ -644,7 +644,7 @@ module ActiveFacts
     class Join
       def show
         steps_shown = {}
-        debug :join, "Displaying full contents of Join #{join_id}" do
+        debug :join, "Displaying full contents of Join #{guid}" do
           all_join_node.sort_by{|jn| jn.ordinal}.each do |join_node|
             debug :join, "#{join_node.describe}" do
               join_node.all_join_step.

data/lib/activefacts/vocabulary/metamodel.rb

@@ -16,14 +16,6 @@ module ActiveFacts
       restrict 'partitioned', 'separate'
     end
 
-    class ConstraintId < AutoCounter
-      value_type 
-    end
-
-    class ContextNoteId < AutoCounter
-      value_type 
-    end
-
     class ContextNoteKind < String
       value_type 
       restrict 'as_opposed_to', 'because', 'so_that', 'to_avoid'
@@ -41,10 +33,6 @@ module ActiveFacts
       value_type 
     end
 
-    class DisjunctionId < AutoCounter
-      value_type 
-    end
-
     class DisplayRoleNamesSetting < String
       value_type 
       restrict 'false', 'true'
@@ -62,23 +50,11 @@ module ActiveFacts
       value_type :length => 16
     end
 
-    class FactId < AutoCounter
-      value_type 
-    end
-
-    class FactTypeId < AutoCounter
-      value_type 
-    end
-
     class Frequency < UnsignedInteger
       value_type :length => 32
     end
 
-    class InstanceId < AutoCounter
-      value_type 
-    end
-
-    class JoinId < AutoCounter
+    class Guid < ::Guid
       value_type 
     end
 
@@ -115,10 +91,6 @@ module ActiveFacts
       value_type 
     end
 
-    class RoleSequenceId < AutoCounter
-      value_type 
-    end
-
     class RotationSetting < String
       value_type 
       restrict 'left', 'right'
@@ -128,10 +100,6 @@ module ActiveFacts
       value_type :length => 32
     end
 
-    class ShapeId < AutoCounter
-      value_type 
-    end
-
     class Subscript < UnsignedInteger
       value_type :length => 16
     end
@@ -145,10 +113,6 @@ module ActiveFacts
       restrict 'assert', 'commit'
     end
 
-    class UnitId < AutoCounter
-      value_type 
-    end
-
     class X < SignedInteger
       value_type :length => 32
     end
@@ -162,6 +126,11 @@ module ActiveFacts
       one_to_one :agent_name, :mandatory => true  # See AgentName.agent
     end
 
+    class AlternativeSet
+      identified_by :guid
+      one_to_one :guid, :mandatory => true        # See Guid.alternative_set
+    end
+
     class Coefficient
       identified_by :numerator, :denominator, :is_precise
       has_one :denominator, :mandatory => true    # See Denominator.all_coefficient
@@ -169,26 +138,20 @@ module ActiveFacts
       has_one :numerator, :mandatory => true      # See Numerator.all_coefficient
     end
 
-    class Constraint
-      identified_by :constraint_id
-      one_to_one :constraint_id, :mandatory => true  # See ConstraintId.constraint
+    class Concept
+      identified_by :guid
+      one_to_one :guid, :mandatory => true        # See Guid.concept
+    end
+
+    class Constraint < Concept
       has_one :name                               # See Name.all_constraint
       has_one :vocabulary                         # See Vocabulary.all_constraint
     end
 
-    class ContextNote
-      identified_by :context_note_id
-      has_one :constraint                         # See Constraint.all_context_note
-      one_to_one :context_note_id, :mandatory => true  # See ContextNoteId.context_note
+    class ContextNote < Concept
+      has_one :concept                            # See Concept.all_context_note
       has_one :context_note_kind, :mandatory => true  # See ContextNoteKind.all_context_note
       has_one :discussion, :mandatory => true     # See Discussion.all_context_note
-      has_one :fact_type                          # See FactType.all_context_note
-      has_one :object_type                        # See ObjectType.all_context_note
-    end
-
-    class Disjunction
-      identified_by :disjunction_id
-      one_to_one :disjunction_id, :mandatory => true  # See DisjunctionId.disjunction
     end
 
     class Enforcement
@@ -198,33 +161,25 @@ module ActiveFacts
       has_one :enforcement_code, :mandatory => true  # See EnforcementCode.all_enforcement
     end
 
-    class Fact
-      identified_by :fact_id
-      one_to_one :fact_id, :mandatory => true     # See FactId.fact
+    class Fact < Concept
       has_one :fact_type, :mandatory => true      # See FactType.all_fact
       has_one :population, :mandatory => true     # See Population.all_fact
     end
 
-    class FactType
-      identified_by :fact_type_id
-      one_to_one :fact_type_id, :mandatory => true  # See FactTypeId.fact_type
+    class FactType < Concept
     end
 
     class ImplicitFactType < FactType
     end
 
-    class Instance
-      identified_by :instance_id
+    class Instance < Concept
       one_to_one :fact                            # See Fact.instance
-      one_to_one :instance_id, :mandatory => true  # See InstanceId.instance
       has_one :object_type, :mandatory => true    # See ObjectType.all_instance
       has_one :population, :mandatory => true     # See Population.all_instance
       has_one :value                              # See Value.all_instance
     end
 
-    class Join
-      identified_by :join_id
-      one_to_one :join_id, :mandatory => true     # See JoinId.join
+    class Join < Concept
     end
 
     class JoinNode
@@ -265,19 +220,19 @@ module ActiveFacts
       has_one :role                               # See Role.all_ring_constraint
     end
 
-    class Role
+    class Role < Concept
       identified_by :fact_type, :ordinal
       has_one :fact_type, :mandatory => true      # See FactType.all_role
-      has_one :ordinal, :mandatory => true        # See Ordinal.all_role
       one_to_one :implicit_fact_type, :counterpart => :implying_role  # See ImplicitFactType.implying_role
       has_one :object_type, :mandatory => true    # See ObjectType.all_role
+      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 :role_sequence_id
+      identified_by :guid
+      one_to_one :guid, :mandatory => true        # See Guid.role_sequence
       maybe :has_unused_dependency_to_force_table_in_norma
-      one_to_one :role_sequence_id, :mandatory => true  # See RoleSequenceId.role_sequence
     end
 
     class RoleValue
@@ -292,11 +247,11 @@ module ActiveFacts
     end
 
     class Shape
-      identified_by :shape_id
+      identified_by :guid
       has_one :diagram, :mandatory => true        # See Diagram.all_shape
+      one_to_one :guid, :mandatory => true        # See Guid.shape
       maybe :is_expanded
       has_one :position                           # See Position.all_shape
-      one_to_one :shape_id, :mandatory => true    # See ShapeId.shape
     end
 
     class SubsetConstraint < SetConstraint
@@ -304,15 +259,13 @@ module ActiveFacts
       has_one :superset_role_sequence, :class => RoleSequence, :mandatory => true  # See RoleSequence.all_subset_constraint_as_superset_role_sequence
     end
 
-    class Unit
-      identified_by :unit_id
+    class Unit < Concept
       has_one :coefficient                        # See Coefficient.all_unit
       has_one :ephemera_url, :class => EphemeraURL  # See EphemeraURL.all_unit
       maybe :is_fundamental
       one_to_one :name, :mandatory => true        # See Name.unit
       has_one :offset                             # See Offset.all_unit
       one_to_one :plural_name, :class => Name     # See Name.unit_as_plural_name
-      one_to_one :unit_id, :mandatory => true     # See UnitId.unit
       has_one :vocabulary, :mandatory => true     # See Vocabulary.all_unit
     end
 
@@ -389,7 +342,7 @@ module ActiveFacts
 
     class JoinStep
       identified_by :input_join_role, :output_join_role
-      has_one :disjunction                        # See Disjunction.all_join_step
+      has_one :alternative_set                    # See AlternativeSet.all_join_step
       has_one :fact_type, :mandatory => true      # See FactType.all_join_step
       has_one :input_join_role, :class => JoinRole, :mandatory => true  # See JoinRole.all_join_step_as_input_join_role
       maybe :is_anti
@@ -401,7 +354,7 @@ module ActiveFacts
       has_one :context_note, :mandatory => true   # See ContextNote.all_model_note_shape
     end
 
-    class ObjectType
+    class ObjectType < Concept
       identified_by :vocabulary, :name
       maybe :is_independent
       has_one :name, :mandatory => true           # See Name.all_object_type
@@ -410,6 +363,7 @@ module ActiveFacts
     end
 
     class ObjectTypeShape < Shape
+      maybe :has_expanded_reference_mode
       has_one :object_type, :mandatory => true    # See ObjectType.all_object_type_shape
     end
 
@@ -418,7 +372,7 @@ module ActiveFacts
       one_to_one :fact_type_shape, :mandatory => true  # See FactTypeShape.objectified_fact_type_name_shape
     end
 
-    class Population
+    class Population < Concept
       identified_by :vocabulary, :name
       has_one :name, :mandatory => true           # See Name.all_population
       has_one :vocabulary                         # See Vocabulary.all_population

data/spec/cql_symbol_tables_spec.rb

@@ -102,7 +102,7 @@ describe "CQL Symbol table" do
     it "should define #{description}" do
       if result
         # Predefine an entity type, some cases use it:
-        @constellation.EntityType(@vocabulary.identifying_role_values, "Person")
+        @constellation.EntityType(@vocabulary.identifying_role_values, "Person", :guid => :new)
 
         player, bound = @symbols.bind(*args)
         player.should_not be_nil

data/spec/cqldump_spec.rb

@@ -15,8 +15,8 @@ describe "CQL Dumper" do
   before :each do
     @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
     @vocabulary = @constellation.Vocabulary("TestVocab")
-    @string_type = @constellation.ValueType(@vocabulary, "String")
-    @integer_type = @constellation.ValueType(@vocabulary, "Integer")
+    @string_type = @constellation.ValueType(@vocabulary, "String", :guid => :new)
+    @integer_type = @constellation.ValueType(@vocabulary, "Integer", :guid => :new)
     @dumper = ActiveFacts::Generate::CQL.new(@constellation)
   end
 
@@ -28,7 +28,7 @@ describe "CQL Dumper" do
   end
 
   it "should dump a String ValueType" do
-    vt = @constellation.ValueType(@vocabulary, "Name", :supertype => @string_type, :length => 20)
+    vt = @constellation.ValueType(@vocabulary, "Name", :supertype => @string_type, :length => 20, :guid => :new)
     vt.supertype = @string_type
     vt.length = 20
     #p vt.class.roles.keys.sort_by{|s| s.to_s}
@@ -45,7 +45,7 @@ END
   end
 
   it "should dump an Integer ValueType" do
-    vt = @constellation.ValueType(@vocabulary, "Count", :supertype => @integer_type, :length => 32)
+    vt = @constellation.ValueType(@vocabulary, "Count", :supertype => @integer_type, :length => 32, :guid => :new)
     cql.should == <<END
 vocabulary TestVocab;
 
@@ -58,8 +58,8 @@ END
   end
 
   def value_type(name, datatype = "String", length = 0, scale = 0)
-    dt = @constellation.ValueType(@vocabulary, datatype)
-    vt = @constellation.ValueType(@vocabulary, name, :supertype => dt)
+    dt = @constellation.ValueType(@vocabulary, datatype, :guid => :new)
+    vt = @constellation.ValueType(@vocabulary, name, :supertype => dt, :guid => :new)
     vt.length = length if length != 0
     vt.scale = scale if scale != 0
     vt
@@ -68,8 +68,8 @@ END
   def one_to_many(one, many, reading)
     # Join them with a fact type:
     ft = @constellation.FactType(:new)
-    role0 = @constellation.Role(ft, 0, :object_type => one)
-    role1 = @constellation.Role(ft, 1, :object_type => many)
+    role0 = @constellation.Role(ft, 0, :object_type => one, :guid => :new)
+    role1 = @constellation.Role(ft, 1, :object_type => many, :guid => :new)
 
     # Make a role sequence:
     rs = @constellation.RoleSequence(:new)
@@ -90,8 +90,8 @@ END
   def one_to_one(first, second, reading)
     # Join them with a fact type:
     ft = @constellation.FactType(:new)
-    role0 = @constellation.Role(ft, 0, :object_type => first)
-    role1 = @constellation.Role(ft, 1, :object_type => second)
+    role0 = @constellation.Role(ft, 0, :object_type => first, :guid => :new)
+    role1 = @constellation.Role(ft, 1, :object_type => second, :guid => :new)
 
     # Make a role sequence for the reading
     rs = @constellation.RoleSequence(:new)
@@ -141,8 +141,8 @@ END
   end
 
   it "should dump an named EntityType" do
-    vt = @constellation.ValueType(@vocabulary, "Name", :supertype => @string_type, :length => 20)
-    et = @constellation.EntityType(@vocabulary, "Company")
+    vt = @constellation.ValueType(@vocabulary, "Name", :supertype => @string_type, :length => 20, :guid => :new)
+    et = @constellation.EntityType(@vocabulary, "Company", :guid => :new)
 
     ft = one_to_one(et, vt, "{0} is called {1}")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activefacts-api
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -459,7 +459,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1995723602565457823
+      hash: 3445837228112835093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: