many_to_many.rb in rasti-db-1.1.0

- old
+ new

@@ -14,11 +14,11 @@
         def relation_collection_name
           @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? ? relation_collection_name : Sequel.qualify(schema, relation_collection_name)
+          schema.nil? ? Sequel[relation_collection_name] : Sequel[schema][relation_collection_name]
         end
 
         def graph_to(rows, db, schema=nil, relations=[])
           pks = rows.map { |row| row[source_collection_class.primary_key] }
 
@@ -26,13 +26,13 @@
 
           relation_name = qualified_relation_collection_name schema
 
           join_rows = target_collection.dataset
                                        .join(relation_name, target_foreign_key => target_collection_class.primary_key)
-                                       .where(Sequel.qualify(relation_name, source_foreign_key) => pks)
+                                       .where(Sequel[relation_name][source_foreign_key] => pks)
                                        .select_all(qualified_target_collection_name(schema))
-                                       .select_append(Sequel.qualify(relation_name, source_foreign_key).as(:source_foreign_key))
+                                       .select_append(Sequel[relation_name][source_foreign_key].as(:source_foreign_key))
                                        .all
 
           GraphBuilder.graph_to join_rows, relations, target_collection_class, db, schema
 
           relation_rows = join_rows.each_with_object(Hash.new { |h,k| h[k] = [] }) do |row, hash| 
@@ -43,14 +43,33 @@
           rows.each do |row| 
             row[name] = relation_rows.fetch row[target_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
+
+          qualified_relation_source = prefix ? Sequel[prefix] : qualified_source_collection_name(schema)
+
+          many_to_many_condition = {
+            Sequel[many_to_many_relation_alias][source_foreign_key] => qualified_relation_source[source_collection_class.primary_key]
+          }
+
+          relation_alias = join_relation_name prefix
+
+          relation_condition = {
+            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)
+        end
+
         def apply_filter(dataset, schema=nil, primary_keys=[])
           relation_name = qualified_relation_collection_name schema
 
           dataset.join(relation_name, source_foreign_key => target_collection_class.primary_key)
-                 .where(Sequel.qualify(relation_name, target_foreign_key) => primary_keys)
+                 .where(Sequel[relation_name][target_foreign_key] => primary_keys)
                  .select_all(qualified_source_collection_name(schema))
                  .distinct
         end
 
       end
\ No newline at end of file