openehr 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d4cd8f720ac22f26e89145ebfd23cb474b2ad3e900c97fd6ff01c20a90bf638
-  data.tar.gz: ac478e309b65a00d314d3bf425b8d3ce25a7f07dd196e76c223508eca7410619
+  metadata.gz: 86ae366cb519cde86548c821f97ad6b6a436e6b6f56bef45be7db6686f35dbc4
+  data.tar.gz: 9f4f54f3b9ec3b6cf64993d9a33a7ab76cc528b9a4237b44483c9feed1c70bd5
 SHA512:
-  metadata.gz: 4f72f3492c23d458ed840da441359318e03a58c4bc55ee2d35df060ff635f4ab98e9be5aafafd126d149d81dcc355620a5931f65b05ff6d9dee65666df371a62
-  data.tar.gz: d4ca02374caaf65f3d6a29087fa788f4a6c57c9415d5c5ac576f9e746d56f4a6d25c4ef95fa3b2b56d905823f2ff7c08cb6bdb2f2f92944ab04d3b4f0734b97a
+  metadata.gz: ad76805a27fae1e62e90a90e73bf721d517ad7e531ead2776326afe08a5d8ff6efa196dd339aaed0dc3e2ebf93e4e4c8413a8ee5c8f01f0cf15f05a30ee1c3d5
+  data.tar.gz: b72051c293181e20c55718ab42b8f5083fb4c467a4641af8df30e7ea6fbf5ffed16acd615969c8b02fe7f31058078122cd8edbfad57fb85a8203f6b785d01dca

data/lib/openehr/aql/errors.rb

@@ -11,11 +11,12 @@ module OpenEHR
     class ParseError < Error
       attr_reader :line, :column
 
-      def initialize(message, line: nil, column: nil)
+      def initialize(message, line: nil, column: nil, hint: nil)
         @line = line
         @column = column
         location = line && column ? " (line #{line}, column #{column})" : ''
-        super("#{message}#{location}")
+        hint_text = hint ? "\nnote: #{hint}" : ''
+        super("#{message}#{location}#{hint_text}")
       end
     end
 

data/lib/openehr/aql/parser.rb

@@ -48,6 +48,7 @@ module OpenEHR
         top = check(:top) ? parse_top : nil
         columns = [parse_select_expr]
         columns << parse_select_expr while match(:comma)
+        @select_aliases = columns.filter_map(&:alias_name).to_set
         Model::SelectClause.new(columns: columns, distinct: distinct, top: top)
       end
 
@@ -298,7 +299,11 @@ module OpenEHR
         elsif match(:matches)
           Model::MatchesExpr.new(path: path, operand: parse_matches_operand)
         else
-          raise error("expected a comparison operator, LIKE or MATCHES, got #{describe(peek)}")
+          identifier = peek.type == :identifier ? peek.value : nil
+          hint = if identifier && @select_aliases.include?(identifier)
+                   "'#{identifier}' is a SELECT alias; aliases cannot be used in WHERE -- repeat the identified path"
+                 end
+          raise error("expected a comparison operator, LIKE or MATCHES, got #{describe(peek)}", hint: hint)
         end
       end
 
@@ -476,8 +481,8 @@ module OpenEHR
         token.type == :eof ? 'end of input' : "#{token.type} #{token.value.inspect}"
       end
 
-      def error(message)
-        ParseError.new(message, line: peek.line, column: peek.column)
+      def error(message, hint: nil)
+        ParseError.new(message, line: peek.line, column: peek.column, hint: hint)
       end
     end
   end

data/lib/openehr/serializer/rm_json_serializer.rb

@@ -61,6 +61,7 @@ module OpenEHR
 
           hash[ivar.to_s.delete_prefix('@')] = to_value(field, seen)
         end
+        seen.delete(value)
         hash
       end
     end

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Shinji KOBAYASHI