directiverecord 0.1.17 → 0.1.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQwN2FkODM3MTk4NjFkOTFhYjViYjIxYjdlYzlhZmM0YmMzZTIwMg==
+    M2I3ZDI1Yzk0OWViMDIxYjFlMGU2ZjM5NjVhMDY4MzI1NDQ0ZGViZA==
   data.tar.gz: !binary |-
-    Y2RjZjMwNTUzODkxYjgwNWRmODAxNTZiZTlhZTIzZWMyZjNjNDc4Mg==
+    YjRkYzVkODQwNDNjYzc4ZDZmYWNlNDJhNDMyMjM5ZjhiYTVmZGVkOA==
 SHA512:
   metadata.gz: !binary |-
-    NmZiMmEwMTgxNThjZGVlZjA0NjFlYTE2OGZhZWU3ZGQyMjU4NjVjNGRkYTg1
-    MjlhNDNlYTFhMTNhMGI3MzI4YTRhZjZjYmJhNDk3M2U2NTExYjkzZGI2ZTU5
-    MzA3MjM5ZjQ3Yzk5YTcwZWFmZWI4MDIyZmI1MTY5YmQ0NWMyMzA=
+    YzM2ODg4NTBjZDc4YmQ5MjExYWZiYzA2MDZhY2U5ZTY0Njg2YzAzM2YyZWFl
+    ZjFmNjEyM2FiZTczOTBkMjEwZmRkMTU3NTIwNDUxYzhkMDY5YWQ1NDgyNWY3
+    N2EzZWY0YWI0ODM1YWEwNzJlNzgwNzU5MTNhZWEzY2RlMmY2YWQ=
   data.tar.gz: !binary |-
-    ZWYyYmY0OGI2YmQwZGZmNWIyMTEyNDA2ZDNiY2M1ZjAwN2M1ZjUyNGI5NWFh
-    MjgwMzA0Yjg4YTk1ZmE1ZDgxMjhmZWY5OGFiNjI1NmZmYzRiMTc4OWZiMjg0
-    ZDBkNzUxNWMwNmI4YzE0ODA3MmQ0NTAxZjBiMzE4M2E3MzQyMGE=
+    NGNmNzZlMDRiNGIxZDcyNDZkYTMxNmFlZTQxYzZhNzMyZWRhYjhmMGY4OGIx
+    Y2ZiYmQ5N2NmYmU3N2UzMmRhMWZhN2VkNWQ5NjYyZTMwZjY2ZGY5MDI5YTRk
+    NzNjMTBkMWRmNzhmNmQwNDhkOTQ0NTYzZmJlYTU5ODBmNzkwZDg=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.18 (March 18, 2015)
+
+* Being able to “flatten” a subselect (in order to aggregate a subselect within a subselect)
+
 == Version 0.1.17 (March 13, 2015)
 
 * Corrected normalize_subselect!

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/lib/directive_record/query/sql.rb

@@ -10,7 +10,9 @@ module DirectiveRecord
         options = to_options(args)
         validate_options! options
 
-        original_options = options.deep_dup.reject!{|k, v| v.nil?}
+        original_options = options.deep_dup
+        original_options.reject!{|k, v| v.nil?}
+
         check_path_delimiter! options
         optimize_query! options
 
@@ -168,13 +170,14 @@ SQL
 
       def normalize_subselect!(options, original_options)
         options[:subselect] = options[:subselect].sort_by{|name, (klass, opts)| opts[:join] ? 0 : 1}.collect do |name, (klass, opts)|
-          qry_options = original_options.deep_dup.reject!{|k, v| [:subselect, :numerize_aliases, :limit, :offset, :order_by].include?(k)}
+          qry_options = original_options.deep_dup
+          qry_options.reject!{|k, v| [:subselect, :numerize_aliases, :limit, :offset, :order_by, :join, :flatten].include?(k)}
 
           opts.each do |key, value|
             value = [value].flatten
             if key == :select
               qry_options[key] = value
-            elsif key == :join
+            elsif [:join, :flatten].include?(key)
               # do nothing
             elsif key.to_s.match(/include_(\w+)/)
               (qry_options[$1.to_sym] || []).select!{|x| value.any?{|y| x.include?(y)}}
@@ -203,6 +206,22 @@ SQL
           end
 
           query = klass.to_qry(qry_options).gsub(/\n\s*/, " ").gsub(/#{base_alias}[\s\.]/, "")
+
+          if opts[:flatten]
+            qry_alias = quote_alias("_#{name}")
+
+            dup_options = qry_options.deep_dup
+            normalize_select!(dup_options)
+            prepend_base_alias!(dup_options)
+
+            select = dup_options[:select].collect do |sql|
+              sql_alias = sql.match(/ AS (.*?)$/).captures[0]
+              "SUM(#{qry_alias}.#{sql_alias}) AS #{sql_alias}"
+            end
+
+            query = "SELECT #{select.join(", ")} FROM (#{query}) #{qry_alias}"
+          end
+
           "#{prefix}(#{query}) #{query_alias}#{postfix}"
 
         end if options[:subselect]

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 17
+  TINY  = 18
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord