rasti-db 2.0.0 → 2.3.1

data/lib/rasti/db/nql/nodes/comparisons/equal.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class Equal < Base
 
-            def filter_condition
-              { field.identifier => argument.value }
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/greater_than.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class GreaterThan < Base
 
-            def filter_condition
-              field.identifier > argument.value
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/greater_than_or_equal.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class GreaterThanOrEqual < Base
 
-            def filter_condition
-              field.identifier >= argument.value
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/include.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class Include < Base
 
-            def filter_condition
-              Sequel.ilike(field.identifier, "%#{argument.value}%")
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/less_than.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class LessThan < Base
 
-            def filter_condition
-              field.identifier < argument.value
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/less_than_or_equal.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class LessThanOrEqual < Base
 
-            def filter_condition
-              field.identifier <= argument.value
-            end
-            
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/like.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class Like < Base
 
-            def filter_condition
-              Sequel.ilike(field.identifier, argument.value)
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/not_equal.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class NotEqual < Base
 
-            def filter_condition
-              Sequel.negate(field.identifier => argument.value)
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/comparisons/not_include.rb

@@ -5,10 +5,6 @@ module Rasti
         module Comparisons
           class NotInclude < Base
 
-            def filter_condition
-              ~ Sequel.ilike(field.identifier, "%#{argument.value}%")
-            end
-
           end
         end
       end

data/lib/rasti/db/nql/nodes/conjunction.rb

@@ -4,8 +4,8 @@ module Rasti
       module Nodes
         class Conjunction < BinaryNode
 
-          def filter_condition
-            Sequel.&(*values.map(&:filter_condition))
+          def filter_condition(collection_class)
+            Sequel.&(*values.map { |value| value.filter_condition(collection_class) } )
           end
 
         end

data/lib/rasti/db/nql/nodes/constants/array.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class Array < Base
+
+            def value
+              contents.is_a?(ArrayContent) ? contents.values : [contents.value]
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/base.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class Base < Treetop::Runtime::SyntaxNode
+
+            def type
+              Inflecto.underscore(Inflecto.demodulize(self.class)).to_sym
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/false.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class False < Treetop::Runtime::SyntaxNode
+          class False < Base
 
             def value
               false

data/lib/rasti/db/nql/nodes/constants/float.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class Float < Treetop::Runtime::SyntaxNode
+          class Float < Base
 
             def value
               text_value.to_f

data/lib/rasti/db/nql/nodes/constants/integer.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class Integer < Treetop::Runtime::SyntaxNode
+          class Integer < Base
 
             def value
               text_value.to_i

data/lib/rasti/db/nql/nodes/constants/literal_string.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class LiteralString < Treetop::Runtime::SyntaxNode
+          class LiteralString < Base
 
             def value
               string.text_value

data/lib/rasti/db/nql/nodes/constants/string.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class String < Treetop::Runtime::SyntaxNode
+          class String < Base
 
             def value
               text_value.strip

data/lib/rasti/db/nql/nodes/constants/time.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class Time < Treetop::Runtime::SyntaxNode
+          class Time < Base
 
             def value
               time.to_s

data/lib/rasti/db/nql/nodes/constants/true.rb

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         module Constants
-          class True < Treetop::Runtime::SyntaxNode
+          class True < Base
 
             def value
               true

data/lib/rasti/db/nql/nodes/disjunction.rb

@@ -4,8 +4,8 @@ module Rasti
       module Nodes
         class Disjunction < BinaryNode
 
-          def filter_condition
-            Sequel.|(*values.map(&:filter_condition))
+          def filter_condition(collection_class)
+            Sequel.|(*values.map { |value| value.filter_condition(collection_class) } )
           end
 
         end

data/lib/rasti/db/nql/nodes/parenthesis_sentence.rb

@@ -8,8 +8,12 @@ module Rasti
             sentence.dependency_tables
           end
 
-          def filter_condition
-            sentence.filter_condition
+          def computed_attributes(collection_class)
+            sentence.computed_attributes(collection_class)
+          end
+
+          def filter_condition(collection_class)
+            sentence.filter_condition collection_class
           end
 
         end

data/lib/rasti/db/nql/nodes/sentence.rb

@@ -8,8 +8,12 @@ module Rasti
             proposition.dependency_tables
           end
 
-          def filter_condition
-            proposition.filter_condition
+          def computed_attributes(collection_class)
+            proposition.computed_attributes collection_class
+          end
+
+          def filter_condition(collection_class)
+            proposition.filter_condition collection_class
           end
 
         end

data/lib/rasti/db/nql/syntax.rb

@@ -433,14 +433,14 @@ module Rasti
           r0
         end
 
-        module Field0
+        module Attribute0
           def table
             elements[0]
           end
 
         end
 
-        module Field1
+        module Attribute1
           def _tables
             elements[0]
           end
@@ -450,10 +450,10 @@ module Rasti
           end
         end
 
-        def _nt_field
+        def _nt_attribute
           start_index = index
-          if node_cache[:field].has_key?(index)
-            cached = node_cache[:field][index]
+          if node_cache[:attribute].has_key?(index)
+            cached = node_cache[:attribute][index]
             if cached
               cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
               @index = cached.interval.end
@@ -465,7 +465,7 @@ module Rasti
           s1, i1 = [], index
           loop do
             i2, s2 = index, []
-            r3 = _nt_field_name
+            r3 = _nt_attribute_name
             s2 << r3
             if r3
               if has_terminal?('.', false, index)
@@ -479,7 +479,7 @@ module Rasti
             end
             if s2.last
               r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-              r2.extend(Field0)
+              r2.extend(Attribute0)
             else
               @index = i2
               r2 = nil
@@ -493,24 +493,24 @@ module Rasti
           r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
           s0 << r1
           if r1
-            r5 = _nt_field_name
+            r5 = _nt_attribute_name
             s0 << r5
           end
           if s0.last
-            r0 = instantiate_node(Nodes::Field,input, i0...index, s0)
-            r0.extend(Field1)
+            r0 = instantiate_node(Nodes::Attribute,input, i0...index, s0)
+            r0.extend(Attribute1)
           else
             @index = i0
             r0 = nil
           end
 
-          node_cache[:field][start_index] = r0
+          node_cache[:attribute][start_index] = r0
 
           r0
         end
 
         module ComparisonInclude0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -535,7 +535,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -571,7 +571,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -591,7 +591,7 @@ module Rasti
         end
 
         module ComparisonNotInclude0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -616,7 +616,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -652,7 +652,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -672,7 +672,7 @@ module Rasti
         end
 
         module ComparisonLike0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -697,7 +697,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -733,7 +733,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -753,7 +753,7 @@ module Rasti
         end
 
         module ComparisonGreaterThan0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -778,7 +778,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -814,7 +814,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -834,7 +834,7 @@ module Rasti
         end
 
         module ComparisonGreaterThanOrEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -859,7 +859,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -895,7 +895,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -915,7 +915,7 @@ module Rasti
         end
 
         module ComparisonLessThan0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -940,7 +940,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -976,7 +976,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -996,7 +996,7 @@ module Rasti
         end
 
         module ComparisonLessThanOrEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -1021,7 +1021,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -1057,7 +1057,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -1077,7 +1077,7 @@ module Rasti
         end
 
         module ComparisonNotEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -1102,7 +1102,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -1138,7 +1138,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -1158,7 +1158,7 @@ module Rasti
         end
 
         module ComparisonEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -1183,7 +1183,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -1219,7 +1219,7 @@ module Rasti
                 r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
-                  r7 = _nt_basic
+                  r7 = _nt_argument
                   s0 << r7
                 end
               end
@@ -1238,6 +1238,36 @@ module Rasti
           r0
         end
 
+        def _nt_argument
+          start_index = index
+          if node_cache[:argument].has_key?(index)
+            cached = node_cache[:argument][index]
+            if cached
+              cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+              @index = cached.interval.end
+            end
+            return cached
+          end
+
+          i0 = index
+          r1 = _nt_array
+          if r1
+            r0 = r1
+          else
+            r2 = _nt_basic
+            if r2
+              r0 = r2
+            else
+              @index = i0
+              r0 = nil
+            end
+          end
+
+          node_cache[:argument][start_index] = r0
+
+          r0
+        end
+
         def _nt_basic
           start_index = index
           if node_cache[:basic].has_key?(index)
@@ -1288,6 +1318,194 @@ module Rasti
           r0
         end
 
+        module Array0
+          def open
+            elements[0]
+          end
+
+          def contents
+            elements[2]
+          end
+
+          def close
+            elements[4]
+          end
+        end
+
+        def _nt_array
+          start_index = index
+          if node_cache[:array].has_key?(index)
+            cached = node_cache[:array][index]
+            if cached
+              cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+              @index = cached.interval.end
+            end
+            return cached
+          end
+
+          i0, s0 = index, []
+          if has_terminal?('[', false, index)
+            r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('[')
+            r1 = nil
+          end
+          s0 << r1
+          if r1
+            s2, i2 = [], index
+            loop do
+              r3 = _nt_space
+              if r3
+                s2 << r3
+              else
+                break
+              end
+            end
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+            s0 << r2
+            if r2
+              i4 = index
+              r5 = _nt_array_content
+              if r5
+                r4 = r5
+              else
+                r6 = _nt_basic
+                if r6
+                  r4 = r6
+                else
+                  @index = i4
+                  r4 = nil
+                end
+              end
+              s0 << r4
+              if r4
+                s7, i7 = [], index
+                loop do
+                  r8 = _nt_space
+                  if r8
+                    s7 << r8
+                  else
+                    break
+                  end
+                end
+                r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+                s0 << r7
+                if r7
+                  if has_terminal?(']', false, index)
+                    r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure(']')
+                    r9 = nil
+                  end
+                  s0 << r9
+                end
+              end
+            end
+          end
+          if s0.last
+            r0 = instantiate_node(Nodes::Constants::Array,input, i0...index, s0)
+            r0.extend(Array0)
+          else
+            @index = i0
+            r0 = nil
+          end
+
+          node_cache[:array][start_index] = r0
+
+          r0
+        end
+
+        module ArrayContent0
+          def left
+            elements[0]
+          end
+
+          def right
+            elements[4]
+          end
+        end
+
+        def _nt_array_content
+          start_index = index
+          if node_cache[:array_content].has_key?(index)
+            cached = node_cache[:array_content][index]
+            if cached
+              cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+              @index = cached.interval.end
+            end
+            return cached
+          end
+
+          i0, s0 = index, []
+          r1 = _nt_basic
+          s0 << r1
+          if r1
+            s2, i2 = [], index
+            loop do
+              r3 = _nt_space
+              if r3
+                s2 << r3
+              else
+                break
+              end
+            end
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+            s0 << r2
+            if r2
+              if has_terminal?(',', false, index)
+                r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(',')
+                r4 = nil
+              end
+              s0 << r4
+              if r4
+                s5, i5 = [], index
+                loop do
+                  r6 = _nt_space
+                  if r6
+                    s5 << r6
+                  else
+                    break
+                  end
+                end
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+                s0 << r5
+                if r5
+                  i7 = index
+                  r8 = _nt_array_content
+                  if r8
+                    r7 = r8
+                  else
+                    r9 = _nt_basic
+                    if r9
+                      r7 = r9
+                    else
+                      @index = i7
+                      r7 = nil
+                    end
+                  end
+                  s0 << r7
+                end
+              end
+            end
+          end
+          if s0.last
+            r0 = instantiate_node(Nodes::ArrayContent,input, i0...index, s0)
+            r0.extend(ArrayContent0)
+          else
+            @index = i0
+            r0 = nil
+          end
+
+          node_cache[:array_content][start_index] = r0
+
+          r0
+        end
+
         def _nt_space
           start_index = index
           if node_cache[:space].has_key?(index)
@@ -1311,10 +1529,10 @@ module Rasti
           r0
         end
 
-        def _nt_field_name
+        def _nt_attribute_name
           start_index = index
-          if node_cache[:field_name].has_key?(index)
-            cached = node_cache[:field_name][index]
+          if node_cache[:attribute_name].has_key?(index)
+            cached = node_cache[:attribute_name][index]
             if cached
               cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
               @index = cached.interval.end
@@ -1343,7 +1561,7 @@ module Rasti
             r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           end
 
-          node_cache[:field_name][start_index] = r0
+          node_cache[:attribute_name][start_index] = r0
 
           r0
         end
@@ -2015,7 +2233,7 @@ module Rasti
             return cached
           end
 
-          if has_terminal?('\G[0-9a-zA-ZÁÀÄÂÃÅĀĂǍáàäâãåāăǎÉÈËÊĒĔĖĚéèëêēĕėěÍÌÏÎĨĬǏíìïîĩĭǐÓÒÖÔÕŌŎŐǑóòöôõōŏőǒÚÙÜÛŨŪŬŮŰǓúùüûũūŭůűǔÑñçÇ%@#+-_\'?!$*/\\s]', true, index)
+          if has_terminal?('\G[0-9a-zA-ZÁÀÄÂÃÅĀĂǍáàäâãåāăǎÉÈËÊĒĔĖĚéèëêēĕėěÍÌÏÎĨĬǏíìïîĩĭǐÓÒÖÔÕŌŎŐǑóòöôõōŏőǒÚÙÜÛŨŪŬŮŰǓúùüûũūŭůűǔÑñçÇ%@#+\\--Z\\\\^_\'?!$*/\\s]', true, index)
             r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
@@ -2243,7 +2461,7 @@ module Rasti
             return cached
           end
 
-          if has_terminal?('\G[&|.():!=<>~]', true, index)
+          if has_terminal?('\G[&|.():!=<>~,\\]\\[]', true, index)
             r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else