activefacts-compositions 1.9.14 → 1.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5462e874311293e93fc6e63406876290e8dafbe6
-  data.tar.gz: 7f9de00e45fe7e5798d919f7df3e3b185b544b3c
+  metadata.gz: f1bf118df915877ab33968a6777b33a62cf37324
+  data.tar.gz: bd5400584518e29d8bdefc7caf593379805a6e35
 SHA512:
-  metadata.gz: 0c98e0fdca3f53b07bf453dbfdf7848a5f04a4d825f3f13ae90d0312286c5422a5ffc7e3c80d971b447c5ef770e058b5ecaa688c863561a28636f1c6e199fc3d
-  data.tar.gz: 1b950d16fbc463a42f869328e3b8c7acaba1666c2c72f96f2e7a959987f51b4c5e1ad1e0f76a1f8f8e4da4da97a027ea8d25ebcf060fe9db63644761cdf5f06d
+  metadata.gz: 2012ef677cea2524ef6ff02df61e07af2822faad359ae4975f375ab374760db27d0ba981064969a55fabfcc13d2d24ec690b620f7c93281fded26764cf2f98f3
+  data.tar.gz: 30771fd537a8249d6f12f4c197eb1925e73cc2dc41222c6cc381591895216902bd7b479da6176309eae85eb8021ab7dd506701cd8429dfbcc82c7a08b905173d

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.15"
+  spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.19"
   spec.add_runtime_dependency "activefacts-cql", "~> 1", ">= 1.9"
 end

data/bin/schema_compositor

@@ -154,11 +154,14 @@ class SchemaCompositor
             ' num'
           when Pathname
             ' file'
+	  when Array
+	    " { #{type.map(&:to_s)*' | '} }"
           else
             ' str'
           end
 
-        stream.puts "\t#{tag}#{' '*(24-tag.size)}#{description}"
+	spaces = (s = 24-tag.size) < 2 ? 2 : s
+        stream.puts "\t#{tag}#{' '*spaces}#{description}"
       end
     end
   end

data/lib/activefacts/compositions/relational.rb

@@ -37,6 +37,9 @@ module ActiveFacts
           # Figure out how best to absorb things to reduce the number of tables
           optimise_absorption
 
+          # If we have partitioned subtypes, make that happen
+          enact_partitioning
+
           # Actually make a Composite object for each table:
           make_composites
 
@@ -228,6 +231,17 @@ module ActiveFacts
         end
       end
 
+      def enact_partitioning
+        @constellation.EntityType.each do |key, object_type|
+          sti = object_type.all_type_inheritance_as_supertype
+          if sti.size > 0 && sti.size == sti.select{|ti| ti.assimilation == 'partitioned'}.size
+            trace :relational_optimiser, "Supertype #{object_type.name} is fully partitioned so not a table"
+            candidate = @candidates[object_type]
+            candidate.definitely_not_table
+          end
+        end
+      end
+
       # Remove the unused reverse absorptions:
       def delete_reverse_absorptions
         @binary_mappings.each do |object_type, mapping|
@@ -561,11 +575,13 @@ module ActiveFacts
       # This member is an Absorption. Process it recursively, absorbing all its members or just a key
       # depending on whether the absorbed object is a Composite (or absorbed into one) or not.
       def absorb_nested mapping, member, paths
-        # Should we absorb a foreign key or the whole contents?
+        # Is this where we absorb a partitioned supertype?
+        is_partitioned = (ft = member.child_role.fact_type).is_a?(MM::TypeInheritance) && ft.assimilation == 'partitioned'
 
+        # Should we absorb a foreign key or the whole contents?
         child_object_type = member.child_role.object_type
         child_mapping = @binary_mappings[child_object_type]
-        if child_mapping.composite
+        if child_mapping.composite && !is_partitioned
           trace :relational_columns?, "Absorbing FK to #{member.child_role.name} in #{member.inspect_reading}" do
             paths[member] = @constellation.ForeignKey(:new, source_composite: mapping.root, composite: child_mapping.composite, absorption: member)
             absorb_key member, child_mapping, paths
@@ -594,6 +610,7 @@ module ActiveFacts
           return
         end
 
+        # REVISIT: if is_partitioned, don't absorb sibling subtypes!
         trace :relational_columns?, "Absorbing all of #{member.child_role.name} in #{member.inspect_reading}" do
           absorb_all member, child_mapping, paths
         end
@@ -651,7 +668,7 @@ module ActiveFacts
 
         pcs = []
         newpaths = {}
-        if mapping.composite || mapping.full_absorption
+        if mapping.composite || mapping.full_absorption || mapping.parent_role.fact_type.is_a?(MM::TypeInheritance)
           pcs = find_uniqueness_constraints(mapping)
 
           # Don't build an index from the same PresenceConstraint twice on the same composite (e.g. for a subtype)
@@ -676,9 +693,18 @@ module ActiveFacts
           end
         end
 
+        # Delete indexes that accrued no fields:
         newpaths.values.select{|ix| ix.all_index_field.size == 0}.each(&:retract)
       end
 
+      # We include the subtype role of a TypeInheritance if
+      # it provides_identification or the subtype is not partitioned
+      def included_subtype role
+        role == role.fact_type.subtype_role &&
+          !role.object_type.is_partitioned &&
+          role.fact_type.provides_identification
+      end
+
       # Find all PresenceConstraints to index the object in this Mapping
       def find_uniqueness_constraints mapping
         return [] unless mapping.object_type.is_a?(MM::EntityType)
@@ -686,11 +712,11 @@ module ActiveFacts
         start_roles =
             mapping.
             object_type.
-            all_role_transitive.        # Includes objectification roles for objectified fact types
+            all_role.        # Includes objectification roles for objectified fact types
             select do |role|
               (role.is_unique ||                # Must be unique on near role
                 role.fact_type.is_unary) &&     # Or be a unary role
-              !(role.fact_type.is_a?(MM::TypeInheritance) && role == role.fact_type.supertype_role) # allow roles as subtype
+              (!role.fact_type.is_a?(MM::TypeInheritance) || included_subtype(role))
             end.
             map(&:counterpart).         # (Same role if it's a unary)
             compact.                    # Ignore nil counterpart of a role in an n-ary
@@ -750,8 +776,8 @@ module ActiveFacts
         trace :relational_paths?, "Adding #{new_pcs.size} new indices for presence constraints on #{mapping.inspect}" do
           new_pcs.each do |pc|
             newpaths[pc] = index = @constellation.Index(:new, composite: mapping.root, is_unique: true, presence_constraint: pc)
-            if mapping.object_type.preferred_identifier == pc and
-                !@composition.all_full_absorption[mapping.object_type] and
+            if mapping.root.mapping.object_type.preferred_identifier == pc and
+                !@composition.all_full_absorption[mapping.object_type] and  # REVISIT: This clause might now be unnecessary
                 !mapping.root.natural_index
               mapping.root.natural_index = index
               mapping.root.primary_index ||= index    # Not if we have a surrogate already

data/lib/activefacts/compositions/version.rb

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

data/lib/activefacts/generator/rails/schema.rb

@@ -88,6 +88,11 @@ module ActiveFacts
         def generate_composite composite
           ar_table_name = composite.rails.plural_name
 
+          pi = composite.primary_index
+          unless pi
+            warn "Warning: Cannot generate schema for #{composite.mapping.name} because it has no primary key"
+            return nil
+          end
           pk = composite.primary_index.all_index_field.to_a
           if pk[0].component.is_auto_assigned
             identity_column = pk[0].component

data/lib/activefacts/generator/sql.rb

@@ -20,20 +20,34 @@ module ActiveFacts
       def self.options
         {
           delay_fks: ['Boolean', "Delay emitting all foreign keys until the bottom of the file"],
-          underscore: ['String', "Use 'str' instead of underscore between words in table names"],
+          keywords: ['Boolean', "Quote all keywords, not just reserved words"],
+          restrict: ['String', "Restrict generation to tables in the specified group (e.g. bdv, rdv)"],
+          joiner: ['String', "Use 'str' instead of the default joiner between words in table and column names"],
           unicode: ['Boolean', "Use Unicode for all text fields by default"],
-          # datavault: ['String', "Generate 'raw' or 'business' data vault tables"],
-          restrict: ['String', "Restrict generation to tables in the specified group (e.g. bdv, rdv)"]
+          tables: [%w{cap title camel snake shout}, "Case to use for table names"],
+          columns: [%w{cap title camel snake shout}, "Case to use for table names"],
+          # Legacy: datavault: ['String', "Generate 'raw' or 'business' data vault tables"],
         }
       end
 
       def initialize composition, options = {}
         @composition = composition
         @options = options
+        @quote_keywords = {nil=>true, 't'=>true, 'f'=>false, 'y'=>true, 'n'=>false}[options.delete 'keywords']
+        @quote_keywords = false if @keywords == nil  # Set default
         @delay_fks = options.delete "delay_fks"
-        @underscore = options.has_key?("underscore") ? (options['underscore'] || '_') : ''
         @unicode = options.delete "unicode"
         @restrict = options.delete "restrict"
+
+        # Name configuration options:
+        @joiner = options.delete('joiner')
+        @table_joiner = options.has_key?('tables') ? @joiner : nil
+        @table_case = ((options.delete('tables') || 'cap') + 'words').to_sym
+        @table_joiner ||= [:snakewords, :shoutwords].include?(@table_case) ? '_' : ''
+        @column_joiner = options.has_key?('columns') ? @joiner : nil
+        @column_case = ((options.delete('columns') || 'cap') + 'words').to_sym
+        @column_joiner ||= [:snakewords, :shoutwords].include?(@column_case) ? '_' : ''
+
         # Legacy option. Use restrict=bdv/rdv instead
         @datavault = options.delete "datavault"
         case @datavault
@@ -129,7 +143,7 @@ module ActiveFacts
         "\t#{column_name}#{padding}#{column_type leaf, column_name}"
       end
 
-      def auto_assign_type
+      def auto_assign_modifier
         ' GENERATED ALWAYS AS IDENTITY'
       end
 
@@ -138,7 +152,7 @@ module ActiveFacts
         options ||= {}
         length = options[:length]
         value_constraint = options[:value_constraint]
-        type_name, length = normalise_type(type_name, length, value_constraint)
+        type_name, length = normalise_type(type_name, length, value_constraint, options)
 
         "#{
           type_name
@@ -147,7 +161,9 @@ module ActiveFacts
         }#{
           ((options[:mandatory] ? ' NOT' : '') + ' NULL') if options.has_key?(:mandatory)
         }#{
-          auto_assign_type if a = options[:auto_assign] && a != 'assert'
+          options[:default] || ''
+        }#{
+          auto_assign_modifier if a = options[:auto_assign] && a != 'assert'
         }#{
           check_clause(column_name, value_constraint) if value_constraint
         }"
@@ -201,14 +217,20 @@ module ActiveFacts
       end
 
       # Return SQL type and (modified?) length for the passed base type
-      def normalise_type(type_name, length, value_constraint)
+      def normalise_type(type_name, length, value_constraint, options)
         type = MM::DataType.normalise(type_name)
 
         case type
         when MM::DataType::TYPE_Boolean;  data_type_context.boolean_type
         when MM::DataType::TYPE_Integer
-          if type_name =~ /^Auto ?Counter$/i
-            MM::DataType.normalise_int_length('int', data_type_context.default_surrogate_length, value_constraint, data_type_context)[0]
+          # The :auto_assign key is set for auto-assigned types, but with a nil value in foreign keys
+          if options.has_key?(:auto_assign)
+            MM::DataType.normalise_int_length(
+              'int',
+              data_type_context.default_surrogate_length,
+              value_constraint,
+              data_type_context
+            )[0]
           else
             v, = MM::DataType.normalise_int_length(type_name, length, value_constraint, data_type_context)
             v   # The typename here has the appropriate length, don't return a length
@@ -238,50 +260,123 @@ module ActiveFacts
 
       def reserved_words
         @reserved_words ||= %w{
-          ABSOLUTE ACTION ADD AFTER ALL ALLOCATE ALTER AND ANY ARE
-          ARRAY AS ASC ASSERTION AT AUTHORIZATION BEFORE BEGIN
-          BETWEEN BINARY BIT BLOB BOOLEAN BOTH BREADTH BY CALL
-          CASCADE CASCADED CASE CAST CATALOG CHAR CHARACTER CHECK
-          CLOB CLOSE COLLATE COLLATION COLUMN COMMIT CONDITION
-          CONNECT CONNECTION CONSTRAINT CONSTRAINTS CONSTRUCTOR
-          CONTINUE CORRESPONDING CREATE CROSS CUBE CURRENT CURRENT_DATE
-          CURRENT_DEFAULT_TRANSFORM_GROUP CURRENT_TRANSFORM_GROUP_FOR_TYPE
-          CURRENT_PATH CURRENT_ROLE CURRENT_TIME CURRENT_TIMESTAMP
-          CURRENT_USER CURSOR CYCLE DATA DATE DAY DEALLOCATE DEC
-          DECIMAL DECLARE DEFAULT DEFERRABLE DEFERRED DELETE DEPTH
-          DEREF DESC DESCRIBE DESCRIPTOR DETERMINISTIC DIAGNOSTICS
-          DISCONNECT DISTINCT DO DOMAIN DOUBLE DROP DYNAMIC EACH
-          ELSE ELSEIF END EQUALS ESCAPE EXCEPT EXCEPTION EXEC EXECUTE
-          EXISTS EXIT EXTERNAL FALSE FETCH FIRST FLOAT FOR FOREIGN
-          FOUND FROM FREE FULL FUNCTION GENERAL GET GLOBAL GO GOTO
-          GRANT GROUP GROUPING HANDLE HAVING HOLD HOUR IDENTITY IF
-          IMMEDIATE IN INDICATOR INITIALLY INNER INOUT INPUT INSERT
-          INT INTEGER INTERSECT INTERVAL INTO IS ISOLATION JOIN KEY
-          LANGUAGE LARGE LAST LATERAL LEADING LEAVE LEFT LEVEL LIKE
-          LOCAL LOCALTIME LOCALTIMESTAMP LOCATOR LOOP MAP MATCH
-          METHOD MINUTE MODIFIES MODULE MONTH NAMES NATIONAL NATURAL
-          NCHAR NCLOB NESTING NEW NEXT NO NONE NOT NULL NUMERIC
-          OBJECT OF OLD ON ONLY OPEN OPTION OR ORDER ORDINALITY OUT
-          OUTER OUTPUT OVERLAPS PAD PARAMETER PARTIAL PATH PRECISION
-          PREPARE PRESERVE PRIMARY PRIOR PRIVILEGES PROCEDURE PUBLIC
-          READ READS REAL RECURSIVE REDO REF REFERENCES REFERENCING
-          RELATIVE RELEASE REPEAT RESIGNAL RESTRICT RESULT RETURN
-          RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP ROUTINE ROW
-          ROWS SAVEPOINT SCHEMA SCROLL SEARCH SECOND SECTION SELECT
-          SESSION SESSION_USER SET SETS SIGNAL SIMILAR SIZE SMALLINT
-          SOME SPACE SPECIFIC SPECIFICTYPE SQL SQLEXCEPTION SQLSTATE
-          SQLWARNING START STATE STATIC SYSTEM_USER TABLE TEMPORARY
-          THEN TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TO
-          TRAILING TRANSACTION TRANSLATION TREAT TRIGGER TRUE UNDER
-          UNDO UNION UNIQUE UNKNOWN UNNEST UNTIL UPDATE USAGE USER
-          USING VALUE VALUES VARCHAR VARYING VIEW WHEN WHENEVER
-          WHERE WHILE WITH WITHOUT WORK WRITE YEAR ZONE
+          ABS ABSOLUTE ACTION ADD ALL ALLOCATE ALTER AND ANY ARE
+          ARRAY ARRAY_AGG ARRAY_MAX_CARDINALITY AS ASC ASENSITIVE
+          ASSERTION ASYMMETRIC AT ATOMIC AUTHORIZATION AVG BEGIN
+          BEGIN_FRAME BEGIN_PARTITION BETWEEN BIGINT BINARY BIT
+          BIT_LENGTH BLOB BOOLEAN BOTH BY CALL CALLED CARDINALITY
+          CASCADE CASCADED CASE CAST CATALOG CEIL CEILING CHAR
+          CHARACTER CHARACTER_LENGTH CHAR_LENGTH CHECK CLOB CLOSE
+          COALESCE COLLATE COLLATION COLLECT COLUMN COMMIT CONDITION
+          CONNECT CONNECTION CONSTRAINT CONSTRAINTS CONTAINS CONTINUE
+          CONVERT CORR CORRESPONDING COUNT COVAR_POP COVAR_SAMP
+          CREATE CROSS CUBE CUME_DIST CURRENT CURRENT_CATALOG
+          CURRENT_DATE CURRENT_DEFAULT_TRANSFORM_GROUP CURRENT_PATH
+          CURRENT_ROLE CURRENT_ROW CURRENT_SCHEMA CURRENT_TIME
+          CURRENT_TIMESTAMP CURRENT_TRANSFORM_GROUP_FOR_TYPE
+          CURRENT_USER CURSOR CYCLE DATALINK DATE DAY DEALLOCATE
+          DEC DECIMAL DECLARE DEFAULT DEFERRABLE DEFERRED DELETE
+          DENSE_RANK DEREF DESC DESCRIBE DESCRIPTOR DETERMINISTIC
+          DIAGNOSTICS DISCONNECT DISTINCT DLNEWCOPY DLPREVIOUSCOPY
+          DLURLCOMPLETE DLURLCOMPLETEONLY DLURLCOMPLETEWRITE DLURLPATH
+          DLURLPATHONLY DLURLPATHWRITE DLURLSCHEME DLURLSERVER
+          DLVALUE DO DOMAIN DOUBLE DROP DYNAMIC EACH ELEMENT ELSE
+          ELSEIF END END-EXEC END_FRAME END_PARTITION EQUALS ESCAPE
+          EVERY EXCEPT EXCEPTION EXEC EXECUTE EXISTS EXIT EXP
+          EXTERNAL EXTRACT FALSE FETCH FILTER FIRST FIRST_VALUE
+          FLOAT FLOOR FOR FOREIGN FOUND FRAME_ROW FREE FROM FULL
+          FUNCTION FUSION GET GLOBAL GO GOTO GRANT GROUP GROUPING
+          GROUPS HANDLER HAVING HOLD HOUR IDENTITY IF IMMEDIATE
+          IMPORT IN INDICATOR INITIALLY INNER INOUT INPUT INSENSITIVE
+          INSERT INT INTEGER INTERSECT INTERSECTION INTERVAL INTO
+          IS ISOLATION ITERATE JOIN KEY LAG LANGUAGE LARGE LAST
+          LAST_VALUE LATERAL LEAD LEADING LEAVE LEFT LEVEL LIKE
+          LIKE_REGEX LN LOCAL LOCALTIME LOCALTIMESTAMP LOOP LOWER
+          MATCH MAX MAX_CARDINALITY MEMBER MERGE METHOD MIN MINUTE
+          MOD MODIFIES MODULE MONTH MULTISET NAMES NATIONAL NATURAL
+          NCHAR NCLOB NEW NEXT NO NONE NORMALIZE NOT NTH_VALUE NTILE
+          NULL NULLIF NUMERIC OCCURRENCES_REGEX OCTET_LENGTH OF
+          OFFSET OLD ON ONLY OPEN OPTION OR ORDER OUT OUTER OUTPUT
+          OVER OVERLAPS OVERLAY PAD PARAMETER PARTIAL PARTITION
+          PERCENT PERCENTILE_CONT PERCENTILE_DISC PERCENT_RANK
+          PERIOD PORTION POSITION POSITION_REGEX POWER PRECEDES
+          PRECISION PREPARE PRESERVE PRIMARY PRIOR PRIVILEGES
+          PROCEDURE PUBLIC RANGE RANK READ READS REAL RECURSIVE REF
+          REFERENCES REFERENCING REGR_AVGX REGR_AVGY REGR_COUNT
+          REGR_INTERCEPT REGR_R2 REGR_SLOPE REGR_SXX REGR_SXY
+          REGR_SYY RELATIVE RELEASE REPEAT RESIGNAL RESTRICT RESULT
+          RETURN RETURNS REVOKE RIGHT ROLLBACK ROLLUP ROW ROWS
+          ROW_NUMBER SAVEPOINT SCHEMA SCOPE SCROLL SEARCH SECOND
+          SECTION SELECT SENSITIVE SESSION SESSION_USER SET SIGNAL
+          SIMILAR SIZE SMALLINT SOME SPACE SPECIFIC SPECIFICTYPE
+          SQL SQLCODE SQLERROR SQLEXCEPTION SQLSTATE SQLWARNING
+          SQRT START STATIC STDDEV_POP STDDEV_SAMP SUBMULTISET
+          SUBSTRING SUBSTRING_REGEX SUCCEEDS SUM SYMMETRIC SYSTEM
+          SYSTEM_TIME SYSTEM_USER TABLE TABLESAMPLE TEMPORARY THEN
+          TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TO TRAILING
+          TRANSACTION TRANSLATE TRANSLATE_REGEX TRANSLATION TREAT
+          TRIGGER TRIM TRIM_ARRAY TRUE TRUNCATE UESCAPE UNDO UNION
+          UNIQUE UNKNOWN UNNEST UNTIL UPDATE UPPER USAGE USER USING
+          VALUE VALUES VALUE_OF VARBINARY VARCHAR VARYING VAR_POP
+          VAR_SAMP VERSIONING VIEW WHEN WHENEVER WHERE WHILE
+          WIDTH_BUCKET WINDOW WITH WITHIN WITHOUT WORK WRITE XML
+          XMLAGG XMLATTRIBUTES XMLBINARY XMLCAST XMLCOMMENT XMLCONCAT
+          XMLDOCUMENT XMLELEMENT XMLEXISTS XMLFOREST XMLITERATE
+          XMLNAMESPACES XMLPARSE XMLPI XMLQUERY XMLSERIALIZE XMLTABLE
+          XMLTEXT XMLVALIDATE YEAR ZONE
+        }
+      end
+
+      def key_words
+        @key_words ||= %w{
+          A ABSENT ACCORDING ADA ADMIN AFTER ALWAYS ASSIGNMENT
+          ATTRIBUTE ATTRIBUTES BASE64 BEFORE BERNOULLI BLOCKED BOM
+          BREADTH C CATALOG_NAME CHAIN CHARACTERISTICS CHARACTERS
+          CHARACTER_SET_CATALOG CHARACTER_SET_NAME CHARACTER_SET_SCHEMA
+          CLASS_ORIGIN COBOL COLLATION_CATALOG COLLATION_NAME
+          COLLATION_SCHEMA COLUMNS COLUMN_NAME COMMAND_FUNCTION
+          COMMAND_FUNCTION_CODE COMMITTED CONDITION_NUMBER
+          CONNECTION_NAME CONSTRAINT_CATALOG CONSTRAINT_NAME
+          CONSTRAINT_SCHEMA CONSTRUCTOR CONTENT CONTROL CURSOR_NAME
+          DATA DATETIME_INTERVAL_CODE DATETIME_INTERVAL_PRECISION
+          DB DEFAULTS DEFINED DEFINER DEGREE DEPTH DERIVED DISPATCH
+          DOCUMENT DYNAMIC_FUNCTION DYNAMIC_FUNCTION_CODE EMPTY
+          ENCODING ENFORCED EXCLUDE EXCLUDING EXPRESSION FILE FINAL
+          FLAG FOLLOWING FORTRAN FS G GENERAL GENERATED GRANTED HEX
+          HIERARCHY ID IGNORE IMMEDIATELY IMPLEMENTATION INCLUDING
+          INCREMENT INDENT INSTANCE INSTANTIABLE INSTEAD INTEGRITY
+          INVOKER K KEY_MEMBER KEY_TYPE LENGTH LIBRARY LIMIT LINK
+          LOCATION LOCATOR M MAP MAPPING MATCHED MAXVALUE MESSAGE_LENGTH
+          MESSAGE_OCTET_LENGTH MESSAGE_TEXT MINVALUE MORE MUMPS
+          NAME NAMESPACE NESTING NFC NFD NFKC NFKD NIL NORMALIZED
+          NULLABLE NULLS NUMBER OBJECT OCTETS OFF OPTIONS ORDERING
+          ORDINALITY OTHERS OVERRIDING P PARAMETER_MODE PARAMETER_NAME
+          PARAMETER_ORDINAL_POSITION PARAMETER_SPECIFIC_CATALOG
+          PARAMETER_SPECIFIC_NAME PARAMETER_SPECIFIC_SCHEMA PASCAL
+          PASSING PASSTHROUGH PATH PERMISSION PLACING PLI PRECEDING
+          RECOVERY REPEATABLE REQUIRING RESPECT RESTART RESTORE
+          RETURNED_CARDINALITY RETURNED_LENGTH RETURNED_OCTET_LENGTH
+          RETURNED_SQLSTATE RETURNING ROLE ROUTINE ROUTINE_CATALOG
+          ROUTINE_NAME ROUTINE_SCHEMA ROW_COUNT SCALE SCHEMA_NAME
+          SCOPE_CATALOG SCOPE_NAME SCOPE_SCHEMA SECURITY SELECTIVE
+          SELF SEQUENCE SERIALIZABLE SERVER SERVER_NAME SETS SIMPLE
+          SOURCE SPECIFIC_NAME STANDALONE STATE STATEMENT STRIP
+          STRUCTURE STYLE SUBCLASS_ORIGIN T TABLE_NAME TIES TOKEN
+          TOP_LEVEL_COUNT TRANSACTIONS_COMMITTED TRANSACTIONS_ROLLED_BACK
+          TRANSACTION_ACTIVE TRANSFORM TRANSFORMS TRIGGER_CATALOG
+          TRIGGER_NAME TRIGGER_SCHEMA TYPE UNBOUNDED UNCOMMITTED
+          UNDER UNLINK UNNAMED UNTYPED URI USER_DEFINED_TYPE_CATALOG
+          USER_DEFINED_TYPE_CODE USER_DEFINED_TYPE_NAME
+          USER_DEFINED_TYPE_SCHEMA VALID VERSION WHITESPACE WRAPPER
+          XMLDECLARATION XMLSCHEMA YES
         }
       end
 
       def is_reserved_word w
         @reserved_word_hash ||=
-          reserved_words.inject({}) do |h,w|
+          ( reserved_words +
+            (@quote_keywords ? key_words : [])).
+          inject({}) do |h,w|
             h[w] = true
             h
           end
@@ -425,11 +520,12 @@ module ActiveFacts
       end
 
       def table_name composite
-        composite.mapping.name.gsub(' ', @underscore)
+        composite.mapping.name.words.send(@table_case)*@table_joiner
       end
 
       def column_name component
-        component.column_name.capcase
+        words = component.column_name.send(@column_case)
+        words*@column_joiner
       end
 
     end

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

@@ -0,0 +1,164 @@
+#
+#       ActiveFacts Standard SQL Schema Generator
+#
+# Copyright (c) 2009-2016 Clifford Heath. Read the LICENSE file.
+#
+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 Postgres < SQL
+        def self.options
+          super.merge({
+            # no: [String, "no new options defined here"]
+          })
+        end
+
+        def initialize composition, options = {}
+          super(composition, {'tables' => 'snake', 'columns' => 'snake'}.merge(options))
+        end
+
+        def table_name_max
+          63
+        end
+
+        def data_type_context
+          PostgresqlDataTypeContext.new
+        end
+
+        def auto_assign_modifier
+          ''
+        end
+
+        def generate_schema
+          go "CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA public"
+        end
+
+        def normalise_type(type_name, length, value_constraint, options)
+          if type_name =~ /^(guid|uuid)$/i
+            if ![nil, ''].include?(options[:auto_assign])
+              options[:default] = " DEFAULT 'gen_random_uuid()'"
+            end
+            return ['UUID']
+          end
+
+          type = MM::DataType.normalise(type_name)
+          case type
+          when MM::DataType::TYPE_Integer
+            if aa = options[:auto_assign]
+              if aa.size > 0
+                'BIGSERIAL'
+              else
+                'BIGINT'
+              end
+            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 length && length <= 8192
+              super
+            else
+              'IMAGE'
+            end
+          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
+          @postgres_reserved_words ||= %w{
+            ANALYSE ANALYZE LIMIT PLACING RETURNING VARIADIC
+          }
+          super + @postgres_reserved_words
+        end
+
+        def key_words
+          # These keywords should not be used for columns or tables:
+          @postgres_key_words ||= %w{
+            ABORT ACCESS AGGREGATE ALSO BACKWARD CACHE CHECKPOINT
+            CLASS CLUSTER COMMENT COMMENTS CONFIGURATION CONFLICT
+            CONVERSION COPY COST CSV DATABASE DELIMITER DELIMITERS
+            DICTIONARY DISABLE DISCARD ENABLE ENCRYPTED ENUM EVENT
+            EXCLUSIVE EXPLAIN EXTENSION FAMILY FORCE FORWARD FUNCTIONS
+            HEADER IMMUTABLE IMPLICIT INDEX INDEXES INHERIT INHERITS
+            INLINE LABEL LEAKPROOF LISTEN LOAD LOCK LOCKED LOGGED
+            MATERIALIZED MODE MOVE NOTHING NOTIFY NOWAIT OIDS
+            OPERATOR OWNED OWNER PARSER PASSWORD PLANS POLICY
+            PREPARED PROCEDURAL PROGRAM QUOTE REASSIGN RECHECK
+            REFRESH REINDEX RENAME REPLACE REPLICA RESET RULE
+            SEQUENCES SHARE SHOW SKIP SNAPSHOT STABLE STATISTICS
+            STDIN STDOUT STORAGE STRICT SYSID TABLES TABLESPACE
+            TEMP TEMPLATE TEXT TRUSTED TYPES UNENCRYPTED UNLISTEN
+            UNLOGGED VACUUM VALIDATE VALIDATOR VIEWS VOLATILE
+          }
+
+          # These keywords cannot be used for type or functions (and should not for columns or tables)
+          @postgres_key_words_func_type ||= %w{
+            GREATEST LEAST SETOF XMLROOT 
+          }
+          super + @postgres_key_words + @postgres_key_words_func_type
+        end
+
+        def go s = ''
+          "#{s};\n\n"
+        end
+
+        def open_escape
+          '"'
+        end
+
+        def close_escape
+          '"'
+        end
+
+        def index_kind(index)
+          ''
+        end
+
+        class PostgresqlDataTypeContext < SQLDataTypeContext
+          def integer_ranges
+            super
+          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::Postgres
+  end
+end

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

@@ -28,7 +28,7 @@ module ActiveFacts
           SQLServerDataTypeContext.new
         end
 
-        def auto_assign_type
+        def auto_assign_modifier
           ' IDENTITY'
         end
 
@@ -51,32 +51,33 @@ module ActiveFacts
           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
-          @reserved_words ||= %w{
-            ADD ALL ALTER AND ANY AS ASC AUTHORIZATION BACKUP BEGIN
-            BETWEEN BREAK BROWSE BULK BY CASCADE CASE CHECK CHECKPOINT
-            CLOSE CLUSTERED COALESCE COLLATE COLUMN COMMIT COMPUTE
-            CONSTRAINT CONTAINS CONTAINSTABLE CONTINUE CONVERT CREATE
-            CROSS CURRENT CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP
-            CURRENT_USER CURSOR DATABASE DBCC DEALLOCATE DECLARE
-            DEFAULT DELETE DENY DESC DISK DISTINCT DISTRIBUTED DOUBLE
-            DROP DUMMY DUMP ELSE END ERRLVL ESCAPE EXCEPT EXEC EXECUTE
-            EXISTS EXIT FETCH FILE FILLFACTOR FOR FOREIGN FREETEXT
-            FREETEXTTABLE FROM FULL FUNCTION GOTO GRANT GROUP HAVING
-            HOLDLOCK IDENTITY IDENTITYCOL IDENTITY_INSERT IF IN INDEX
-            INNER INSERT INTERSECT INTO IS JOIN KEY KILL LEFT LIKE
-            LINENO LOAD NATIONAL NOCHECK NONCLUSTERED NOT NULL NULLIF
-            OF OFF OFFSETS ON OPEN OPENDATASOURCE OPENQUERY OPENROWSET
-            OPENXML OPTION OR ORDER OUTER OVER PERCENT PLAN PRECISION
-            PRIMARY PRINT PROC PROCEDURE PUBLIC RAISERROR READ READTEXT
-            RECONFIGURE REFERENCES REPLICATION RESTORE RESTRICT RETURN
-            REVOKE RIGHT ROLLBACK ROWCOUNT ROWGUIDCOL RULE SAVE SCHEMA
-            SELECT SESSION_USER SET SETUSER SHUTDOWN SOME STATISTICS
-            SYSTEM_USER TABLE TEXTSIZE THEN TO TOP TRAN TRANSACTION
-            TRIGGER TRUNCATE TSEQUAL UNION UNIQUE UPDATE UPDATETEXT
-            USE USER VALUES VARYING VIEW WAITFOR WHEN WHERE WHILE
-            WITH WRITETEXT
+          @sqlserver_reserved_words ||= %w{
+            BACKUP BREAK BROWSE BULK CHECKPOINT CLUSTERED COMPUTE
+            CONTAINSTABLE DATABASE DBCC DENY DISK DISTRIBUTED DUMP
+            ERRLVL FILE FILLFACTOR FREETEXT FREETEXTTABLE HOLDLOCK
+            IDENTITYCOL IDENTITY_INSERT INDEX KILL LINENO LOAD
+            NOCHECK NONCLUSTERED OFF OFFSETS OPENDATASOURCE OPENQUERY
+            OPENROWSET OPENXML PIVOT PLAN PRINT PROC RAISERROR
+            READTEXT RECONFIGURE REPLICATION RESTORE REVERT ROWCOUNT
+            ROWGUIDCOL RULE SAVE SECURITYAUDIT SEMANTICKEYPHRASETABLE
+            SEMANTICSIMILARITYDETAILSTABLE SEMANTICSIMILARITYTABLE
+            SETUSER SHUTDOWN STATISTICS TEXTSIZE TOP TRAN TRY_CONVERT
+            TSEQUAL UNPIVOT UPDATETEXT USE WAITFOR WITHIN GROUP
+            WRITETEXT
           }
+          super + @sqlserver_reserved_words
+        end
+
+        def key_words
+          # These keywords should not be used for columns or tables:
+          @sqlserver_key_words ||= %w{
+            INCLUDE INDEX SQLCA
+          }
+          super + @sqlserver_key_words
         end
 
         def go s = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-compositions
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.15
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-09 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.15
+        version: 1.9.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.15
+        version: 1.9.19
 - !ruby/object:Gem::Dependency
   name: activefacts-cql
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/activefacts/generator/rails/schema.rb
 - lib/activefacts/generator/ruby.rb
 - lib/activefacts/generator/sql.rb
+- lib/activefacts/generator/sql/postgres.rb
 - lib/activefacts/generator/sql/server.rb
 - lib/activefacts/generator/summary.rb
 - lib/activefacts/generator/transgen.rb