activefacts-examples 1.7.2 → 1.8.0

data/rails/models/Metamodel.models

@@ -56,8 +56,11 @@ module Concernz
     included do
       self.primary_key = 'guid'
 
-      # maybe Component belongs to parent-Mapping and Mapping is a kind of Component
-      belongs_to :component_via_mapping, :class_name => 'Component', :foreign_key => :mapping_guid
+      # maybe Component is a Mapping and maybe Mapping is an Absorption and maybe Absorption is matched by reverse-Absorption and Absorption is a kind of Mapping and Mapping is a kind of Component
+      belongs_to :component_via_mapping_absorption_absorption_mapping, :class_name => 'Component', :foreign_key => :absorption_reverse_absorption_guid
+
+      # maybe Component belongs to Mapping and Mapping is a kind of Component
+      belongs_to :component_via_mapping, :class_name => 'Component', :foreign_key => :parent_guid
 
       # maybe Component is a Mapping and maybe Mapping projects Composite and Composite belongs to Composition
       belongs_to :composition_via_mapping_composite, :class_name => 'Composition', :foreign_key => :mapping_composition_guid
@@ -68,20 +71,23 @@ module Concernz
       # maybe Component is a Mapping and maybe Mapping is an Absorption and Absorption traverses to child-Role
       belongs_to :child_role_via_mapping_absorption, :class_name => 'Role', :foreign_key => :absorption_child_role_id
 
-      # maybe Component is a Mapping and maybe Mapping is an Absorption and maybe Absorption is nested under index-Role
-      belongs_to :index_role_via_mapping_absorption, :class_name => 'Role', :foreign_key => :absorption_index_role_id
-
       # maybe Component is a Mapping and maybe Mapping is an Absorption and Absorption traverses from parent-Role
       belongs_to :parent_role_via_mapping_absorption, :class_name => 'Role', :foreign_key => :absorption_parent_role_id
 
       # maybe Component is an Indicator and Indicator indicates Role played
       belongs_to :role_via_indicator, :class_name => 'Role', :foreign_key => :indicator_role_id
 
+      # Component is a Mapping and Mapping is an Absorption and maybe Absorption is matched by reverse-Absorption and maybe Absorption is a kind of Mapping and maybe Mapping is a kind of Component
+      has_one :component_via_mapping_absorption_absorption_mapping, :class_name => 'Component', :foreign_key => :absorption_reverse_absorption_guid, :dependent => :destroy
+
       # Component is a Mapping and maybe Mapping contains Component
-      has_many :members_via_mapping, :class_name => 'Component', :foreign_key => :mapping_guid, :dependent => :destroy
+      has_many :members_via_mapping, :class_name => 'Component', :foreign_key => :parent_guid, :dependent => :destroy
 
       # Component is a Discriminator and Discriminator is involved in Discriminated Role
       has_many :discriminated_roles_via_discriminator, :class_name => 'DiscriminatedRole', :foreign_key => :discriminator_guid, :dependent => :destroy
+
+      # Component is a Mapping and Mapping is an Absorption and Absorption is involved in Nesting
+      has_many :nestings_via_absorption_mapping, :class_name => 'Nesting', :foreign_key => :absorption_guid, :dependent => :destroy
     end
   end
 end
@@ -337,7 +343,7 @@ module Concernz
       # Fact Type is an instance of Concept
       belongs_to :concept, :foreign_key => :concept_guid
 
-      # maybe Fact Type is nested as Entity Type and Entity Type is a kind of Domain Object Type and Domain Object Type is a kind of Object Type
+      # maybe Fact Type is objectified as Entity Type and Entity Type is a kind of Domain Object Type and Domain Object Type is a kind of Object Type
       belongs_to :object_type_via_entity_type_domain_object_type, :class_name => 'ObjectType', :foreign_key => :entity_type_object_type_id
 
       # maybe Fact Type is a Type Inheritance and Type Inheritance involves Entity Type and Entity Type is a kind of Domain Object Type and Domain Object Type is a kind of Object Type
@@ -369,6 +375,25 @@ module Concernz
   end
 end
 
+module Concernz
+  module Nesting
+    extend ActiveSupport::Concern
+    included do
+      self.primary_key = 'nesting_id'
+
+      # Nesting involves Absorption and Absorption is a kind of Mapping and Mapping is a kind of Component
+      belongs_to :component_via_absorption_mapping, :class_name => 'Component', :foreign_key => :absorption_guid
+
+      # Nesting involves Role
+      belongs_to :index_role, :class_name => 'Role', :foreign_key => :index_role_id
+
+      validates :absorption_guid, :presence => true
+      validates :ordinal, :presence => true
+      validates :index_role_id, :presence => true
+    end
+  end
+end
+
 module Concernz
   module ObjectType
     extend ActiveSupport::Concern
@@ -393,7 +418,7 @@ module Concernz
       # Instance is of Object Type and maybe Instance is an instance of Concept
       has_many :concepts_via_instance, :class_name => 'Concept', :foreign_key => :instance_object_type_id, :dependent => :destroy
 
-      # Object Type is a Domain Object Type and Domain Object Type is an Entity Type and maybe Entity Type nests Fact Type
+      # Object Type is a Domain Object Type and Domain Object Type is an Entity Type and maybe Entity Type objectifies Fact Type
       has_one :fact_type_via_entity_type_domain_object_type, :class_name => 'FactType', :foreign_key => :entity_type_object_type_id, :dependent => :destroy
 
       # Object Type is a Domain Object Type and Domain Object Type is an Entity Type and Entity Type is involved in Type Inheritance and maybe Type Inheritance is a kind of Fact Type
@@ -525,12 +550,12 @@ module Concernz
       # Role is played by Object Type
       belongs_to :object_type, :foreign_key => :object_type_id
 
+      # maybe Role implies Mirror Role and Mirror Role is a kind of Role
+      belongs_to :role_via_mirror_role, :class_name => 'Role', :foreign_key => :mirror_role_id
+
       # Absorption traverses to child-Role and maybe Absorption is a kind of Mapping and maybe Mapping is a kind of Component
       has_many :components_via_mapping_absorption, :class_name => 'Component', :foreign_key => :absorption_child_role_id, :dependent => :destroy
 
-      # maybe Absorption is nested under index-Role and maybe Absorption is a kind of Mapping and maybe Mapping is a kind of Component
-      has_many :components_via_mapping_absorption, :class_name => 'Component', :foreign_key => :absorption_index_role_id, :dependent => :destroy
-
       # Absorption traverses from parent-Role and maybe Absorption is a kind of Mapping and maybe Mapping is a kind of Component
       has_many :components_via_mapping_absorption, :class_name => 'Component', :foreign_key => :absorption_parent_role_id, :dependent => :destroy
 
@@ -549,6 +574,9 @@ module Concernz
       # Role is involved in Discriminated Role
       has_many :discriminated_roles, :class_name => 'DiscriminatedRole', :foreign_key => :role_id, :dependent => :destroy
 
+      # Role is involved in Nesting
+      has_many :nestings, :class_name => 'Nesting', :foreign_key => :index_role_id, :dependent => :destroy
+
       # Role is involved in Play
       has_many :plays, :class_name => 'Play', :foreign_key => :role_id, :dependent => :destroy
 
@@ -561,6 +589,9 @@ module Concernz
       # Role Value is of Role
       has_many :role_values, :class_name => 'RoleValue', :foreign_key => :role_id, :dependent => :destroy
 
+      # Role is a Mirror Role and maybe Mirror Role is for Role
+      has_one :base_role_via_mirror_role, :class_name => 'Role', :foreign_key => :mirror_role_id, :dependent => :destroy
+
       # maybe Role is projected from Variable
       has_one :variable, :class_name => 'Variable', :foreign_key => :projection_id, :dependent => :destroy
 

data/rails/schema/Metamodel.schema.rb

@@ -1,9 +1,9 @@
 #
-# schema.rb auto-generated using ActiveFacts for Metamodel on 2015-10-08
+# schema.rb auto-generated using ActiveFacts for Metamodel on 2015-11-02
 #
 
 ActiveRecord::Base.logger = Logger.new(STDOUT)
-ActiveRecord::Schema.define(:version => 20151008133030) do
+ActiveRecord::Schema.define(:version => 20151102200220) do
   enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')
   create_table "aggregations", :id => false, :force => true do |t|
     t.column "aggregation_id", :primary_key, :null => false
@@ -33,17 +33,18 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
 
   create_table "components", :id => false, :force => true do |t|
     t.column "guid", :uuid, :default => 'gen_random_uuid()', :primary_key => true, :null => false
-    t.column "mapping_guid", :uuid, :null => true
+    t.column "parent_guid", :uuid, :null => true
     t.column "absorption_child_role_id", :integer, :null => true
     t.column "absorption_flattens", :boolean, :null => true
-    t.column "absorption_index_role_id", :integer, :null => true
     t.column "absorption_parent_role_id", :integer, :null => true
+    t.column "absorption_reverse_absorption_guid", :uuid, :null => true
     t.column "indicator_role_id", :integer, :null => true
     t.column "mapping_composition_guid", :uuid, :null => true
     t.column "mapping_object_type_id", :integer, :null => true
     t.column "name", :string, :limit => 64, :null => true
   end
 
+  add_index "components", ["absorption_reverse_absorption_guid"], :name => :index_components_on_absorption_reverse_absorption_guid
 
   create_table "compositions", :id => false, :force => true do |t|
     t.column "guid", :uuid, :default => 'gen_random_uuid()', :primary_key => true, :null => false
@@ -173,6 +174,15 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
   add_index "fact_types", ["type_inheritance_subtype_object_type_id", "type_inheritance_provides_identification"], :name => :index_fact_types_on_type_inheritance_subtype_object_t__04417c92
   add_index "fact_types", ["type_inheritance_subtype_object_type_id", "type_inheritance_supertype_object_type_id"], :name => :index_fact_types_on_type_inheritance_subtype_object_t__9c8eded7
 
+  create_table "nestings", :id => false, :force => true do |t|
+    t.column "nesting_id", :primary_key, :null => false
+    t.column "absorption_guid", :uuid, :null => false
+    t.column "index_role_id", :integer, :null => false
+    t.column "ordinal", :integer, :limit => 16, :null => false
+  end
+
+  add_index "nestings", ["absorption_guid", "ordinal"], :name => :index_nestings_on_absorption_guid_ordinal, :unique => true
+
   create_table "object_types", :id => false, :force => true do |t|
     t.column "object_type_id", :primary_key, :null => false
     t.column "concept_guid", :uuid, :null => false
@@ -229,6 +239,7 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
     t.column "concept_guid", :uuid, :null => false
     t.column "fact_type_concept_guid", :uuid, :null => false
     t.column "link_fact_type_concept_guid", :uuid, :null => true
+    t.column "mirror_role_id", :integer, :null => true
     t.column "object_type_id", :integer, :null => false
     t.column "ordinal", :integer, :limit => 16, :null => false
     t.column "role_name", :string, :limit => 64, :null => true
@@ -237,6 +248,7 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
   add_index "roles", ["concept_guid"], :name => :index_roles_on_concept_guid, :unique => true
   add_index "roles", ["fact_type_concept_guid", "ordinal"], :name => :index_roles_on_fact_type_concept_guid_ordinal, :unique => true
   add_index "roles", ["link_fact_type_concept_guid"], :name => :index_roles_on_link_fact_type_concept_guid
+  add_index "roles", ["mirror_role_id"], :name => :index_roles_on_mirror_role_id
 
   create_table "role_displays", :id => false, :force => true do |t|
     t.column "role_display_id", :primary_key, :null => false
@@ -379,16 +391,15 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
     add_index :allowed_ranges, [:value_range_maximum_bound_value_id], :unique => false, :name => :index_allowed_ranges_on_value_range_maximum_bound_value_id
     add_foreign_key :allowed_ranges, :values, :column => :value_range_minimum_bound_value_id, :primary_key => :value_id, :on_delete => :cascade
     add_index :allowed_ranges, [:value_range_minimum_bound_value_id], :unique => false, :name => :index_allowed_ranges_on_value_range_minimum_bound_value_id
-    add_foreign_key :components, :components, :column => :mapping_guid, :primary_key => :guid, :on_delete => :cascade
-    add_index :components, [:mapping_guid], :unique => false, :name => :index_components_on_mapping_guid
+    add_foreign_key :components, :components, :column => :absorption_reverse_absorption_guid, :primary_key => :guid, :on_delete => :cascade
+    add_foreign_key :components, :components, :column => :parent_guid, :primary_key => :guid, :on_delete => :cascade
+    add_index :components, [:parent_guid], :unique => false, :name => :index_components_on_parent_guid
     add_foreign_key :components, :compositions, :column => :mapping_composition_guid, :primary_key => :guid, :on_delete => :cascade
     add_index :components, [:mapping_composition_guid], :unique => false, :name => :index_components_on_mapping_composition_guid
     add_foreign_key :components, :object_types, :column => :mapping_object_type_id, :primary_key => :object_type_id, :on_delete => :cascade
     add_index :components, [:mapping_object_type_id], :unique => false, :name => :index_components_on_mapping_object_type_id
     add_foreign_key :components, :roles, :column => :absorption_child_role_id, :primary_key => :role_id, :on_delete => :cascade
     add_index :components, [:absorption_child_role_id], :unique => false, :name => :index_components_on_absorption_child_role_id
-    add_foreign_key :components, :roles, :column => :absorption_index_role_id, :primary_key => :role_id, :on_delete => :cascade
-    add_index :components, [:absorption_index_role_id], :unique => false, :name => :index_components_on_absorption_index_role_id
     add_foreign_key :components, :roles, :column => :absorption_parent_role_id, :primary_key => :role_id, :on_delete => :cascade
     add_index :components, [:absorption_parent_role_id], :unique => false, :name => :index_components_on_absorption_parent_role_id
     add_foreign_key :components, :roles, :column => :indicator_role_id, :primary_key => :role_id, :on_delete => :cascade
@@ -435,17 +446,19 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
     add_foreign_key :discriminated_roles, :values, :column => :value_id, :primary_key => :value_id, :on_delete => :cascade
     add_index :discriminated_roles, [:value_id], :unique => false, :name => :index_discriminated_roles_on_value_id
     add_foreign_key :fact_types, :concepts, :column => :concept_guid, :primary_key => :guid, :on_delete => :cascade
-    add_index :fact_types, [:concept_guid], :unique => false, :name => :index_fact_types_on_concept_guid
     add_foreign_key :fact_types, :object_types, :column => :entity_type_object_type_id, :primary_key => :object_type_id, :on_delete => :cascade
     add_foreign_key :fact_types, :object_types, :column => :type_inheritance_subtype_object_type_id, :primary_key => :object_type_id, :on_delete => :cascade
     add_index :fact_types, [:type_inheritance_subtype_object_type_id], :unique => false, :name => :index_fact_types_on_type_inheritance_subtype_object_type_id
     add_foreign_key :fact_types, :object_types, :column => :type_inheritance_supertype_object_type_id, :primary_key => :object_type_id, :on_delete => :cascade
     add_index :fact_types, [:type_inheritance_supertype_object_type_id], :unique => false, :name => :index_fact_types_on_type_inheritance_supertype_object_type_id
+    add_foreign_key :nestings, :components, :column => :absorption_guid, :primary_key => :guid, :on_delete => :cascade
+    add_index :nestings, [:absorption_guid], :unique => false, :name => :index_nestings_on_absorption_guid
+    add_foreign_key :nestings, :roles, :column => :index_role_id, :primary_key => :role_id, :on_delete => :cascade
+    add_index :nestings, [:index_role_id], :unique => false, :name => :index_nestings_on_index_role_id
     add_foreign_key :object_types, :concepts, :column => :concept_guid, :primary_key => :guid, :on_delete => :cascade
     add_foreign_key :object_types, :concepts, :column => :value_type_unit_concept_guid, :primary_key => :guid, :on_delete => :cascade
     add_index :object_types, [:value_type_unit_concept_guid], :unique => false, :name => :index_object_types_on_value_type_unit_concept_guid
     add_foreign_key :object_types, :constraints, :column => :value_type_value_constraint_concept_guid, :primary_key => :concept_guid, :on_delete => :cascade
-    add_index :object_types, [:value_type_value_constraint_concept_guid], :unique => false, :name => :index_object_types_on_value_type_value_constraint_concept_guid
     add_foreign_key :object_types, :object_types, :column => :value_type_supertype_object_type_id, :primary_key => :object_type_id, :on_delete => :cascade
     add_index :object_types, [:value_type_supertype_object_type_id], :unique => false, :name => :index_object_types_on_value_type_supertype_object_type_id
     add_foreign_key :plays, :roles, :column => :role_id, :primary_key => :role_id, :on_delete => :cascade
@@ -455,18 +468,17 @@ ActiveRecord::Schema.define(:version => 20151008133030) do
     add_foreign_key :plays, :variables, :column => :variable_id, :primary_key => :variable_id, :on_delete => :cascade
     add_index :plays, [:variable_id], :unique => false, :name => :index_plays_on_variable_id
     add_foreign_key :populations, :concepts, :column => :concept_guid, :primary_key => :guid, :on_delete => :cascade
-    add_index :populations, [:concept_guid], :unique => false, :name => :index_populations_on_concept_guid
     add_foreign_key :readings, :fact_types, :column => :fact_type_concept_guid, :primary_key => :concept_guid, :on_delete => :cascade
     add_index :readings, [:fact_type_concept_guid], :unique => false, :name => :index_readings_on_fact_type_concept_guid
     add_foreign_key :readings, :role_sequences, :column => :role_sequence_guid, :primary_key => :guid, :on_delete => :cascade
     add_index :readings, [:role_sequence_guid], :unique => false, :name => :index_readings_on_role_sequence_guid
     add_foreign_key :roles, :concepts, :column => :concept_guid, :primary_key => :guid, :on_delete => :cascade
-    add_index :roles, [:concept_guid], :unique => false, :name => :index_roles_on_concept_guid
     add_foreign_key :roles, :fact_types, :column => :link_fact_type_concept_guid, :primary_key => :concept_guid, :on_delete => :cascade
     add_foreign_key :roles, :fact_types, :column => :fact_type_concept_guid, :primary_key => :concept_guid, :on_delete => :cascade
     add_index :roles, [:fact_type_concept_guid], :unique => false, :name => :index_roles_on_fact_type_concept_guid
     add_foreign_key :roles, :object_types, :column => :object_type_id, :primary_key => :object_type_id, :on_delete => :cascade
     add_index :roles, [:object_type_id], :unique => false, :name => :index_roles_on_object_type_id
+    add_foreign_key :roles, :roles, :column => :mirror_role_id, :primary_key => :role_id, :on_delete => :cascade
     add_foreign_key :role_displays, :roles, :column => :role_id, :primary_key => :role_id, :on_delete => :cascade
     add_index :role_displays, [:role_id], :unique => false, :name => :index_role_displays_on_role_id
     add_foreign_key :role_displays, :shapes, :column => :fact_type_shape_guid, :primary_key => :guid, :on_delete => :cascade

data/ruby/Metamodel.rb

@@ -177,8 +177,8 @@ module ::Metamodel
   class Component
     identified_by :guid
     one_to_one :guid, :mandatory => true        # See Guid.component
-    has_one :mapping, :counterpart => :member   # See Mapping.all_member
     has_one :name                               # See Name.all_component
+    has_one :parent, :class => "Mapping", :counterpart => :member  # See Mapping.all_member
   end
 
   class Composition
@@ -268,9 +268,6 @@ module ::Metamodel
     has_one :object_type, :mandatory => true    # See ObjectType.all_mapping
   end
 
-  class Nesting < Mapping
-  end
-
   class PresenceConstraint < Constraint
     maybe :is_mandatory
     maybe :is_preferred_identifier
@@ -323,6 +320,9 @@ module ::Metamodel
     has_one :role, :mandatory => true           # See Role.all_role_value
   end
 
+  class Scoping < Mapping
+  end
+
   class SetConstraint < Constraint
   end
 
@@ -396,10 +396,11 @@ module ::Metamodel
   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 :index_role, :class => Role         # See Role.all_absorption_as_index_role
     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
@@ -473,10 +474,21 @@ module ::Metamodel
   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
+  end
+
   class ORMDiagram < Diagram
   end
 
@@ -615,7 +627,4 @@ module ::Metamodel
     has_one :value, :mandatory => true          # See Value.all_value_type_parameter_restriction
   end
 
-  class ImplicitBooleanValueType < ValueType
-  end
-
 end

data/sql/server/CinemaBookings.sql

@@ -1,5 +1,5 @@
 CREATE TABLE Booking (
-	-- Booking is confirmed Boolean,
+	-- Booking is confirmed,
 	IsConfirmed                             bit NULL,
 	-- Booking involves Number,
 	Number                                  smallint NOT NULL CHECK(Number >= 1),

data/sql/server/CinemaTickets.sql

@@ -32,7 +32,7 @@ CREATE TABLE Booking (
 	SessionTimeMonthNr                      int NOT NULL,
 	-- Booking involves Session and Session involves Session Time and Session Time is in Year and Year has Year Nr,
 	SessionTimeYearNr                       int NOT NULL,
-	-- tickets for Booking have been issued Boolean,
+	-- tickets for Booking have been issued,
 	TicketsForHaveBeenIssued                bit NULL,
 	PRIMARY KEY(BookingNr),
 	UNIQUE(PersonID, SessionCinemaID, SessionTimeYearNr, SessionTimeMonthNr, SessionTimeDay, SessionTimeHour, SessionTimeMinute)
@@ -133,7 +133,7 @@ CREATE TABLE Session (
 	CinemaID                                int NOT NULL,
 	-- Session involves Film and Film has Film ID,
 	FilmID                                  int NOT NULL,
-	-- Session is high-demand Boolean,
+	-- Session is high-demand,
 	IsHighDemand                            bit NULL,
 	-- Session involves Session Time and Session Time is on Day,
 	SessionTimeDay                          int NOT NULL CHECK((SessionTimeDay >= 1 AND SessionTimeDay <= 31)),
@@ -145,7 +145,7 @@ CREATE TABLE Session (
 	SessionTimeMonthNr                      int NOT NULL CHECK((SessionTimeMonthNr >= 1 AND SessionTimeMonthNr <= 12)),
 	-- Session involves Session Time and Session Time is in Year and Year has Year Nr,
 	SessionTimeYearNr                       int NOT NULL CHECK((SessionTimeYearNr >= 1900 AND SessionTimeYearNr <= 9999)),
-	-- Session uses allocated seating Boolean,
+	-- Session uses allocated seating,
 	UsesAllocatedSeating                    bit NULL,
 	PRIMARY KEY(CinemaID, SessionTimeYearNr, SessionTimeMonthNr, SessionTimeDay, SessionTimeHour, SessionTimeMinute),
 	FOREIGN KEY (CinemaID) REFERENCES Cinema (CinemaID),

data/sql/server/CompanyDirectorEmployee.sql

@@ -16,7 +16,7 @@ GO
 CREATE TABLE Company (
 	-- Company is called Company Name,
 	CompanyName                             varchar(48) NOT NULL,
-	-- Company is listed Boolean,
+	-- Company is listed,
 	IsListed                                bit NULL,
 	PRIMARY KEY(CompanyName)
 )
@@ -41,7 +41,7 @@ CREATE TABLE Employee (
 	CompanyName                             varchar(48) NOT NULL,
 	-- Employee has Employee Nr,
 	EmployeeNr                              int NOT NULL,
-	-- maybe Employee is a Manager and Manager is ceo Boolean,
+	-- maybe Employee is a Manager and Manager is ceo,
 	ManagerIsCeo                            bit NULL,
 	-- maybe Employee is supervised by Manager and Manager is a kind of Employee and Employee has Employee Nr,
 	ManagerNr                               int NULL,

data/sql/server/Genealogy.sql

@@ -32,7 +32,7 @@ CREATE TABLE EventType (
 GO
 
 CREATE TABLE Friendship (
-	-- Friendship is confirmed Boolean,
+	-- Friendship is confirmed,
 	IsConfirmed                             bit NULL,
 	-- Friendship involves User and User has User ID,
 	OtherUserID                             int NOT NULL,

data/sql/server/Insurance.sql

@@ -9,7 +9,7 @@ CREATE TABLE Asset (
 	VehicleEngineNumber                     varchar NULL,
 	-- maybe Asset is a Vehicle and maybe Vehicle is subject to finance with Finance Institution and Finance Institution is a kind of Company and Company is a kind of Party and Party has Party ID,
 	VehicleFinanceInstitutionID             int NULL,
-	-- maybe Asset is a Vehicle and Vehicle has commercial registration Boolean,
+	-- maybe Asset is a Vehicle and Vehicle has commercial registration,
 	VehicleHasCommercialRegistration        bit NULL,
 	-- maybe Asset is a Vehicle and Vehicle is of model-Year and Year has Year Nr,
 	VehicleModelYearNr                      int NULL,
@@ -128,9 +128,9 @@ CREATE TABLE CoverWording (
 GO
 
 CREATE TABLE LossType (
-	-- Loss Type involves driving Boolean,
+	-- Loss Type involves driving,
 	InvolvesDriving                         bit NULL,
-	-- Loss Type is single vehicle incident Boolean,
+	-- Loss Type is single vehicle incident,
 	IsSingleVehicleIncident                 bit NULL,
 	-- maybe Loss Type implies Liability and Liability has Liability Code,
 	LiabilityCode                           char(1) NULL CHECK(LiabilityCode = 'D' OR LiabilityCode = 'L' OR LiabilityCode = 'R' OR LiabilityCode = 'U'),
@@ -161,7 +161,7 @@ GO
 CREATE TABLE Party (
 	-- maybe Party is a Company and Company has contact-Person and Person is a kind of Party and Party has Party ID,
 	CompanyContactPersonID                  int NULL,
-	-- Party is a company Boolean,
+	-- Party is a company,
 	IsACompany                              bit NULL,
 	-- Party has Party ID,
 	PartyID                                 int IDENTITY NOT NULL,
@@ -187,7 +187,7 @@ CREATE TABLE Party (
 	PersonGivenName                         varchar(256) NULL,
 	-- maybe Party is a Person and Person has Contact Methods and maybe Contact Methods includes home-Phone and Phone has Phone Nr,
 	PersonHomePhoneNr                       varchar NULL,
-	-- maybe Party is a Person and maybe Person holds License and License is international Boolean,
+	-- maybe Party is a Person and maybe Person holds License and License is international,
 	PersonIsInternational                   bit NULL,
 	-- maybe Party is a Person and maybe Person holds License and License has License Number,
 	PersonLicenseNumber                     varchar NULL,
@@ -368,7 +368,7 @@ CREATE TABLE VehicleIncident (
 	DrivingHospitalName                     varchar NULL,
 	-- Vehicle Incident is involved in Driving and maybe Driving followed Intoxication,
 	DrivingIntoxication                     varchar NULL,
-	-- Vehicle Incident is involved in Driving and maybe Driving is involved in Driving Charge and Driving Charge is a warning Boolean,
+	-- Vehicle Incident is involved in Driving and maybe Driving is involved in Driving Charge and Driving Charge is a warning,
 	DrivingIsAWarning                       bit NULL,
 	-- Vehicle Incident is involved in Driving and maybe Driving was without owners consent for nonconsent-Reason,
 	DrivingNonconsentReason                 varchar NULL,