rasti-db 1.3.0 → 2.0.1

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/model.rb

@@ -62,6 +62,10 @@ module Rasti
         @attributes = attributes
       end
 
+      def merge(new_attributes)
+        self.class.new attributes.merge(new_attributes)
+      end
+
       def eql?(other)
         instance_of?(other.class) && to_h.eql?(other.to_h)
       end

data/lib/rasti/db/query.rb

@@ -5,13 +5,18 @@ module Rasti
       DATASET_CHAINED_METHODS = [:where, :exclude, :or, :order, :reverse_order, :limit, :offset].freeze
 
       include Enumerable
-      include Helpers::WithSchema
 
-      def initialize(collection_class, dataset, relations=[], schema=nil)
+      def initialize(environment:, collection_class:, dataset:, relations_graph:nil)
+        @environment = environment
         @collection_class = collection_class
-        @dataset = dataset
-        @relations = relations
-        @schema = schema
+        @dataset = dataset.qualify collection_class.collection_name
+        @relations_graph = relations_graph || Relations::Graph.new(environment, collection_class)
+      end
+
+      DATASET_CHAINED_METHODS.each do |method|
+        define_method method do |*args, &block|
+          build_query dataset: dataset.public_send(method, *args, &block)
+        end
       end
 
       def raw
@@ -19,7 +24,7 @@ module Rasti
       end
 
       def pluck(*attributes)
-        ds = dataset.select(*attributes.map { |attr| Sequel[collection_class.collection_name][attr] })
+        ds = dataset.select(*attributes.map { |a| Sequel[collection_class.collection_name][a] })
         attributes.count == 1 ? ds.map { |r| r[attributes.first] } : ds.map(&:values)
       end
 
@@ -27,6 +32,31 @@ module Rasti
         pluck collection_class.primary_key
       end
 
+      def select_attributes(*attributes)
+        build_query dataset: dataset.select(*attributes.map { |a| Sequel[collection_class.collection_name][a] })
+      end
+
+      def exclude_attributes(*excluded_attributes)
+        attributes = collection_class.collection_attributes - excluded_attributes
+        select_attributes(*attributes)
+      end
+
+      def all_attributes
+        build_query dataset: dataset.select_all(collection_class.collection_name)
+      end
+
+      def select_graph_attributes(selected_attributes)
+        build_query relations_graph: relations_graph.merge(selected_attributes: selected_attributes)
+      end
+
+      def exclude_graph_attributes(excluded_attributes)
+        build_query relations_graph: relations_graph.merge(excluded_attributes: excluded_attributes)
+      end
+
+      def all_graph_attributes(*relations)
+        build_query relations_graph: relations_graph.with_all_attributes_for(relations)
+      end
+
       def all
         with_graph(dataset.all).map do |row| 
           collection_class.model.new row
@@ -38,27 +68,16 @@ module Rasti
         all.each(&block)
       end
 
-      DATASET_CHAINED_METHODS.each do |method|
-        define_method method do |*args, &block|
-          Query.new collection_class, 
-                    dataset.public_send(method, *args, &block), 
-                    relations, 
-                    schema
-        end
+      def graph(*relations)
+        build_query relations_graph: relations_graph.merge(relations: relations)
       end
 
-      def graph(*rels)
-        Query.new collection_class, 
-                  dataset, 
-                  (relations | rels), 
-                  schema
-      end
+      def join(*relations)
+        graph = Relations::Graph.new environment, collection_class, relations
+
+        ds = graph.add_joins(dataset).distinct
 
-      def join(*rels)
-        Query.new collection_class, 
-                  Relations::GraphBuilder.joins_to(dataset, rels, collection_class, schema), 
-                  relations, 
-                  schema
+        build_query dataset: ds
       end
 
       def count
@@ -105,25 +124,46 @@ module Rasti
 
       private
 
+      attr_reader :environment, :collection_class, :dataset, :relations_graph
+
+      def build_query(**args)
+        current_args = {
+          environment: environment,
+          collection_class: collection_class,
+          dataset: dataset,
+          relations_graph: relations_graph
+        }
+
+        Query.new(**current_args.merge(args))
+      end
+
       def chainable(&block)
-        ds = instance_eval(&block)
-        Query.new collection_class, ds, relations, schema
+        build_query dataset: instance_eval(&block)
       end
 
       def with_related(relation_name, primary_keys)
-        ds = collection_class.relations[relation_name].apply_filter dataset, schema, primary_keys
-        Query.new collection_class, ds, relations, schema
+        ds = collection_class.relations[relation_name].apply_filter environment, dataset, primary_keys
+        build_query dataset: ds
       end
 
       def with_graph(data)
         rows = data.is_a?(Array) ? data : [data]
-        Relations::GraphBuilder.graph_to rows, relations, collection_class, dataset.db, schema
+        relations_graph.fetch_graph rows
         data
       end
 
+      def qualify(collection_name, data_source_name: nil)
+        data_source_name ||= collection_class.data_source_name
+        environment.qualify data_source_name, collection_name
+      end
+
+      def nql_parser
+        NQL::SyntaxParser.new
+      end
+
       def method_missing(method, *args, &block)
-        if collection_class.queries.key?(method)
-          instance_exec(*args, &collection_class.queries[method])
+        if collection_class.queries.key? method
+          instance_exec(*args, &collection_class.queries.fetch(method))
         else
           super
         end
@@ -133,12 +173,6 @@ module Rasti
         collection_class.queries.key?(method) || super
       end
 
-      def nql_parser
-        NQL::SyntaxParser.new
-      end
-
-      attr_reader :collection_class, :dataset, :relations, :schema
-
     end
   end
 end

data/lib/rasti/db/relations/base.rb

@@ -33,25 +33,39 @@ module Rasti
           self.class == OneToOne
         end
 
-        def join_relation_name(prefix)
-          with_prefix prefix, name
+        def from_one?
+          one_to_one? || one_to_many?
         end
 
-        private
+        def from_many?
+          many_to_one? || many_to_many?
+        end
 
-        attr_reader :options
+        def to_one?
+          one_to_one? || many_to_one?
+        end
 
-        def qualified_source_collection_name(schema=nil)
-          schema.nil? ? Sequel[source_collection_class.collection_name] : Sequel[schema][source_collection_class.collection_name]
+        def to_many?
+          one_to_many? || many_to_many?
         end
 
-        def qualified_target_collection_name(schema=nil)
-          schema.nil? ? Sequel[target_collection_class.collection_name] : Sequel[schema][target_collection_class.collection_name]
+        def join_relation_name(prefix)
+          with_prefix prefix, name
         end
 
+        private
+
+        attr_reader :options
+
         def with_prefix(prefix, name)
           [prefix, name].compact.join('__').to_sym
         end
+
+        def validate_join!
+          if source_collection_class.data_source_name != target_collection_class.data_source_name
+            raise "Invalid join of multiple data sources: #{source_collection_class.data_source_name}.#{source_collection_class.collection_name} > #{target_collection_class.data_source_name}.#{target_collection_class.collection_name}" 
+          end
+        end
         
       end
     end

data/lib/rasti/db/relations/graph.rb

@@ -0,0 +1,129 @@
+module Rasti
+  module DB
+    module Relations
+      class Graph
+
+        def initialize(environment, collection_class, relations=[], selected_attributes={}, excluded_attributes={})
+          @environment = environment
+          @collection_class = collection_class
+          @graph = build_graph relations, 
+                               Hash::Indifferent.new(selected_attributes), 
+                               Hash::Indifferent.new(excluded_attributes)
+        end
+
+        def merge(relations:[], selected_attributes:{}, excluded_attributes:{})
+          Graph.new environment, 
+                    collection_class, 
+                    (flat_relations | relations), 
+                    flat_selected_attributes.merge(selected_attributes),
+                    flat_excluded_attributes.merge(excluded_attributes)
+        end
+
+        def with_all_attributes_for(relations)
+          relations_with_all_attributes = relations.map { |r| [r, nil] }.to_h
+
+          merge selected_attributes: relations_with_all_attributes, 
+                excluded_attributes: relations_with_all_attributes
+        end
+
+        def apply_to(query)
+          query.graph(*flat_relations)
+               .select_graph_attributes(flat_selected_attributes)
+               .exclude_graph_attributes(flat_excluded_attributes)
+        end
+
+        def fetch_graph(rows)
+          return if rows.empty?
+
+          graph.roots.each do |node|
+            relation_of(node).fetch_graph environment,
+                                          rows, 
+                                          node[:selected_attributes],
+                                          node[:excluded_attributes] ,
+                                          subgraph_of(node)
+          end
+        end
+
+        def add_joins(dataset, prefix=nil)
+          graph.roots.inject(dataset) do |ds, node|
+            relation = relation_of node
+            dataset_with_relation = relation.add_join environment, ds, prefix
+            subgraph_of(node).add_joins dataset_with_relation, relation.join_relation_name(prefix)
+          end
+        end
+
+        private
+
+        attr_reader :environment, :collection_class, :graph
+
+        def relation_of(node)
+          collection_class.relations.fetch(node[:name])
+        end
+
+        def flat_relations
+          graph.map(&:id)
+        end
+
+        def flat_selected_attributes
+          graph.each_with_object(Hash::Indifferent.new) do |node, hash|
+            hash[node.id] = node[:selected_attributes]
+          end
+        end
+
+        def flat_excluded_attributes
+          graph.each_with_object(Hash::Indifferent.new) do |node, hash|
+            hash[node.id] = node[:excluded_attributes]
+          end
+        end
+
+        def subgraph_of(node)
+          relations = []
+          selected = Hash::Indifferent.new
+          excluded = Hash::Indifferent.new
+
+          node.descendants.each do |descendant|
+            id = descendant.id[node[:name].length+1..-1]
+            relations << id
+            selected[id] = descendant[:selected_attributes]
+            excluded[id] = descendant[:excluded_attributes]
+          end
+
+          Graph.new environment, 
+                    relation_of(node).target_collection_class, 
+                    relations, 
+                    selected, 
+                    excluded
+        end
+
+        def build_graph(relations, selected_attributes, excluded_attributes)
+          HierarchicalGraph.new.tap do |graph|
+            flatten(relations).each do |relation| 
+              sections = relation.split('.')
+              
+              graph.add_node relation, name: sections.last.to_sym,
+                                       selected_attributes: selected_attributes[relation],
+                                       excluded_attributes: excluded_attributes[relation]
+              
+              if sections.count > 1
+                parent_id = sections[0..-2].join('.')
+                graph.add_relation parent_id: parent_id, 
+                                   child_id: relation
+              end
+            end
+          end
+        end
+
+        def flatten(relations)
+          relations.flat_map do |relation|
+            parents = []
+            relation.to_s.split('.').map do |section|
+              parents << section
+              parents.compact.join('.')
+            end
+          end.uniq.sort
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/db/relations/many_to_many.rb

@@ -15,25 +15,44 @@ module Rasti
           @relation_collection_name ||= options[:relation_collection_name] || [source_collection_class.collection_name, target_collection_class.collection_name].sort.join('_').to_sym
         end
 
-        def qualified_relation_collection_name(schema=nil)
-          schema.nil? ? Sequel[relation_collection_name] : Sequel[schema][relation_collection_name]
+        def relation_data_source_name
+          @relation_data_source_name ||= options[:relation_data_source_name] || source_collection_class.data_source_name
         end
 
-        def graph_to(rows, db, schema=nil, relations=[])
+        def fetch_graph(environment, rows, selected_attributes=nil, excluded_attributes=nil, relations_graph=nil)
           pks = rows.map { |row| row[source_collection_class.primary_key] }
 
-          target_collection = target_collection_class.new db, schema
+          if target_collection_class.data_source_name == relation_data_source_name
+            target_data_source = environment.data_source_of target_collection_class
 
-          relation_name = qualified_relation_collection_name schema
+            dataset = target_data_source.db.from(environment.qualify_collection(target_collection_class))
+                                           .join(qualified_relation_collection_name(environment), target_foreign_key => target_collection_class.primary_key)
+                                           .where(Sequel[relation_collection_name][source_foreign_key] => pks)
+                                           .select_all(target_collection_class.collection_name)
 
-          join_rows = target_collection.dataset
-                                       .join(relation_name, target_foreign_key => target_collection_class.primary_key)
-                                       .where(Sequel[relation_name][source_foreign_key] => pks)
-                                       .select_all(qualified_target_collection_name(schema))
-                                       .select_append(Sequel[relation_name][source_foreign_key].as(:source_foreign_key))
-                                       .all
+            selected_attributes ||= target_collection_class.collection_attributes - excluded_attributes if excluded_attributes
+            dataset = dataset.select(*selected_attributes.map { |a| Sequel[target_collection_class.collection_name][a] }) if selected_attributes
 
-          GraphBuilder.graph_to join_rows, relations, target_collection_class, db, schema
+            join_rows = dataset.select_append(Sequel[relation_collection_name][source_foreign_key].as(:source_foreign_key)).all
+          else
+            relation_data_source = environment.data_source relation_data_source_name
+
+            relation_index = relation_data_source.db.from(relation_data_source.qualify(relation_collection_name))
+                                                    .where(source_foreign_key => pks)
+                                                    .select_hash_groups(target_foreign_key, source_foreign_key)
+
+            query = target_collection_class.new environment
+            query = query.exclude_attributes(*excluded_attributes) if excluded_attributes
+            query = query.select_attributes(*selected_attributes) if selected_attributes
+
+            join_rows = query.where(target_collection_class.primary_key => relation_index.keys).raw.flat_map do |row|
+              relation_index[row[target_collection_class.primary_key]].map do |source_primary_key|
+                row.merge(source_foreign_key: source_primary_key)
+              end
+            end
+          end
+
+          relations_graph.fetch_graph join_rows if relations_graph
 
           relation_rows = join_rows.each_with_object(Hash.new { |h,k| h[k] = [] }) do |row, hash| 
             attributes = row.select { |attr,_| target_collection_class.model.attributes.include? attr }
@@ -41,17 +60,19 @@ module Rasti
           end
 
           rows.each do |row| 
-            row[name] = relation_rows.fetch row[target_collection_class.primary_key], []
+            row[name] = relation_rows.fetch row[source_collection_class.primary_key], []
           end
         end
 
-        def join_to(dataset, schema=nil, prefix=nil)
-          many_to_many_relation_alias = with_prefix prefix, relation_collection_name
+        def add_join(environment, dataset, prefix=nil)
+          validate_join!
+          
+          many_to_many_relation_alias = with_prefix prefix, "#{relation_collection_name}_#{SecureRandom.base64}"
 
-          qualified_relation_source = prefix ? Sequel[prefix] : qualified_source_collection_name(schema)
+          relation_name = prefix ? Sequel[prefix] : Sequel[source_collection_class.collection_name]
 
           many_to_many_condition = {
-            Sequel[many_to_many_relation_alias][source_foreign_key] => qualified_relation_source[source_collection_class.primary_key]
+            Sequel[many_to_many_relation_alias][source_foreign_key] => relation_name[source_collection_class.primary_key]
           }
 
           relation_alias = join_relation_name prefix
@@ -60,17 +81,30 @@ module Rasti
             Sequel[relation_alias][target_collection_class.primary_key] => Sequel[many_to_many_relation_alias][target_foreign_key]
           }
 
-          dataset.join(qualified_relation_collection_name(schema).as(many_to_many_relation_alias), many_to_many_condition)
-                 .join(qualified_target_collection_name(schema).as(relation_alias), relation_condition)
+          dataset.join(qualified_relation_collection_name(environment).as(many_to_many_relation_alias), many_to_many_condition)
+                 .join(environment.qualify_collection(target_collection_class).as(relation_alias), relation_condition)
+        end
+
+        def apply_filter(environment, dataset, primary_keys)
+          if source_collection_class.data_source_name == relation_data_source_name
+            dataset.join(qualified_relation_collection_name(environment), source_foreign_key => source_collection_class.primary_key)
+                   .where(Sequel[relation_collection_name][target_foreign_key] => primary_keys)
+                   .select_all(source_collection_class.collection_name)
+                   .distinct
+          else
+            data_source = environment.data_source relation_data_source_name
+            fks = data_source.db.from(data_source.qualify(relation_collection_name))
+                                .where(target_collection_class.foreign_key => primary_keys)
+                                .select_map(source_collection_class.foreign_key)
+                                .uniq
+            dataset.where(source_collection_class.primary_key => fks)
+          end
         end
 
-        def apply_filter(dataset, schema=nil, primary_keys=[])
-          relation_name = qualified_relation_collection_name schema
+        private
 
-          dataset.join(relation_name, source_foreign_key => target_collection_class.primary_key)
-                 .where(Sequel[relation_name][target_foreign_key] => primary_keys)
-                 .select_all(qualified_source_collection_name(schema))
-                 .distinct
+        def qualified_relation_collection_name(environment)
+          environment.qualify relation_data_source_name, relation_collection_name
         end
 
       end