activefacts 0.8.16 → 0.8.18

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmQ1ZmI4YjNlNGZhMjJhZDQwODcwNDNkMWM1ZTQ5YWE2NjNkZTRiNA==
+  data.tar.gz: !binary |-
+    YzkzY2M3MDkzMDc5MGNmMTkyNGNmY2U2ZWUyNjQ2MjljODI5YmFkYw==
+SHA512:
+  metadata.gz: !binary |-
+    ZDgxMzZkODViOWE2MDU1MTdiODMwZDhjMzVjN2E2NmUwNjRlOTczZTJlMTU4
+    M2YxM2M5ZWUzZWQ1NWEwYjc5ZTIxNjg2MjQ0MjJmMzYwZjE1MmMwZGIyODFh
+    MTVlODhiNWY0ZTNiNWQ3ZmUzZDFhMTUzYzhmMGE0YTM1Y2YyNTg=
+  data.tar.gz: !binary |-
+    YWU2OTdlNTcxYTRjYjNjMzAxNjYzNTk0NDM1YmY3YzQ1NWI4YTczZDc2Nzlk
+    NTgxMmEwZWUyNzc2ZmU4MTAwYjNmMzBkNGM3M2I2OTM0M2MyZDM1NTcxZjNi
+    OGQzODQwMWQxNTFhNTRkYWU5M2QzODMyNDUwZTE1MjhjNTdiNWQ=

data/Manifest.txt

@@ -21,7 +21,6 @@ examples/CQL/Insurance.cql
 examples/CQL/JoinEquality.cql
 examples/CQL/Marriage.cql
 examples/CQL/Metamodel.cql
-examples/CQL/MetamodelNext.cql
 examples/CQL/Monogamy.cql
 examples/CQL/MonthInSeason.cql
 examples/CQL/Moon.cql
@@ -67,7 +66,7 @@ lib/activefacts/cql/compiler/entity_type.rb
 lib/activefacts/cql/compiler/expression.rb
 lib/activefacts/cql/compiler/fact.rb
 lib/activefacts/cql/compiler/fact_type.rb
-lib/activefacts/cql/compiler/join.rb
+lib/activefacts/cql/compiler/query.rb
 lib/activefacts/cql/compiler/shared.rb
 lib/activefacts/cql/compiler/value_type.rb
 lib/activefacts/cql/nodes.rb
@@ -76,19 +75,24 @@ lib/activefacts/generate/absorption.rb
 lib/activefacts/generate/cql.rb
 lib/activefacts/generate/dm.rb
 lib/activefacts/generate/help.rb
+lib/activefacts/generate/helpers/oo.rb
+lib/activefacts/generate/helpers/ordered.rb
+lib/activefacts/generate/helpers/rails.rb
 lib/activefacts/generate/html/glossary.rb
 lib/activefacts/generate/json.rb
 lib/activefacts/generate/null.rb
-lib/activefacts/generate/oo.rb
-lib/activefacts/generate/ordered.rb
 lib/activefacts/generate/records.rb
 lib/activefacts/generate/ruby.rb
 lib/activefacts/generate/sql/mysql.rb
 lib/activefacts/generate/sql/server.rb
+lib/activefacts/generate/rails/schema.rb
+lib/activefacts/generate/rails/models.rb
 lib/activefacts/generate/text.rb
+lib/activefacts/generate/transform/surrogate.rb
 lib/activefacts/generate/version.rb
 lib/activefacts/input/cql.rb
 lib/activefacts/input/orm.rb
+lib/activefacts/mapping/rails.rb
 lib/activefacts/persistence.rb
 lib/activefacts/persistence/columns.rb
 lib/activefacts/persistence/foreignkey.rb
@@ -96,6 +100,7 @@ lib/activefacts/persistence/index.rb
 lib/activefacts/persistence/object_type.rb
 lib/activefacts/persistence/reference.rb
 lib/activefacts/persistence/tables.rb
+lib/activefacts/registry.rb
 lib/activefacts/support.rb
 lib/activefacts/version.rb
 lib/activefacts/vocabulary.rb
@@ -144,5 +149,6 @@ spec/helpers/parse_to_ast_matcher.rb
 spec/helpers/string_matcher.rb
 spec/helpers/test_parser.rb
 spec/spec_helper.rb
+spec/transform_surrogate_spec.rb
 status.html
 why.html

data/bin/afgen

@@ -6,32 +6,32 @@
 #
 $:.unshift File.dirname(File.expand_path(__FILE__))+"/../lib"
 
-require 'rubygems'
-
 require 'activefacts'
 require 'activefacts/vocabulary'
 
+# Load the generators:
+generators = []
 arg = ARGV.shift || "--help"
+while arg =~ /^--([^=]*)(?:=(.*))?/
+  module_name, options = $1, ($2||"").split(/,/)
+  begin
+    base_generators = ActiveFacts::Registry.generators.keys
 
-# Load the required generator, or the default "text" generator:
-generator = "text"
-generator_options = []
-if arg =~ /^--([^=]*)(?:=(.*))?/
-  generator = $1
-  generator_options = ($2||"").split(/,/)
-  arg = ARGV.shift
-end
+    require "activefacts/generate/#{module_name}"
 
-output_handler = "activefacts/generate/#{generator.downcase}"
-begin
-  require output_handler
-rescue LoadError
-  $stderr.puts "Could not find output generator #{generator}. Try --help"
-  exit 1
+    # One require may load more than one generator. Extract new ones.
+    new_generators = ActiveFacts::Registry.generators
+    generators += (new_generators.keys-base_generators).map do |gn|
+      [new_generators[gn], options]
+    end
+
+  rescue LoadError => e
+    $stderr.puts "Could not find output module #{module_name}. Try --help"
+    exit 1
+  end
+
+  arg = ARGV.shift
 end
-output_class = generator.upcase.gsub(%r{[/\\]+},'::')
-output_klass = eval("ActiveFacts::Generate::#{output_class}")
-raise "Expected #{output_handler} to define #{output_class}" unless output_klass
 
 # Load the file type input method
 if arg
@@ -53,8 +53,14 @@ begin
     vocabulary = true
   end
 
+  exit 0 unless vocabulary
+
+  vocabulary.finalise unless vocabulary == true
+
   # Generate the output:
-  output_klass.new(vocabulary, *generator_options).generate if vocabulary
+  generators.each do |generator, options|
+    generator.new(vocabulary, *options).generate
+  end
 rescue => e
   $stderr.puts "#{e.message}"
   # puts "\t#{e.backtrace*"\n\t"}"

data/bin/cql

@@ -141,7 +141,7 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
     begin
       @results = []
       compile(statement)
-      if @results.size == 1 && @results[0].is_a?(ActiveFacts::Metamodel::Join)
+      if @results.size == 1 && @results[0].is_a?(ActiveFacts::Metamodel::Query)
 	process_query(@results[0])
       else
 	puts(@results.map{|r| "\t"+r.inspect}*"\n")

data/css/orm2.css

@@ -1,3 +1,7 @@
+a:link, a:visited {
+  color: #8A0092; text-decoration: underline;
+}
+
 ul {
   margin: 0px 0px 0px 2em;
   -webkit-margin-before: 0px;
@@ -6,7 +10,7 @@ ul {
   padding: 0px;
 }
 
-pre {
+pre.slide {
   background-color: #000;
   padding: 5px;
   display: table-cell;
@@ -20,20 +24,18 @@ span {
 }
 
 .keyword {
-  Xcolor: #00F;
-  color: #66F;
+  color: #0000CC;
 }
 .term, .concept {
-  Xcolor: #808;
-  color: #E0E;
+  /* Xcolor: #6A0072;   The color used by NORMA */
+  color: #8A0092;
 }
 .vocabulary, .object_type {
-  Xcolor: #808;
-  color: #E0E;
+  /* Xcolor: #6A0072;   The color used by NORMA */
+  color: #8A0092;
 }
 .linking, .copula {
-  Xcolor: #060;
-  color: #0C0;
+  color: #0E5400;
 }
 .literal, .value {
   color: #FF990E;
@@ -41,4 +43,82 @@ span {
 
 dd {
   margin-bottom: 0.5em;
+  margin-left: 60px;
+  text-indent: -20px;
+}
+
+dd ul {
+  margin-left: -80px;
+  text-indent: 80px;
+}
+
+
+.glossary-sidebar {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  right: 0px;
+  width: 240px;
+  display: block;
+  margin: 0;
+  padding: 0 16px;
+  border-right: solid #DDD 3px;
+  background: #EEE;
+}
+
+.glossary-toc {
+  position: absolute;
+  top: 0px;
+  bottom: 24px;
+  overflow: auto;
+  margin: 0;
+  padding: 0 0;
+  list-style: none;
+  font-family: Menlo, Consolas, Monaco, "Lucida Console", monospace;
+}
+
+.glossary-controls {
+  position: absolute; bottom: 0px;
+}
+
+.glossary-doc {
+  position: absolute;
+  display: block;
+  background: #FFF;
+  border-right: solid #EEE 3px;
+  font: 300 16px/1.4 "Myriad Pro", "Helvetica Neue", Helvetica, "Arial Unicode MS", Arial, sans-serif;
+  overflow: auto;
+  padding: 0 0 0 30px;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 270px;
+}
+
+.glossary-toc li {
+  margin-left: 20px;
+  text-indent: -20px;
+}
+
+.glossary-doc dl {
+  margin-bottom: 1600px;
+}
+
+.glossary-doc dd {
+  margin-bottom: 30px;
+}
+
+.glossary-constraint {
+  background: #EDC;
+}
+
+.value {
+  display: inline;
+}
+
+.keyword,
+.glossary-facttype,
+.glossary-reading {
+  display: inline;
+  XXbackground: #E8E8E8;
 }

data/examples/CQL/CompanyDirectorEmployee.cql

@@ -15,11 +15,11 @@ Company is identified by its Name where
 	Company is called Company Name;
 Company is listed;
 
-Meeting is independent identified by Date and Meeting is board meeting and Company where
-	Meeting is held on one Date,
-	Meeting is board meeting,
+Meeting is independent identified by Company and Date and Meeting is board meeting where
+	Meeting is held by one Company,
 	Company held Meeting,
-	Meeting is held by one Company;
+	Meeting is held on one Date,
+	Meeting is board meeting;
 
 Person is identified by given-Name and family-Name where
 	Person has one given-Name,

data/examples/CQL/Genealogy.cql

@@ -18,7 +18,7 @@ Name is written as String(128);
 Occupation is written as String(128);
 Official is written as String(64);
 Person ID is written as Auto Counter;
-Picture is written as Image(20);
+Picture is written as Image;
 Role ID is written as Auto Counter;
 Source ID is written as Auto Counter;
 Source Name is written as String(128);
@@ -63,7 +63,7 @@ preferred-Picture is of Person,
 
 Role is identified by its ID;
 Role is called one Event Role Name,
-	Event Role Name is name of one Role;
+	Event Role Name is name of at most one Role;
 
 Source is identified by its ID;
 Source has one Source Name,
@@ -75,9 +75,9 @@ Email is of User,
 User provided Source,
 	Source was provided by one User;
 
-Friend is where
-	User is friend of other-User [symmetric];
-Friend is confirmed;
+Friendship is where
+	User is friendly with other-User [symmetric];
+Friendship is confirmed;
 
 Participation is where
 	Person played Role in Event according to Source,

data/examples/CQL/Metamodel.cql

@@ -5,7 +5,8 @@ vocabulary Metamodel;
  */
 Adjective is written as String(64);
 Agent Name is written as String;
-Assimilation is written as String restricted to {'partitioned', 'separate'};
+Aggregate Code is written as String(32);
+Assimilation is written as String restricted to {'absorbed', 'partitioned', 'separate'};
 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);
@@ -16,6 +17,7 @@ Ephemera URL is written as String;
 Exponent is written as Signed Integer(16);
 Frequency is written as Unsigned Integer(32);
 Guid is written as Guid;
+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);
@@ -23,6 +25,7 @@ Numerator is written as Decimal;
 Offset is written as Decimal;
 Ordinal is written as Unsigned Integer(16);
 Pronoun is written as String(20) restricted to {'feminine', 'masculine', 'neuter', 'personal'};
+Regular Expression is written as String;
 Ring Type is written as String;
 Rotation Setting is written as String restricted to {'left', 'right'};
 Scale is written as Unsigned Integer(32);
@@ -37,9 +40,12 @@ Y is written as Signed Integer(32);
  */
 Agent is identified by its Name;
 
+Aggregate is identified by its Code;
+
 Alternative Set is identified by Guid where
 	Alternative Set has one Guid,
 	Guid is of at most one Alternative Set;
+Alternative Set members are exclusive;
 
 Coefficient is identified by Numerator and Denominator and Coefficient is precise where
 	Coefficient has one Numerator,
@@ -55,12 +61,12 @@ Name is of Constraint,
 	Constraint is called at most one Name;
 
 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;
+Context Note applies to at most one relevant-Concept [acyclic, stronglyintransitive],
+	Concept has Context Note;
 
 Enforcement is identified by Constraint where
 	Constraint requires at most one Enforcement,
@@ -74,26 +80,18 @@ Fact is a kind of Concept [partitioned];
 Fact Type is a kind of Concept [partitioned];
 Fact is of one Fact Type;
 
-Implicit Fact Type is a kind of Fact Type;
+Implication Rule is identified by its Name;
+Concept is implied by at most one Implication Rule;
 
 Instance is a kind of Concept [partitioned];
 Instance objectifies at most one Fact,
 	Fact is objectified as at most one Instance;
 
-Join is a kind of Concept [partitioned];
-
-Join Node is identified by Join and Ordinal where
-	Join includes Join Node,
-	Join Node is in one Join,
-	Join Node has one Ordinal position;
-Join Node has at most one Subscript,
-	Subscript is of Join Node;
-Join Node has at most one role-Name,
-	Name is of Join Node;
+Link Fact Type is a kind of Fact Type;
 
-Position is identified by X and Y where
-	Position is at one X,
-	Position is at one Y;
+Location is identified by X and Y where
+	Location is at one X,
+	Location is at one Y;
 
 Presence Constraint is a kind of Constraint;
 Presence Constraint has at most one max-Frequency restricted to {1..};
@@ -101,12 +99,15 @@ Presence Constraint has at most one min-Frequency restricted to {2..};
 Presence Constraint is mandatory;
 Presence Constraint is preferred identifier;
 
+Query is a kind of Concept [partitioned];
+
 Reading is identified by Fact Type and Ordinal where
 	Fact Type has Reading,
 	Reading is for one Fact Type,
 	Reading is in one Ordinal position,
 	Ordinal reading for fact type is Reading;
 Reading has one Text;
+Reading is negative;
 
 Ring Constraint is a kind of Constraint;
 Ring Constraint is of one Ring Type;
@@ -116,8 +117,6 @@ Role is a kind of Concept identified by Fact Type and Ordinal [partitioned] wher
 	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,
 	other-Role is of Ring Constraint;
 Role is of Ring Constraint;  // Avoid ambiguity; this is a new fact type
@@ -126,6 +125,12 @@ Role is of Ring Constraint,
 Role has at most one role-Name,
 	role-Name is name of at least one Role;
 
+Role Proxy is a kind of Role;
+Link Fact Type has one Role Proxy,
+	Role Proxy is of at most one Link Fact Type;
+Role Proxy is for at most one Role,
+	Role has at most one Role Proxy;
+
 Role Sequence is identified by Guid where
 	Role Sequence has one Guid,
 	Guid is of at most one Role Sequence;
@@ -134,19 +139,19 @@ Reading is in one Role Sequence,
 	Role Sequence is for Reading;
 Role Sequence has unused dependency to force table in norma;
 
-Role Value is identified by Instance and Fact where
-	Instance plays Role Value,
-	Role Value is of one Instance,
+Role Value is identified by Fact and Role where
 	Role Value fulfils one Fact,
-	Fact includes at least one Role Value;
-Role Value is of one Role;
+	Fact includes at least one Role Value,
+	Role Value is of one Role;
+Instance plays Role Value,
+	Role Value is of one Instance;
 
 Set Constraint is a kind of Constraint;
 
 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 at at most one Location;
 Shape is expanded;
 
 Subset Constraint is a kind of Set Constraint;
@@ -160,22 +165,35 @@ Name is of at most one Unit,
 	Unit is called one Name;
 Unit has at most one Coefficient;
 Unit has at most one Offset;
+Unit has plural-Name;  // Avoid ambiguity; this is a new fact type
 Unit has at most one plural-Name,
-	plural-Name id of at most one Unit;
+	plural-Name is of at most one Unit;
 Unit is fundamental;
 
-Value is identified by Literal and Value is a string and Unit where
+Value is identified by Literal and Value is literal string and Unit where
 	Value is represented by one Literal,
 	Literal represents Value,
-	Value is a string,
+	Value is literal string,
 	Value is in at most one Unit,
 	Unit is of Value;
 Instance has at most one Value;
-Join Node has at most one Value;
 
 Value Constraint is a kind of Constraint;
 Role has at most one role-Value Constraint,
 	Value Constraint applies to at most one Role;
+Value Constraint requires matching at most one Regular Expression;
+
+Variable is identified by Query and Ordinal where
+	Query includes at least one Variable,
+	Variable is in one Query,
+	Variable has one Ordinal position;
+Variable projects at most one Role (as Projection),
+	Projection is projected from at most one Variable;
+Variable has at most one Subscript,
+	Subscript is of Variable;
+Variable is bound to at most one Value;
+Variable has at most one role-Name,
+	Name is of Variable;
 
 Vocabulary is identified by Name where
 	Vocabulary is called one Name;
@@ -184,6 +202,10 @@ Vocabulary contains Constraint,
 Vocabulary includes Unit,
 	Unit is in one Vocabulary;
 
+Aggregation is where
+	Variable is bound to Aggregate over aggregated-Variable,
+	Aggregate of aggregated-Variable is bound as one Variable;
+
 Agreement is identified by Context Note where
 	Context Note was added by at most one Agreement,
 	Agreement covers one Context Note;
@@ -216,8 +238,6 @@ Diagram is identified by Vocabulary and Name where
 	Vocabulary contains Diagram,
 	Diagram is called one Name,
 	Name is of Diagram;
-Shape is in one Diagram,
-	Diagram includes Shape;
 
 Fact Type Shape is a kind of Shape;
 Fact Type Shape has at most one Display Role Names Setting;
@@ -225,45 +245,37 @@ Fact Type Shape is for one Fact Type,
 	Fact Type has Fact Type Shape;
 Fact Type Shape has at most one Rotation Setting;
 
-Join Role is independent where
-	Join Node includes at least one Role,
-	Role connects to Join Node;
-
-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 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,
-	Join Role is incidentally involved in at most one Join Step;
-is anti Join Step;
-Join Step is outer;
-
 Model Note Shape is a kind of Shape;
 Model Note Shape is for one Context Note;
 
+ORM Diagram is a kind of Diagram;
+Shape is in one ORM Diagram,
+	ORM Diagram includes Shape;
+
 Object Type is a kind of Concept identified by Vocabulary and Name [partitioned] where
 	Object Type belongs to one Vocabulary,
 	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 uses at most one Pronoun;
 Object Type plays Role,
 	Role is played by one Object Type;
 Object Type is independent;
+Variable is for one Object Type,
+	Object Type is referenced in Variable;
 
 Object Type Shape is a kind of Shape;
 Object Type Shape is for one Object Type,
 	Object Type has Object Type Shape;
 Object Type Shape has expanded reference mode;
 
-Objectified Fact Type Name Shape is a kind of Shape identified by Fact Type Shape where
-	Objectified Fact Type Name Shape is for one Fact Type Shape,
+Objectified Fact Type Name Shape is a kind of Shape;
+Objectified Fact Type Name Shape is for one Fact Type Shape,
 	Fact Type Shape has at most one Objectified Fact Type Name Shape;
 
+Play is where
+	Variable is restricted by Role,
+	Role controls Variable;
+
 Population is a kind of Concept identified by Vocabulary and Name [partitioned] where
 	Vocabulary includes Population,
 	Population belongs to at most one Vocabulary,
@@ -276,8 +288,8 @@ Population includes Instance,
 Population includes Role Value,
 	Role Value belongs to one Population;
 
-Reading Shape is a kind of Shape identified by Fact Type Shape where
-	Fact Type Shape has at most one Reading Shape,
+Reading Shape is a kind of Shape;
+Fact Type Shape has at most one Reading Shape,
 	Reading Shape is for one Fact Type Shape;
 Reading Shape is for one Reading,
 	Reading has Reading Shape;
@@ -298,7 +310,7 @@ Role Ref is where
 	Role is in Role Sequence in one Ordinal place,
 	Role Sequence includes Role in Ordinal place,
 	Role has Ordinal place in Role Sequence;
-Join Role projects at most one Role Ref;
+Play projects at most one Role Ref;
 Role Ref has at most one leading-Adjective;
 Role Ref has at most one trailing-Adjective;
 
@@ -315,6 +327,18 @@ Set Equality Constraint is a kind of Set Comparison Constraint;
 Set Exclusion Constraint is a kind of Set Comparison Constraint;
 Set Exclusion Constraint is mandatory;
 
+Step is identified by input-Play and output-Play where
+	Step has one input-Play,
+	Step has at most one output-Play;
+Step falls under at most one Alternative Set,
+	Alternative Set covers at least one Step;
+Step specifies one Fact Type,
+	Fact Type directs Step;
+Step involves incidental-Play,
+	Play is incidentally involved in at most one Step;
+Step is disallowed;
+Step is optional;
+
 Value Constraint Shape is a kind of Constraint Shape;
 Role Display has at most one Value Constraint Shape,
 	Value Constraint Shape is for at most one Role Display;
@@ -325,43 +349,48 @@ Value Range is identified by minimum-Bound and maximum-Bound where
 	Value Range has at most one minimum-Bound,
 	Value Range has at most one maximum-Bound;
 
-Value Type is a kind of Object Type;
+Allowed Range is where
+	Value Constraint allows Value Range;
+
+Domain Object Type is a kind of Object Type;
+
+Entity Type is a kind of Domain Object Type;
+Entity Type nests at most one Fact Type,
+	Fact Type is nested as at most one Entity Type;
+
+Type Inheritance is a kind of Fact Type identified by Subtype and Supertype where
+	Entity Type (as Subtype) is subtype of super-Entity Type (as Supertype) [acyclic, intransitive],
+	Supertype is supertype of Subtype;
+Assimilation applies to Type Inheritance,
+	Type Inheritance uses at most one Assimilation;
+Type Inheritance provides identification;
+
+Value Type is a kind of Domain Object Type;
+Value is of one Value Type,
+	Value Type has Value;
 Value Type has at most one Length,
 	Length is of Value Type;
 Value Type has at most one Scale,
 	Scale is of Value Type;
+Value Type is auto-assigned at at most one Transaction Timing;
 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, transitive],
 	Supertype is supertype of Value Type;
 
-Allowed Range is where
-	Value Constraint allows at least one Value Range;
-
-Entity Type is a kind of Object Type;
-Entity Type nests at most one Fact Type,
-	Fact Type is nested as at most one Entity Type;
-Entity Type is implied by objectification;
-
 Facet is where
 	Value Type has facet called Name,
 	Name is a facet of Value Type;
+Facet requires value of one facet-Value Type;
 
-Facet Value is where
-	Value Type defines Facet as having one Value,
-	Value for Facet applies to Value Type;
+Facet Restriction is where
+	Value Type applies Facet,
+	Facet applies to Value Type;
+Facet Restriction has one Value;
 
 Implicit Boolean Value Type is a kind of Value Type;
 
-Type Inheritance is a kind of Fact Type identified by Subtype and Supertype where
-	Entity Type (as Subtype) is subtype of super-Entity Type (as Supertype) [acyclic, intransitive],
-	Supertype is supertype of Subtype;
-Assimilation applies to Type Inheritance,
-	Type Inheritance uses at most one Assimilation;
-Type Inheritance provides identification;
-
 /*
  * Constraints:
  */
@@ -374,13 +403,13 @@ for each Concept exactly one of these holds:
 	Concept is a Constraint,
 	Concept is a Population,
 	Concept is an Unit,
-	Concept is a Join,
+	Concept is a Query,
 	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;
-either Object Type is an Entity Type or Object Type is a Value Type but not both;
+either Domain Object Type is a Value Type or Domain Object Type is an Entity Type but not both;
 for each Role Sequence exactly one of these holds:
 	Role Sequence is for Reading,
 	Presence Constraint covers Role Sequence,
@@ -392,44 +421,45 @@ either Set Constraint is a Set Comparison Constraint or Set Constraint is a Subs
 either Unit uses coefficient from Ephemera URL or Unit has Coefficient but not both;
 either Unit is fundamental or Unit is derived from base-Unit but not both;
 either Value Constraint Shape is for Object Type Shape or Value Constraint Shape is for Role Display but not both;
+either Value Constraint allows Value Range or Value Constraint requires matching Regular Expression but not both;
 either Value Constraint constrains Value Type or Value Constraint applies to Role but not both;
 for each Instance at most one of these holds:
 	Instance has Value,
 	Instance objectifies Fact;
-for each Join Role at most one of these holds:
-	Join Step (1) has input-Join Role,
-	Join Role is incidentally involved in Join Step;
-for each Join Role at most one of these holds:
-	Join Step (1) has output-Join Role,
-	Join Role is incidentally involved in Join Step;
-Join Node is for Object Type that plays Role
-	if and only if
-	Join Node includes Role;
+for each Play at most one of these holds:
+	Step (1) has input-Play,
+	Play is incidentally involved in Step;
+for each Play at most one of these holds:
+	Step (1) has output-Play,
+	Play is incidentally involved in Step;
 Role Value is of Instance that is of Object Type
 	if and only if
 	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 that belongs to Fact Type;
-Entity Type is implied by objectification
-	only if Entity Type nests Fact Type;
+Variable is for Object Type that plays Role
+	if and only if
+	Variable is restricted by Role;
 Presence Constraint is preferred identifier
 	only if Presence Constraint has max Frequency;
+Step involves incidental Play
+	only if Step has output Play;
 Value Type has Scale
 	only if Value Type has Length;
 either Agreement was reached by Agent or Agreement was on Date;
-each combination Diagram, Position occurs at most one time in
-	Shape is in Diagram,
-	Shape is at Position;
 each combination Entity Type(1), Type Inheritance occurs at most one time in
 	Entity Type(1) is subtype of super Entity Type(2),
 	Type Inheritance provides identification;
+each combination ORM Diagram, Location occurs at most one time in
+	Shape is in ORM Diagram,
+	Shape is at Location;
 each Presence Constraint occurs at least one time in
 	Presence Constraint has min Frequency(2),
 	Presence Constraint has max Frequency(1),
 	Presence Constraint is mandatory;
 each Role Ref occurs at most one time in
-	Join Role projects Role Ref;
+	Play projects Role Ref;
 each Role Sequence occurs at least one time in
 	Role Sequence in Ordinal position includes Role;
 each Set Comparison Constraint occurs at least 2 times in