activefacts-compositions 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca6ad3d9944b1f64ffde699ef36bd7b26764b0e
-  data.tar.gz: 352761a4484292f70eeb90763d7518c892d9a562
+  metadata.gz: dd751029f078742f721c3a77358540eaacb549f1
+  data.tar.gz: f061fe150616c84bc70f169f6151838147b77a95
 SHA512:
-  metadata.gz: ee1a8f1fe902ab61728c16adadedb68fe4bc2b40339d478c9b1d59e27d73c14a57c4d760a6cd61787b3eb0fe86cd9dc24da0c03bcb3609893b62967e4a6bc1bb
-  data.tar.gz: f979de0913251692a2be5c7f115ce9d81fb58147c04af65746fd1e4574723513bd99f877fa0409df316fa8aa94ecf28c37498f6477432ca862d4a912129df761
+  metadata.gz: 128bdf31ffb389014a8cc059f13ee5178b1960615a1ba2bebb9bf304b4920269bf0616f1ecccbbaf5e1f6e49c0485d8bc64523758abab2f244df581eb210ace7
+  data.tar.gz: 4cbde3aa2f0d73b2ddc0f2bb6db69d28c3fb25c4ca91da50797a66e548a224e29a6c02ff1f1ba413970ce82f8ecb04b3fd9bd8b9a278022d6af8d39f490677e2

data/lib/activefacts/compositions/compositor.rb

@@ -100,35 +100,6 @@ module ActiveFacts
         trace :binarize, "Populating #{a.inspect}"
       end
 
-      def find_topic import_role
-        if import = @constellation.Import.values.select{ |import| import.import_role == import_role }.first
-          import.precursor_topic
-        else
-          nil
-        end
-      end
-
-      def build_binary_mappings schema_topic
-        trace :binarize, "Build_binary_mappings for #{schema_topic.topic_name}"
-        if @schema_topics.key?(schema_topic)
-          trace :binarize, "already built, skip"
-          return
-        end
-        @schema_topics[schema_topic] = true
-
-        # add binary mapping for all object types in this schema
-        schema_topic.all_concept.each do |concept|
-          if concept.object_type
-            @binary_mappings[concept.object_type]
-          end
-        end
-
-        # recurse through precursor schemas
-        schema_topic.all_import.each do |import|
-          build_binary_mappings(import.precursor_topic)
-        end
-      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|
@@ -140,46 +111,16 @@ module ActiveFacts
         end
         @component_by_fact = {}
 
-        @schema_topics = {}
-=begin
-        if @option_source || @option_target
-          import_role = @option_source ? 'source' : 'target'
-          trace :binarize, "Build binary bindings for #{import_role} schema" do
-            if schema_topic = find_topic(import_role)
-              build_binary_mappings(schema_topic)
-            else
-              raise "Could not find #{import_role} schema"
-            end
-          end
-        elsif @option_transform
-          trace :binarize, "Build binary bindings for transform schema" do
-            transform_topic = @constellation.Topic.values.select do |topic|
-              nr_importers = @constellation.Import.values.select{|i| i.precursor_topic == topic}.size
-              nr_importers == 0     # This topic is not imported by anything, it's the one
-            end.first
-
-            # add binary mapping for all object types in the transform schema
-            transform_topic.all_concept.each do |concept|
-              if concept.object_type
-                @binary_mappings[concept.object_type]
-              end
-            end
+        trace :binarize, "Build binary bindings for full schema" do
+          @constellation.ObjectType.each do |key, object_type|
+            @binary_mappings[object_type]  # Ensure we create the top Mapping even if it has no references
           end
-        else
-=end
-          trace :binarize, "Build binary bindings for full schema" do
-            @constellation.ObjectType.each do |key, object_type|
-              @binary_mappings[object_type]  # Ensure we create the top Mapping even if it has no references
-            end
-          end
-#        end
+        end
 
         @binary_mappings.each do |object_type, mapping|
           trace :binarize, "Populating possible absorptions for #{object_type.name}" do
 
             object_type.all_role.each do |role|
-              # Exclude fact types not in @schema_topics
-              next if @schema_topics.size > 0 && !@schema_topics.key?(role.fact_type.concept.topic)
               # 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?

data/lib/activefacts/compositions/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Compositions
-    VERSION = "1.9.12"
+    VERSION = "1.9.13"
   end
 end

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

@@ -83,6 +83,18 @@ module ActiveFacts
           "#{s}\nGO\n"
         end
 
+        def open_escape
+          '['
+        end
+
+        def close_escape
+          ']'
+        end
+
+        def index_kind(index)
+          (index.composite_as_primary_index ? ' CLUSTERED' : ' NONCLUSTERED')
+        end
+
         class SQLServerDataTypeContext < SQLDataTypeContext
           def integer_ranges
             [

data/lib/activefacts/generator/sql.rb

@@ -153,6 +153,10 @@ module ActiveFacts
         }"
       end
 
+      def index_kind(index)
+        ''
+      end
+
       def generate_index index, delayed_indices
         nullable_columns =
           index.all_index_field.select do |ixf|
@@ -162,16 +166,14 @@ module ActiveFacts
 
         primary = index.composite_as_primary_index && !contains_nullable_columns
         column_names =
-            index.all_index_field.map do |ixf|
-              column_name(ixf.component)
-            end
-        clustering =
-          (index.composite_as_primary_index ? ' CLUSTERED' : ' NONCLUSTERED')
+          index.all_index_field.map do |ixf|
+            column_name(ixf.component)
+          end
 
         if contains_nullable_columns
           table_name = safe_table_name(index.composite)
           delayed_indices <<
-            'CREATE UNIQUE'+clustering+' INDEX '+
+            'CREATE UNIQUE'+index_kind(index)+' INDEX '+
             escape("#{table_name(index.composite)}By#{column_names*''}", index_name_max) +
             " ON #{table_name}("+column_names.map{|n| escape(n, column_name_max)}*', ' +
             ") WHERE #{
@@ -184,7 +186,7 @@ module ActiveFacts
         else
           '-- '+index.inspect + "\n\t" +
           (primary ? 'PRIMARY KEY' : 'UNIQUE') +
-          clustering +
+          index_kind(index) +
           "(#{column_names.map{|n| escape(n, column_name_max)}*', '})"
         end
       end
@@ -290,6 +292,14 @@ module ActiveFacts
         "#{s};\n\n"
       end
 
+      def open_escape
+        '"'
+      end
+
+      def close_escape
+        '"'
+      end
+
       def escape s, max = table_name_max
         # Escape SQL keywords and non-identifiers
         if s.size > max
@@ -299,7 +309,7 @@ module ActiveFacts
         end
 
         if s =~ /[^A-Za-z0-9_]/ || is_reserved_word(s)
-          "[#{s}]"
+          "#{open_escape}#{s}#{close_escape}"
         else
           s
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-compositions
 version: !ruby/object:Gem::Version
-  version: 1.9.12
+  version: 1.9.13
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler