activefacts-compositions 1.9.15 → 1.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bf118df915877ab33968a6777b33a62cf37324
-  data.tar.gz: bd5400584518e29d8bdefc7caf593379805a6e35
+  metadata.gz: 1f365db9787609b86e8184f61d9fc4c2d0b6e76e
+  data.tar.gz: 66f3cd28bbd6eeadb7a9ee48fb1afd2774697193
 SHA512:
-  metadata.gz: 2012ef677cea2524ef6ff02df61e07af2822faad359ae4975f375ab374760db27d0ba981064969a55fabfcc13d2d24ec690b620f7c93281fded26764cf2f98f3
-  data.tar.gz: 30771fd537a8249d6f12f4c197eb1925e73cc2dc41222c6cc381591895216902bd7b479da6176309eae85eb8021ab7dd506701cd8429dfbcc82c7a08b905173d
+  metadata.gz: 1b8237ff0549bd7d36c8c8bcae1ad5272a3d13357c61ae4b7bcd4f9c1cd6c88bc46525844128d472231034c4df2c999230c7e964eee40a730515549ab94d2fcc
+  data.tar.gz: 8057016adea612072f44aa65a84496d6e80660394ae9199157868475dca6e9a39ed96679c0b71cc62408f3a964bca2ebe9fbc1511d4fbb1b8fda9aeeeed81143

data/.gitignore

@@ -14,3 +14,4 @@
 *.diff
 actual
 .byebug_history
+log

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 this_file = File.absolute_path(__FILE__)
-if this_file =~ %r{\A#{ENV['HOME']}}i
+if this_file =~ %r{\A#{ENV['HOME']}}i and !ENV['USE_INSTALLED']
   dir = File.dirname(File.dirname(this_file))
   $stderr.puts "Using work area gems in #{dir} from activefacts-compositions"
   gem 'activefacts-api', path: dir+'/api'

data/activefacts-compositions.gemspec

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

data/lib/activefacts/compositions/compositor.rb

@@ -20,9 +20,6 @@ module ActiveFacts
 
       def self.options
         {
-        #  source: ['Boolean', "Generate composition for source schema"],
-        #  target: ['Boolean', "Generate composition for target schema"],
-        #  transform: ['Boolean', "Generate composition for transform schema"]
         }
       end
 
@@ -50,16 +47,11 @@ module ActiveFacts
         populate_references
       end
 
-    private
-      # Preferred identifiers are cached, but the process produces trace output
-      # that appears in the "tutti" mode used in testing. This precludes that.
-      def preload_preferred_identifiers
-        @constellation.EntityType.map{|k, et| et.preferred_identifier }
-      end
+      def populate_reference role
+        return if (@reference_populated ||= {})[role]
+        @reference_populated[role] = true
 
-      def populate_reference object_type, role
         parent = @binary_mappings[role.object_type]
-
         return if role.fact_type.all_role.size > 2
         if role.fact_type.all_role.size != 1
           counterpart = role.counterpart
@@ -97,9 +89,18 @@ module ActiveFacts
             )
           @component_by_fact[role.fact_type] = a  # For completeness, in case a subclass uses it
         end
+        @reference_populated[role] = a
         trace :binarize, "Populating #{a.inspect}"
       end
 
+    private
+
+      # Preferred identifiers are cached, but the process produces trace output
+      # that appears in the "tutti" mode used in testing. This precludes that.
+      def preload_preferred_identifiers
+        @constellation.EntityType.map{|k, et| et.preferred_identifier }
+      end
+
       def populate_references
         # A table of Mappings by object type, with a default Mapping for each:
         @binary_mappings = Hash.new do |h, object_type|
@@ -124,7 +125,7 @@ module ActiveFacts
               # Exclude base roles in objectified fact types (unless unary); just use link fact types
               next if role.fact_type.entity_type && role.fact_type.all_role.size != 1
               next if role.variable   # REVISIT: Continue to ignore roles in derived fact types?
-              populate_reference object_type, role
+              populate_reference role
             end
             if object_type.is_a?(ActiveFacts::Metamodel::ValueType)
               # This requires a change in the metamodel to use TypeInheritance for ValueTypes
@@ -198,6 +199,7 @@ module ActiveFacts
         end
       end
 
+    public
       # Display the primitive binary mapping:
       def show_references
         trace :composition, "Displaying the mappings:" do

data/lib/activefacts/compositions/datavault.rb

@@ -6,10 +6,14 @@
 # Copyright (c) 2015 Clifford Heath. Read the LICENSE file.
 #
 require "activefacts/compositions/relational"
+require "activefacts/compositions/traits/datavault"
 
 module ActiveFacts
   module Compositions
     class DataVault < Relational
+      extend Traits::DataVault
+      include Traits::DataVault
+
       BDV_ANNOTATIONS = /same as link|hierarchy link|computed link|exploration link|computed satellite|point in time|bridge/
       BDV_LINK_ANNOTATIONS = /same as link|hierarchy link|computed link|exploration link/
       BDV_SAT_ANNOTATIONS = /computed satellite/
@@ -18,9 +22,9 @@ module ActiveFacts
 
     public
       def self.options
-        {
+        datavault_options.
+        merge({
           reference: ['Boolean', "Emit the reference (static) tables as well. Default is to omit them"],
-          datestamp: ['String', "Use this data type for date stamps"],
           id: ['String', "Append this to data vault surrogate keys (default HID)"],
           hubname: ['String', "Suffix or pattern for naming hub tables. Include a + to insert the name. Default 'HUB'"],
           linkname: ['String', "Suffix or pattern for naming link tables. Include a + to insert the name. Default 'LINK'"],
@@ -28,14 +32,15 @@ module ActiveFacts
           pitname: ['String', "Suffix or pattern for naming point in time tables. Include a + to insert the name. Default 'PIT'"],
           bridgename: ['String', "Suffix or pattern for naming bridge tables. Include a + to insert the name. Default 'BRIDGE'"],
           refname: ['String', "Suffix or pattern for naming reference tables. Include a + to insert the name. Default '+'"],
-        }.merge(Relational.options).
+        }).
+        merge(Relational.options).
         reject{|k,v| [:surrogates].include?(k) }  # Datavault surrogates are not optional
       end
 
       def initialize constellation, name, options = {}
         # Extract recognised options:
+        datavault_initialize options
         @option_reference = options.delete('reference')
-        @option_datestamp = options.delete('datestamp')
         @option_id = ' ' + (options.delete('id') || 'HID')
         @option_hub_name = options.delete('hubname') || 'HUB'
         @option_hub_name.sub!(/^/,'+ ') unless @option_hub_name =~ /\+/
@@ -288,7 +293,7 @@ module ActiveFacts
         mapped_to
       end
 
-      def devolve_all
+      def apply_schema_transformations
         delete_reference_table_foreign_keys
 
         # For each hub and link, move each non-identifying member
@@ -298,7 +303,7 @@ module ActiveFacts
         end
 
         # Rename parents for rdv and bdv
-        rename_parents
+        apply_composite_name_pattern
 
         # inject datetime and record source for rdv hubs and links
         inject_all_datetime_recordsource
@@ -690,7 +695,7 @@ module ActiveFacts
         pattern.sub(/\+/, name)
       end
 
-      def rename_parents
+      def apply_composite_name_pattern
         @reference_composites.each do |composite|
           composite.mapping.name = apply_name(@option_ref_name, composite.mapping.name)
         end

data/lib/activefacts/compositions/relational.rb

@@ -55,7 +55,8 @@ module ActiveFacts
           # Traverse the absorbed objects to build the path to each required column, including foreign keys:
           absorb_all_columns
 
-          devolve_all
+          # Once the basic structure has been decided, we can play with it
+          apply_schema_transformations
 
           # Populate the target fields of foreign keys
           complete_foreign_keys
@@ -72,8 +73,8 @@ module ActiveFacts
       end
 
       def make_candidates
-        @candidates = @binary_mappings.inject({}) do |hash, (absorption, mapping)|
-          hash[mapping.object_type] = Candidate.new(self, mapping)
+        @candidates = @binary_mappings.inject(@candidates || {}) do |hash, (absorption, mapping)|
+          hash[mapping.object_type] ||= Candidate.new(self, mapping)
           hash
         end
       end
@@ -407,64 +408,6 @@ module ActiveFacts
         return true
       end
 
-      #
-      # Datetime and recordsource functions defined here because they are used in both Staging and Datavault subclasses
-      #
-      def inject_datetime_recordsource mapping
-        # Add a load DateTime value
-        date_field = @constellation.ValidFrom(:new,
-          parent: mapping,
-          name: "Load"+datestamp_type_name,
-          object_type: datestamp_type
-        )
-
-        # Add a load DateTime value
-        recsrc_field = @constellation.ValueField(:new,
-          parent: mapping,
-          name: "RecordSource",
-          object_type: recordsource_type
-        )
-        mapping.re_rank
-        date_field
-      end
-
-      def datestamp_type_name
-        @datestamp_type_name ||= begin
-          [true, '', 'true', 'yes', nil].include?(t = @option_datestamp) ? 'DateTime' : t
-        end
-      end
-
-      def datestamp_type
-        @datestamp_type ||= begin
-          vocabulary = @composition.all_composite.to_a[0].mapping.object_type.vocabulary
-          @constellation.ObjectType[[[vocabulary.name], datestamp_type_name]] or
-            @constellation.ValueType(
-              vocabulary: vocabulary,
-              name: datestamp_type_name,
-              concept: [:new, :implication_rule => "datestamp injection"]
-            )
-        end
-      end
-
-      def recordsource_type_name
-        @recordsource_type_name ||= begin
-          [true, '', 'true', 'yes', nil].include?(t = @option_recordsource) ? 'String' : t
-        end
-      end
-
-      def recordsource_type
-        @recordsource_type ||= begin
-          vocabulary = @composition.all_composite.to_a[0].mapping.object_type.vocabulary
-          @constellation.ObjectType[[[vocabulary.name], recordsource_type_name]] or
-            @constellation.ValueType(
-              vocabulary: vocabulary,
-              name: recordsource_type_name,
-              concept: [:new]
-            )
-        end
-      end
-
-
       def clean_unused_mappings
         @candidates.keys.to_a.each do |object_type|
           candidate = @candidates[object_type]
@@ -556,20 +499,7 @@ module ActiveFacts
       end
 
       # Overwritten by Staging and Datavault subclasses
-      def devolve_all
-      end
-
-      #
-      # Rename parents functions defined because they are used in both Staging and Datavault subclasses
-      #
-      def apply_name pattern, name
-        pattern.sub(/\+/, name)
-      end
-
-      def rename_parents
-        @composites.each do |key, composite|
-          composite.mapping.name = apply_name(@option_stg_name, composite.mapping.name)
-        end
+      def apply_schema_transformations
       end
 
       # This member is an Absorption. Process it recursively, absorbing all its members or just a key

data/lib/activefacts/compositions/staging.rb

@@ -6,25 +6,40 @@
 # Copyright (c) 2016 Graeme Port. Read the LICENSE file.
 #
 require "activefacts/compositions/relational"
+require "activefacts/compositions/traits/datavault"
 
 module ActiveFacts
   module Compositions
     class Staging < Relational
+      extend Traits::DataVault
+      include Traits::DataVault
     public
       def self.options
-        {
+        datavault_options.
+        merge({
           stgname: ['String', "Suffix or pattern for naming staging tables. Include a + to insert the name. Default 'STG'"],
-        }.merge(Relational.options).
+        }).
+        merge(Relational.options).
         reject{|k,v| [:surrogates].include?(k) }
       end
 
       def initialize constellation, name, options = {}
         # Extract recognised options:
+        datavault_initialize options
         @option_stg_name = options.delete('stgname') || 'STG'
         @option_stg_name.sub!(/^/,'+ ') unless @option_stg_name =~ /\+/
 
         super constellation, name, options, 'Staging'
+      end
+
+      def generate
+        create_loadbatch if @option_loadbatch
+        super
+      end
 
+      def inject_value_fields
+        super
+        inject_loadbatch_relationships
       end
 
       def inject_all_datetime_recordsource
@@ -33,15 +48,16 @@ module ActiveFacts
 
         trace :staging, "Injecting load datetime and record source" do
           @composition.all_composite.each do |composite|
+            next if composite.mapping.object_type.name == @option_loadbatch
             inject_datetime_recordsource composite.mapping
             composite.mapping.re_rank
           end
         end
       end
 
-      def devolve_all
+      def apply_schema_transformations
         # Rename composites with STG prefix
-        rename_parents
+        apply_composite_name_pattern
 
         inject_all_datetime_recordsource
       end

data/lib/activefacts/compositions/traits/datavault.rb

@@ -0,0 +1,115 @@
+module ActiveFacts
+  module Compositions
+    module Traits
+      module DataVault
+        def datavault_options
+          {
+            datestamp: ['String', "Data type name to use for data vault date stamps (default: DateTime)"],
+            recordsource: ['String', "Data type name to use for data vault record source (default: String)"],
+            loadbatch: ['String', "Create a load batch table using this name, default LoadBatch"],
+          }
+        end
+
+        def datavault_initialize options
+          @option_datestamp = options.delete('datestamp')
+          @option_datestamp = 'DateTime' if [true, '', 'true', 'yes', nil].include?(@option_datestamp)
+          @option_recordsource = options.delete('recordsource')
+          @option_recordsource = 'String' if [true, '', 'true', 'yes', nil].include?(@option_recordsource)
+          @option_loadbatch = options.delete('loadbatch')
+          @option_loadbatch = 'LoadBatch' if [true, '', 'true', 'yes'].include?(@option_loadbatch)
+        end
+
+        def create_loadbatch
+          vocabulary = @constellation.Vocabulary.values[0]
+
+          schema_text = %Q{
+            schema #{vocabulary.name};
+
+            each #{@option_loadbatch} ID is written as an Auto Counter auto-assigned at commit;
+            each #{@option_loadbatch} is independent identified by its ID;
+            each #{@option_datestamp} is written as a #{@option_datestamp};
+            #{@option_loadbatch} began at one start-#{@option_datestamp};
+          }
+          @compiler = ActiveFacts::CQL::Compiler.new(@vocabulary, constellation: @constellation)
+          @compiler.compile(schema_text)
+          @loadbatch_entity_type = @constellation.EntityType[[vocabulary.identifying_role_values, @option_loadbatch]]
+        end
+
+        def inject_loadbatch_relationships
+          @composition.all_composite.each do |composite|
+            next if composite.mapping.object_type.name == @option_loadbatch
+            @compiler.compile("#{composite.mapping.name} was loaded in one #{@option_loadbatch};")
+          end
+          @loadbatch_entity_type.all_role.each do |role|
+            populate_reference role
+            populate_reference role.counterpart
+          end
+        end
+
+        def inject_datetime_recordsource mapping
+          # Add a load DateTime value
+          date_field = @constellation.ValidFrom(:new,
+            parent: mapping,
+            name: "LoadTime",
+            object_type: datestamp_type
+          )
+
+          # Add a load DateTime value
+          recsrc_field = @constellation.ValueField(:new,
+            parent: mapping,
+            name: "RecordSource",
+            object_type: recordsource_type
+          )
+          mapping.re_rank
+          date_field
+        end
+
+        def datestamp_type_name
+          @option_datestamp
+        end
+
+        def datestamp_type
+          @datestamp_type ||= begin
+            vocabulary = @composition.all_composite.to_a[0].mapping.object_type.vocabulary
+            @constellation.ObjectType[[[vocabulary.name], datestamp_type_name]] or
+              @constellation.ValueType(
+                vocabulary: vocabulary,
+                name: datestamp_type_name,
+                concept: [:new, :implication_rule => "datestamp injection"]
+              )
+          end
+        end
+
+        def recordsource_type_name
+          @option_recordsource
+        end
+
+        def recordsource_type
+          @recordsource_type ||= begin
+            vocabulary = @composition.all_composite.to_a[0].mapping.object_type.vocabulary
+            @constellation.ObjectType[[[vocabulary.name], recordsource_type_name]] or
+              @constellation.ValueType(
+                vocabulary: vocabulary,
+                name: recordsource_type_name,
+                concept: [:new]
+              )
+          end
+        end
+
+        #
+        # Rename parents functions defined because they are used in both Staging and Datavault subclasses
+        #
+        def apply_name_pattern pattern, name
+          pattern.sub(/\+/, name)
+        end
+
+        def apply_composite_name_pattern
+          @composites.each do |key, composite|
+            next if composite.mapping.object_type.name == @option_loadbatch
+            composite.mapping.name = apply_name_pattern(@option_stg_name, composite.mapping.name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/activefacts/compositions/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Compositions
-    VERSION = "1.9.15"
+    VERSION = "1.9.16"
   end
 end

data/lib/activefacts/generator/sql/mysql.rb

@@ -0,0 +1,206 @@
+#
+#       ActiveFacts MySQL Schema Generator
+#
+# Copyright (c) 2009-2016 Clifford Heath. Read the LICENSE file.
+#
+# Reserved words gathered from:
+# https://dev.mysql.com/doc/refman/5.7/en/keywords.html
+#
+require 'digest/sha1'
+require 'activefacts/metamodel'
+require 'activefacts/compositions'
+require 'activefacts/generator/sql'
+
+module ActiveFacts
+  module Generators
+    # Options are comma or space separated:
+    # * underscore 
+    class SQL
+      class MySQL < SQL
+        def self.options
+          super.merge({
+            # no: [String, "no new options defined here"]
+          })
+        end
+
+        def table_name_max
+          64
+        end
+
+        def data_type_context
+          MySQLDataTypeContext.new
+        end
+
+        def auto_assign_modifier
+          ' AUTO_INCREMENT'
+        end
+
+        def generate_schema
+          ''
+        end
+
+        def normalise_type(type_name, length, value_constraint, options)
+          type = MM::DataType.normalise(type_name)
+          case type
+          when MM::DataType::TYPE_Integer
+            if aa = options[:auto_assign]
+              'BIGINT'
+            else
+              super
+            end
+          when MM::DataType::TYPE_Money;    ['DECIMAL', length]
+          when MM::DataType::TYPE_DateTime; 'DATETIME'
+          when MM::DataType::TYPE_Timestamp;'DATETIME'
+          when MM::DataType::TYPE_Binary;
+            if type_name =~ /^(guid|uuid)$/i && (!length || length == 16)
+              if ![nil, ''].include?(options[:auto_assign])
+                options[:default] = " DEFAULT UNHEX(REPLACE(UUID(),'-',''))"
+                options.delete(:auto_assign)  # Don't auto-assign foreign keys
+              end
+              return ['BINARY', 16]
+            end
+
+            super type_name, length, value_constraint, options
+            # MySQL has various non-standard blob types also
+          else
+            super
+          end
+        end
+
+        # Reserved words cannot be used anywhere without quoting.
+        # Keywords have existing definitions, so should not be used without quoting.
+        # Both lists here are added to the supertype's lists
+        def reserved_words
+          @mysql_reserved_words ||= %w{
+            ACCESSIBLE ANALYZE CHANGE DATABASE DATABASES DAY_HOUR
+            DAY_MICROSECOND DAY_MINUTE DAY_SECOND DELAYED DISTINCTROW
+            DIV DUAL ENCLOSED ESCAPED EXPLAIN FLOAT4 FLOAT8 FORCE
+            FULLTEXT HIGH_PRIORITY HOUR_MICROSECOND HOUR_MINUTE
+            HOUR_SECOND INDEX INFILE INT1 INT2 INT3 INT4 INT8
+            IO_AFTER_GTIDS IO_BEFORE_GTIDS KEYS KILL LINEAR LINES
+            LOAD LOCK LONG LONGBLOB LONGTEXT LOW_PRIORITY MASTER_BIND
+            MASTER_SSL_VERIFY_SERVER_CERT MEDIUMBLOB MEDIUMINT
+            MEDIUMTEXT MIDDLEINT MINUTE_MICROSECOND MINUTE_SECOND
+            NO_WRITE_TO_BINLOG OPTIMIZE OPTIMIZER_COSTS OPTIONALLY
+            OUTFILE PURGE READ_WRITE REGEXP RENAME REPLACE REQUIRE
+            RLIKE SCHEMAS SECOND_MICROSECOND SEPARATOR SHOW SPATIAL
+            SQL_BIG_RESULT SQL_CALC_FOUND_ROWS SQL_SMALL_RESULT SSL
+            STARTING STORED STRAIGHT_JOIN TERMINATED TINYBLOB TINYINT
+            TINYTEXT UNLOCK UNSIGNED USE UTC_DATE UTC_TIME UTC_TIMESTAMP
+            VARCHARACTER VIRTUAL XOR YEAR_MONTH ZEROFILL _FILENAME
+          }
+          super + @mysql_reserved_words
+        end
+
+        def key_words
+          # These keywords should not be used for columns or tables:
+          @mysql_key_words ||= %w{
+            ACCOUNT AGAINST AGGREGATE ALGORITHM ANALYSE ASCII
+            AUTOEXTEND_SIZE AUTO_INCREMENT AVG_ROW_LENGTH BACKUP
+            BINLOG BLOCK BOOL BTREE BYTE CACHE CHANGED CHANNEL
+            CHARSET CHECKSUM CIPHER CLIENT CODE COLUMN_FORMAT COMMENT
+            COMPACT COMPLETION COMPRESSED COMPRESSION CONCURRENT
+            CONSISTENT CONTEXT CPU DATAFILE DATETIME DEFAULT_AUTH
+            DELAY_KEY_WRITE DES_KEY_FILE DIRECTORY DISABLE DISCARD
+            DISK DUMPFILE DUPLICATE ENABLE ENCRYPTION ENDS ENGINE
+            ENGINES ENUM ERROR ERRORS EVENT EVENTS EXCHANGE EXPANSION
+            EXPIRE EXPORT EXTENDED EXTENT_SIZE FAST FAULTS FIELDS
+            FILE_BLOCK_SIZE FIXED FLUSH FOLLOWS FORMAT GEOMETRY
+            GEOMETRYCOLLECTION GET_FORMAT GRANTS GROUP_REPLICATION
+            HASH HELP HOST HOSTS IDENTIFIED IGNORE_SERVER_IDS INDEXES
+            INITIAL_SIZE INSERT_METHOD INSTALL IO IO_THREAD IPC
+            ISSUER JSON KEY_BLOCK_SIZE LEAVES LESS LINESTRING LIST
+            LOCKS LOGFILE LOGS MASTER MASTER_AUTO_POSITION
+            MASTER_CONNECT_RETRY MASTER_DELAY MASTER_HEARTBEAT_PERIOD
+            MASTER_HOST MASTER_LOG_FILE MASTER_LOG_POS MASTER_PASSWORD
+            MASTER_PORT MASTER_RETRY_COUNT MASTER_SERVER_ID MASTER_SSL
+            MASTER_SSL_CA MASTER_SSL_CAPATH MASTER_SSL_CERT
+            MASTER_SSL_CIPHER MASTER_SSL_CRL MASTER_SSL_CRLPATH
+            MASTER_SSL_KEY MASTER_TLS_VERSION MASTER_USER
+            MAX_CONNECTIONS_PER_HOUR MAX_QUERIES_PER_HOUR MAX_ROWS
+            MAX_SIZE MAX_STATEMENT_TIME MAX_UPDATES_PER_HOUR
+            MAX_USER_CONNECTIONS MEDIUM MEMORY MICROSECOND MIGRATE
+            MIN_ROWS MODE MODIFY MULTILINESTRING MULTIPOINT
+            MULTIPOLYGON MUTEX MYSQL_ERRNO NDB NDBCLUSTER NEVER
+            NODEGROUP NONBLOCKING NO_WAIT NVARCHAR OLD_PASSWORD ONE
+            OWNER PACK_KEYS PAGE PARSER PARSE_GCOL_EXPR PARTITIONING
+            PARTITIONS PASSWORD PHASE PLUGIN PLUGINS PLUGIN_DIR
+            POINT POLYGON PORT PREV PROCESSLIST PROFILE PROFILES
+            PROXY QUARTER QUERY QUICK READ_ONLY REBUILD RECOVER
+            REDOFILE REDO_BUFFER_SIZE REDUNDANT RELAY RELAYLOG
+            RELAY_LOG_FILE RELAY_LOG_POS RELAY_THREAD RELOAD REMOVE
+            REORGANIZE REPAIR REPLICATE_DO_DB REPLICATE_DO_TABLE
+            REPLICATE_IGNORE_DB REPLICATE_IGNORE_TABLE REPLICATE_REWRITE_DB
+            REPLICATE_WILD_DO_TABLE REPLICATE_WILD_IGNORE_TABLE
+            REPLICATION RESET RESUME REVERSE ROTATE ROW_FORMAT RTREE
+            SCHEDULE SERIAL SHARE SHUTDOWN SIGNED SLAVE SLOW SNAPSHOT
+            SOCKET SONAME SOUNDS SQL_AFTER_GTIDS SQL_AFTER_MTS_GAPS
+            SQL_BEFORE_GTIDS SQL_BUFFER_RESULT SQL_CACHE SQL_NO_CACHE
+            SQL_THREAD SQL_TSI_DAY SQL_TSI_HOUR SQL_TSI_MINUTE
+            SQL_TSI_MONTH SQL_TSI_QUARTER SQL_TSI_SECOND SQL_TSI_WEEK
+            SQL_TSI_YEAR STACKED STARTS STATS_AUTO_RECALC
+            STATS_PERSISTENT STATS_SAMPLE_PAGES STATUS STOP STORAGE
+            STRING SUBJECT SUBPARTITION SUBPARTITIONS SUPER SUSPEND
+            SWAPS SWITCHES TABLES TABLESPACE TABLE_CHECKSUM TEMPTABLE
+            TEXT THAN TIMESTAMPADD TIMESTAMPDIFF TRIGGERS TYPES
+            UNDEFINED UNDOFILE UNDO_BUFFER_SIZE UNICODE UNINSTALL
+            UPGRADE USER_RESOURCES USE_FRM VALIDATION VARIABLES
+            WAIT WARNINGS WEEK WEIGHT_STRING X509 XA XID
+          }
+
+          super + @mysql_key_words
+        end
+
+        def go s = ''
+          "#{s};\n\n"
+        end
+
+        def open_escape
+          '`'
+        end
+
+        def close_escape
+          '`'
+        end
+
+        def index_kind(index)
+          ''
+        end
+
+        class MySQLDataTypeContext < SQLDataTypeContext
+          def integer_ranges
+            [
+              ['TINYINT', -2**7, 2**7-1],
+              ['TINYINT UNSIGNED', 0, 2**8-1], 
+              ['MEDIUMINT', -2**23, 2**23-1], 
+            ] + super
+          end
+
+          def boolean_type
+            'BOOLEAN'
+          end
+
+          def valid_from_type
+            'DATETIME'  # The TIMESTAMP type starts in 1970
+          end
+
+          def default_char_type
+            (@unicode ? 'N' : '') +
+            'CHAR'
+          end
+
+          def default_varchar_type
+            (@unicode ? 'N' : '') +
+            'VARCHAR'
+          end
+
+          def date_time_type
+            'DATETIME'
+          end
+        end
+      end
+
+    end
+    publish_generator SQL::MySQL
+  end
+end

data/lib/activefacts/generator/sql/oracle.rb

@@ -0,0 +1,174 @@
+#
+#       ActiveFacts Oracle SQL Schema Generator
+#
+# Copyright (c) 2009-2016 Clifford Heath. Read the LICENSE file.
+#
+# Reserved words gathered from:
+# https://docs.oracle.com/cd/B28359_01/appdev.111/b31231/appb.htm
+#
+require 'digest/sha1'
+require 'activefacts/metamodel'
+require 'activefacts/compositions'
+require 'activefacts/generator/sql'
+
+module ActiveFacts
+  module Generators
+    # Options are comma or space separated:
+    # * underscore 
+    class SQL
+      class Oracle < SQL
+        def self.options
+          super.merge({
+            # no: [String, "no new options defined here"]
+          })
+        end
+
+        def initialize composition, options = {}
+          super(composition, {'tables' => 'shout', 'columns' => 'shout'}.merge(options))
+        end
+
+        def table_name_max
+          30
+        end
+
+        def data_type_context
+          OracleDataTypeContext.new
+        end
+
+        def auto_assign_modifier
+          ' GENERATED BY DEFAULT ON NULL AS IDENTITY'
+        end
+
+        def generate_schema
+          ''
+        end
+
+        def normalise_type(type_name, length, value_constraint, options)
+          type = MM::DataType.normalise(type_name)
+          case type
+          when MM::DataType::TYPE_Integer
+            if aa = options[:auto_assign]
+              'LONGINTEGER'
+            else
+              super
+            end
+          when MM::DataType::TYPE_Money;    'MONEY'
+          when MM::DataType::TYPE_DateTime; 'DATETIME'
+          when MM::DataType::TYPE_Timestamp;'DATETIME'
+          when MM::DataType::TYPE_Binary;
+            if type_name =~ /^(guid|uuid)$/i && (!length || length == 16)
+              if ![nil, ''].include?(options[:auto_assign])
+                options[:default] = " DEFAULT SYS_GUID()"
+                options.delete(:auto_assign)
+              end
+              return ['RAW', 32]
+            end
+            ['LOB', length]
+          else
+            super
+          end
+        end
+
+        # Reserved words cannot be used anywhere without quoting.
+        # Keywords have existing definitions, so should not be used without quoting.
+        # Both lists here are added to the supertype's lists
+        def reserved_words
+          @oracle_reserved_words ||= %w{
+            ACCESS ARRAYLEN AUDIT CLUSTER COMMENT COMPRESS EXCLUSIVE
+            IDENTIFIED INDEX INITIAL LOCK LONG MAXEXTENTS MINUS
+            MODE MODIFY NOAUDIT NOCOMPRESS NOTFOUND NOWAIT OFFLINE
+            ONLINE PCTFREE RAW RENAME RESOURCE ROWID ROWLABEL ROWNUM
+            SHARE SQLBUF SUCCESSFUL SYNONYM SYSDATE UID VALIDATE
+            VARCHAR2
+          }
+          @oracle_plsql_reserved_words ||= %w{
+            ABORT ACCEPT ACCESS ARRAYLEN ASSERT ASSIGN BASE_TABLE
+            BINARY_INTEGER BODY CHAR_BASE CLUSTER CLUSTERS COLAUTH
+            COMPRESS CONSTANT CRASH CURRVAL DATABASE DATA_BASE DBA
+            DEBUGOFF DEBUGON DEFINITION DELAY DELTA DIGITS DISPOSE
+            ELSIF ENTRY EXCEPTION_INIT FORM GENERIC IDENTIFIED INDEX
+            INDEXES LIMITED MINUS MLSLABEL MODE NEXTVAL NOCOMPRESS
+            NUMBER_BASE PACKAGE PCTFREE POSITIVE PRAGMA PRIVATE
+            RAISE RECORD REMR RENAME RESOURCE REVERSE ROWID ROWLABEL
+            ROWNUM ROWTYPE RUN SEPARATE SQLERRM STDDEV SUBTYPE
+            TABAUTH TABLES TASK TERMINATE USE VARCHAR2 VARIANCE
+            VIEWS XOR
+          }
+          super + @oracle_reserved_words
+        end
+
+        def key_words
+          # These keywords should not be used for columns or tables:
+          @oracle_key_words ||= %w{
+            ANALYZE ARCHIVE ARCHIVELOG BACKUP BECOME BLOCK BODY
+            CACHE CANCEL CHANGE CHECKPOINT COMPILE CONTENTS CONTROLFILE
+            DATABASE DATAFILE DBA DISABLE DISMOUNT DUMP ENABLE
+            EVENTS EXCEPTIONS EXPLAIN EXTENT EXTERNALLY FLUSH FORCE
+            FREELIST FREELISTS INITRANS LAYER LISTS LOGFILE MANAGE
+            MANUAL MAXDATAFILES MAXINSTANCES MAXLOGFILES MAXLOGHISTORY
+            MAXLOGMEMBERS MAXTRANS MINEXTENTS MOUNT NOARCHIVELOG
+            NOCACHE NOCYCLE NOMAXVALUE NOMINVALUE NOORDER NORESETLOGS
+            NORMAL NOSORT OPTIMAL OWN PACKAGE PARALLEL PCTINCREASE
+            PCTUSED PLAN PRIVATE PROFILE QUOTA RECOVER RESETLOGS
+            RESTRICTED REUSE ROLES SCN SEGMENT SHARED SNAPSHOT SORT
+            STATEMENT_ID STATISTICS STOP STORAGE SWITCH TABLES
+            TABLESPACE THREAD TRACING TRIGGERS UNLIMITED USE
+          }
+          super + @oracle_key_words
+        end
+
+        def go s = ''
+          "#{s};\n\n"
+        end
+
+        def open_escape
+          '"'
+        end
+
+        def close_escape
+          '"'
+        end
+
+        def index_kind(index)
+          ''
+        end
+
+        class OracleDataTypeContext < SQLDataTypeContext
+          def integer_ranges
+            [
+              ['SHORTINTEGER', -2**15, 2**15-1],  # The standard says -10^5..10^5 (less than 16 bits)
+              ['INTEGER', -2**31, 2**31-1],   # The standard says -10^10..10^10 (more than 32 bits!)
+              ['LONGINTEGER', -2**63, 2**63-1],    # The standard says -10^19..10^19 (less than 64 bits)
+            ]
+          end
+
+          def boolean_type
+            'BOOLEAN'
+          end
+
+          def valid_from_type
+            'TIMESTAMP'
+          end
+
+          # There is no performance benefit in using fixed-length CHAR fields,
+          # and an added burden of trimming the implicitly added white-space
+          def default_char_type
+            (@unicode ? 'N' : '') +
+            'VARCHAR'
+          end
+
+          def default_varchar_type
+            (@unicode ? 'N' : '') +
+            'VARCHAR'
+          end
+
+          def date_time_type
+            'TIMESTAMP'
+          end
+        end
+      end
+
+    end
+    publish_generator SQL::Oracle
+  end
+end

data/lib/activefacts/generator/sql/postgres.rb

@@ -1,7 +1,10 @@
 #
-#       ActiveFacts Standard SQL Schema Generator
+#       ActiveFacts PostgreSQL Schema Generator
 #
-# Copyright (c) 2009-2016 Clifford Heath. Read the LICENSE file.
+# Copyright (c) 2017 Clifford Heath. Read the LICENSE file.
+#
+# Reserved words gathered from:
+# https://www.postgresql.org/docs/9.5/static/sql-keywords-appendix.html
 #
 require 'digest/sha1'
 require 'activefacts/metamodel'
@@ -29,7 +32,7 @@ module ActiveFacts
         end
 
         def data_type_context
-          PostgresqlDataTypeContext.new
+          PostgresDataTypeContext.new
         end
 
         def auto_assign_modifier
@@ -61,8 +64,8 @@ module ActiveFacts
               super
             end
           when MM::DataType::TYPE_Money;    'MONEY'
-          when MM::DataType::TYPE_DateTime; 'DATETIME'
-          when MM::DataType::TYPE_Timestamp;'DATETIME'
+          when MM::DataType::TYPE_DateTime; 'TIMESTAMP'
+          when MM::DataType::TYPE_Timestamp;'TIMESTAMP'
           when MM::DataType::TYPE_Binary;
             if length && length <= 8192
               super
@@ -127,7 +130,7 @@ module ActiveFacts
           ''
         end
 
-        class PostgresqlDataTypeContext < SQLDataTypeContext
+        class PostgresDataTypeContext < SQLDataTypeContext
           def integer_ranges
             super
           end

data/lib/activefacts/generator/sql/server.rb

@@ -1,8 +1,11 @@
 #
-#       ActiveFacts Standard SQL Schema Generator
+#       ActiveFacts SQL Server Schema Generator
 #
 # Copyright (c) 2009-2016 Clifford Heath. Read the LICENSE file.
 #
+# Reserved words gathered from:
+# https://technet.microsoft.com/en-us/library/ms189822(v=sql.110).aspx
+#
 require 'digest/sha1'
 require 'activefacts/metamodel'
 require 'activefacts/compositions'
@@ -32,15 +35,20 @@ module ActiveFacts
           ' IDENTITY'
         end
 
-        def normalise_type(type_name, length, value_constraint)
-          return ['UNIQUEIDENTIFIER', 16] if type_name =~ /^(guid|uuid)$/i
-
+        def normalise_type(type_name, length, value_constraint, options)
           type = MM::DataType.normalise(type_name)
           case type
           when MM::DataType::TYPE_Money;    'MONEY'
           when MM::DataType::TYPE_DateTime; 'DATETIME'
           when MM::DataType::TYPE_Timestamp;'DATETIME'
           when MM::DataType::TYPE_Binary;
+            if type_name =~ /^(guid|uuid)$/i && (!length || length == 16)
+              if ![nil, ''].include?(options[:auto_assign])
+                options[:default] = ' DEFAULT NEWID()'
+                options.delete(:auto_assign)
+              end
+              return 'UNIQUEIDENTIFIER'
+            end
             if length && length <= 8192
               super
             else

data/lib/activefacts/generator/sql.rb

@@ -3,6 +3,10 @@
 #
 # Copyright (c) 2009-2016 Clifford Heath. Read the LICENSE file.
 #
+# Reserved words for various versions of the standard gathered from:
+# http://developer.mimer.se/validator/sql-reserved-words.tml
+# https://www.postgresql.org/docs/9.5/static/sql-keywords-appendix.html
+#
 require 'digest/sha1'
 require 'activefacts/metamodel'
 require 'activefacts/metamodel/datatypes'
@@ -247,7 +251,12 @@ module ActiveFacts
         when MM::DataType::TYPE_DateTime; 'TIMESTAMP'
         when MM::DataType::TYPE_Timestamp;'TIMESTAMP'
         when MM::DataType::TYPE_Binary;
-          length ||= 16 if type_name =~ /^(guid|uuid)$/i
+          if type_name =~ /^(guid|uuid)$/i && (!length || length == 16)
+            length ||= 16
+            if ![nil, ''].include?(options[:auto_assign])
+              options.delete(:auto_assign)  # Don't auto-assign foreign keys
+            end
+          end
           if length
             ['BINARY', length]
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-compositions
 version: !ruby/object:Gem::Version
-  version: 1.9.15
+  version: 1.9.16
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,7 +149,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.19
+        version: 1.9.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.19
+        version: 1.9.20
 - !ruby/object:Gem::Dependency
   name: activefacts-cql
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.9.3
 description: Create and represent composite schemas, schema transforms and data transforms
   over a fact-based model
 email:
@@ -209,6 +209,7 @@ files:
 - lib/activefacts/compositions/names.rb
 - lib/activefacts/compositions/relational.rb
 - lib/activefacts/compositions/staging.rb
+- lib/activefacts/compositions/traits/datavault.rb
 - lib/activefacts/compositions/traits/rails.rb
 - lib/activefacts/compositions/version.rb
 - lib/activefacts/generator.rb
@@ -222,6 +223,8 @@ files:
 - lib/activefacts/generator/rails/schema.rb
 - lib/activefacts/generator/ruby.rb
 - lib/activefacts/generator/sql.rb
+- lib/activefacts/generator/sql/mysql.rb
+- lib/activefacts/generator/sql/oracle.rb
 - lib/activefacts/generator/sql/postgres.rb
 - lib/activefacts/generator/sql/server.rb
 - lib/activefacts/generator/summary.rb