activefacts-metamodel 1.9.18 → 1.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9c5fec87ace6e0757e0266aa42d21ec7208d78
-  data.tar.gz: 432d7942772ab7c7eda0a4c93e9369e3f9ef044a
+  metadata.gz: eeb83d74101d461d8cf6f2c2bdf328f0360e9801
+  data.tar.gz: 46578f35a2a40c566794efd96d0ce44b48ee3c1b
 SHA512:
-  metadata.gz: 8876140eafbbd5eb1f67653cab2c5b0233acd1d8f3cae8e79bb6f766085664349f0cc1fcd730adfa5059889b2ded423d3dd686b5e7039ca4e176039211c8b366
-  data.tar.gz: 4dd4b1fad6303b5d98abbb703bde756ecdcd756d7b00edf5c76c9d7afec108ad5db569f3bdfcf6129f894ad449f1a39b6f1e0aabc3d11f5c7337b00d5853a48c
+  metadata.gz: df0dd4afd63eb21922ad711eb859cf39e7f79e8c2169563a2ca70b6283ca7340e2c9bf64032868060a88c277cf73a92553df31bfcd4c02cc26a1addf947af3a4
+  data.tar.gz: cd90076037d3854b08623c431c609456bb1d4bbdc8381e0ba3b5ffafa502e711981a185fd239473107f88ff3484bab3b621c1da36e0db31dc4fbe87701b0785e

data/lib/activefacts/metamodel/datatypes.rb

@@ -234,11 +234,21 @@ module ActiveFacts
               value_constraint = narrow_value_constraint(value_constraint, vt.value_constraint)
             end
           end while stype = vt.supertype
+          auto_assign =
+            if is_auto_assigned
+              if in_primary_index and !in_foreign_key
+                {auto_assign: is_auto_assigned}     # It's auto-assigned here
+              else
+                {auto_assign: nil}                  # It's auto-assigned elsewhere
+              end
+            else
+              {}                                    # It's not auto-assigned
+          end
 
           [ vt.name,
             (length ? {length: length} : {}).
             merge!(scale ? {scale: scale} : {}).
-            merge!(is_auto_assigned ? { auto_assign: (in_primary_index and !in_foreign_key)} : {}).
+            merge!(auto_assign).
             merge!({mandatory: path_mandatory}).
             merge!(value_constraint ? {value_constraint: value_constraint} : {})
           ]

data/lib/activefacts/metamodel/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Metamodel
-    VERSION = "1.9.18"
+    VERSION = "1.9.19"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-metamodel
 version: !ruby/object:Gem::Version
-  version: 1.9.18
+  version: 1.9.19
 platform: ruby
 authors:
 - Clifford Heath