rasti-db 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63f41e1bc62674437962478fc753698954559bf6bfcc491ab6bcdb76ea9082aa
-  data.tar.gz: e57dad5c6377b82c14a3a0775bc9f2b4abb75570edece928d3679e4c172e571d
+  metadata.gz: c26c0f818529ec0d1a752cf310c1d23cf235d2c8c83e13a62d8d61bc90b3b400
+  data.tar.gz: 57022ffbb145a76ad9532d16a1ed890f31862f7fc6ad4cea6d40aae0490908ca
 SHA512:
-  metadata.gz: acce93a9224b4531de96969886f2d8c384a047f1b58169f344a8eca518eb8328d6d46ff9359d0ebba15dc0ab017785ff5120616678c9651581fc5ea0f1ff646b
-  data.tar.gz: 3d85bf6a76c25a55e775c36bdb0dff504e28e945bdb94afd341416e8337f3bd442de20f03f50a87e3290784a4743786d4a4152f6c4cd698b8302d9b9f5e28c4b
+  metadata.gz: 94746821604273fdf6483d5410f8c73f4793901116478a17d3ecba6e7039705ecf8cf5b8ad0ccb30adb294d052ff144c6d0fe5ca042ca1fd558e3caf5c45de62
+  data.tar.gz: '0684ae374582f8cd633d44aacd720e80b3575e3ef8186de2252d9f73e17f03fe438a54a407127bb320f9ec8996f3f5dc71c99294b503c28797e34faf4c886f22'

data/lib/rasti/db/computed_attribute.rb

@@ -9,8 +9,8 @@ module Rasti
         @join = join
       end
 
-      def apply_join(dataset)
-        join ? join.call(dataset) : dataset
+      def apply_join(dataset, environment)
+        join ? join.call(dataset, environment) : dataset
       end
 
       private

data/lib/rasti/db/query.rb

@@ -60,7 +60,7 @@ module Rasti
       def select_computed_attributes(*computed_attributes)
         ds = computed_attributes.inject(dataset) do |ds, name|
           computed_attribute = collection_class.computed_attributes[name]
-          computed_attribute.apply_join(ds).select_append(computed_attribute.identifier.as(name))
+          computed_attribute.apply_join(ds, environment).select_append(computed_attribute.identifier.as(name))
         end
         build_query dataset: ds
       end
@@ -138,7 +138,7 @@ module Rasti
         raise NQL::InvalidExpressionError.new(filter_expression) if sentence.nil?
 
         ds = sentence.computed_attributes(collection_class).inject(dataset) do |ds, name|
-          collection_class.computed_attributes[name].apply_join ds
+          collection_class.computed_attributes[name].apply_join ds, environment
         end
         query = build_query dataset: ds
 

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '4.0.0'
+    VERSION = '4.1.0'
   end
 end

data/spec/computed_attribute_spec.rb

@@ -2,7 +2,7 @@ require 'minitest_helper'
 
 describe 'ComputedAttribute' do
 
-  it 'Apply Join wiht join attribute must generate correct query' do
+  it 'Apply Join with join attribute must generate correct query' do
     dataset = db[:users]
     computed_attribute = Rasti::DB::ComputedAttribute.new(Sequel[:comments_count][:value]) do |dataset|
       subquery = dataset.db.from(:comments)
@@ -13,7 +13,7 @@ describe 'ComputedAttribute' do
       dataset.join_table(:inner, subquery, :user_id => :id)
     end
     expected_query = "SELECT *, `comments_count`.`value` AS 'value' FROM `users` INNER JOIN (SELECT `user_id`, count(`id`) AS 'value' FROM `comments` GROUP BY `user_id`) AS 'comments_count' ON (`comments_count`.`user_id` = `users`.`id`)"
-    computed_attribute.apply_join(dataset)
+    computed_attribute.apply_join(dataset, environment)
                       .select_append(computed_attribute.identifier)
                       .sql
                       .must_equal expected_query
@@ -23,10 +23,30 @@ describe 'ComputedAttribute' do
     dataset = db[:people]
     computed_attribute = Rasti::DB::ComputedAttribute.new Sequel.join([:first_name, ' ', :last_name])
     expected_query = "SELECT * FROM `people` WHERE ((`first_name` || ' ' || `last_name`) = 'FULL NAME')"
-    computed_attribute.apply_join(dataset)
+    computed_attribute.apply_join(dataset, environment)
                       .where(computed_attribute.identifier => 'FULL NAME')
                       .sql
                       .must_equal expected_query
   end
 
+  it 'Apply join with join and environment attributes must generate correct query' do
+    dataset = db[:users]
+
+    expected_query = "SELECT *, `comments_count`.`value` AS 'value' FROM `users` INNER JOIN (SELECT `user_id`, count(`id`) AS 'value' FROM `comments` GROUP BY `user_id`) AS 'comments_count' ON (`comments_count`.`user_id` = `users`.`id`)"
+
+    computed_attribute = Rasti::DB::ComputedAttribute.new(Sequel[:comments_count][:value]) do |dataset, environment|
+      subquery = dataset.db.from(environment.data_source(:custom).qualify(:comments))
+                           .select(Sequel[:user_id], Sequel.function('count', :id).as(:value))
+                           .group(:user_id)
+                           .as(:comments_count)
+
+      dataset.join_table(:inner, subquery, :user_id => :id)
+    end
+
+    computed_attribute.apply_join(dataset, environment)
+                      .select_append(computed_attribute.identifier)
+                      .sql
+                      .must_equal expected_query
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel