activefacts-cql 1.9.1 → 1.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/activefacts-cql.gemspec +1 -1
- data/lib/activefacts/cql/compiler/entity_type.rb +2 -1
- data/lib/activefacts/cql/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 30db45e11c4c9ce85b6a9aa204f715132a176ad3
|
|
4
|
+
data.tar.gz: 63c5421ac7be511ac2be9f9470597cd25267140d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dc39aeec65e0f3d90a50b74c470d08b18c6714560a6c8662e91f0c29f81e616d890064d1e737dd9e9f75072fe2737970075fa01df541dc30b97d37096fe611ad
|
|
7
|
+
data.tar.gz: b22fceeb33df66d20d42a09537e0054799d92251b821d5edf54ef8cfcfab0e56df9c9bee676b7602451e2e96fe3d494b95b25e720c1e3f4cbf256adb49653f4b
|
data/activefacts-cql.gemspec
CHANGED
|
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
|
|
|
24
24
|
spec.add_development_dependency "rake", "~> 10.0"
|
|
25
25
|
spec.add_development_dependency "rspec", "~> 3.3"
|
|
26
26
|
|
|
27
|
-
spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.
|
|
27
|
+
spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.17"
|
|
28
28
|
spec.add_runtime_dependency "treetop", [">= 1.4.14", "~> 1.4"]
|
|
29
29
|
end
|
|
30
30
|
|
|
@@ -29,6 +29,7 @@ module ActiveFacts
|
|
|
29
29
|
end
|
|
30
30
|
|
|
31
31
|
def compile
|
|
32
|
+
@extant_entity_type = @vocabulary.object_type_lookup(@name)
|
|
32
33
|
@entity_type = @vocabulary.valid_entity_type_name(@name) ||
|
|
33
34
|
@constellation.EntityType(@vocabulary, @name, :concept => :new)
|
|
34
35
|
@entity_type.is_independent = true if @pragmas.delete('independent')
|
|
@@ -36,7 +37,7 @@ module ActiveFacts
|
|
|
36
37
|
# REVISIT: CQL needs a way to indicate whether subtype migration can occur.
|
|
37
38
|
# For example by saying "Xyz is a role of Abc".
|
|
38
39
|
@supertypes.each_with_index do |supertype_name, i|
|
|
39
|
-
add_supertype(supertype_name, @identification || i > 0)
|
|
40
|
+
add_supertype(supertype_name, @extant_entity_type || @identification || i > 0)
|
|
40
41
|
end
|
|
41
42
|
@pragmas.each do |p|
|
|
42
43
|
@constellation.ConceptAnnotation(:concept => @entity_type.concept, :mapping_annotation => p)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: activefacts-cql
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.9.
|
|
4
|
+
version: 1.9.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Clifford Heath
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-11-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -61,7 +61,7 @@ dependencies:
|
|
|
61
61
|
version: '1'
|
|
62
62
|
- - ">="
|
|
63
63
|
- !ruby/object:Gem::Version
|
|
64
|
-
version: 1.9.
|
|
64
|
+
version: 1.9.17
|
|
65
65
|
type: :runtime
|
|
66
66
|
prerelease: false
|
|
67
67
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -71,7 +71,7 @@ dependencies:
|
|
|
71
71
|
version: '1'
|
|
72
72
|
- - ">="
|
|
73
73
|
- !ruby/object:Gem::Version
|
|
74
|
-
version: 1.9.
|
|
74
|
+
version: 1.9.17
|
|
75
75
|
- !ruby/object:Gem::Dependency
|
|
76
76
|
name: treetop
|
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|