rasti-db 1.4.0 → 2.2.0

data/lib/rasti/db/computed_attribute.rb

@@ -0,0 +1,22 @@
+module Rasti
+  module DB
+    class ComputedAttribute
+
+      attr_reader :identifier
+
+      def initialize(identifier, &join)
+        @identifier = identifier
+        @join = join
+      end
+
+      def apply_join(dataset)
+        join ? join.call(dataset) : dataset
+      end
+
+      private
+
+      attr_reader :join
+
+    end
+  end
+end

data/lib/rasti/db/data_source.rb

@@ -0,0 +1,18 @@
+module Rasti
+  module DB
+    class DataSource
+
+      attr_reader :db, :schema
+
+      def initialize(db, schema=nil)
+        @db = db
+        @schema = schema ? schema.to_sym : nil
+      end
+
+      def qualify(collection_name)
+        schema ? Sequel[schema][collection_name] : Sequel[collection_name]
+      end
+      
+    end
+  end
+end

data/lib/rasti/db/environment.rb

@@ -0,0 +1,32 @@
+module Rasti
+  module DB
+    class Environment
+
+      def initialize(data_sources)
+        @data_sources = data_sources
+      end
+
+      def data_source(name)
+        raise "Undefined data source #{name}" unless data_sources.key? name
+        data_sources[name]
+      end
+
+      def data_source_of(collection_class)
+        data_source collection_class.data_source_name
+      end
+
+      def qualify(data_source_name, collection_name)
+        data_source(data_source_name).qualify collection_name
+      end
+
+      def qualify_collection(collection_class)
+        data_source_of(collection_class).qualify collection_class.collection_name
+      end
+
+      private
+
+      attr_reader :data_sources
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        class Attribute < Treetop::Runtime::SyntaxNode
+
+          def identifier(collection_class)
+            if computed? collection_class
+              collection_class.computed_attributes[column].identifier
+            else
+              tables.empty? ? Sequel[column] : Sequel[tables.join('__').to_sym][column]
+            end
+          end
+
+          def tables
+            _tables.elements.map{ |e| e.table.text_value }
+          end
+
+          def column
+            _column.text_value.to_sym
+          end
+
+          def computed_attributes(collection_class)
+            computed?(collection_class) ? [column] : []
+          end
+
+          private
+
+          def computed?(collection_class)
+            collection_class.computed_attributes.key? column
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,10 @@ module Rasti
             values.flat_map(&:dependency_tables)
           end
 
+          def computed_attributes(collection_class)
+            left.computed_attributes(collection_class) | right.computed_attributes(collection_class)
+          end
+
           def values
             @values ||= values_for(left) + values_for(right)
           end

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

@@ -6,7 +6,11 @@ module Rasti
           class Base < Treetop::Runtime::SyntaxNode
 
             def dependency_tables
-              field.tables.empty? ? [] : [field.tables.join('.')]
+              attribute.tables.empty? ? [] : [attribute.tables.join('.')]
+            end
+
+            def computed_attributes(collection_class)
+              attribute.computed_attributes(collection_class)
             end
 
           end

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

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class Equal < Base
 
-            def filter_condition
-              { field.identifier => argument.value }
+            def filter_condition(collection_class)
+              { attribute.identifier(collection_class) => argument.value }
             end
 
           end

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

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class GreaterThan < Base
 
-            def filter_condition
-              field.identifier > argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) > argument.value
             end
 
           end

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

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class GreaterThanOrEqual < Base
 
-            def filter_condition
-              field.identifier >= argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) >= argument.value
             end
 
           end

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

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

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

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class LessThan < Base
 
-            def filter_condition
-              field.identifier < argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) < argument.value
             end
 
           end

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

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class LessThanOrEqual < Base
 
-            def filter_condition
-              field.identifier <= argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) <= argument.value
             end
             
           end

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

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

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

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

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

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class NotInclude < Base
 
-            def filter_condition
-              ~ Sequel.ilike(field.identifier, "%#{argument.value}%")
+            def filter_condition(collection_class)
+              ~ Sequel.ilike(attribute.identifier(collection_class), "%#{argument.value}%")
             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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1311,10 +1311,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 +1343,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