directiverecord 0.1.20 → 0.1.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzc2MmU5YWE1N2FhM2VhYzFhYmQ3OWMyOTYzNjAwNDZjYjgyOTAzNw==
+    MmYzMWQ2NTkwOWRkMWJhNTRhNDVjM2U5ODYzNTgwY2ZhZWU4YzkyMQ==
   data.tar.gz: !binary |-
-    ZjdmNzkzNGNhYTJmYTM1YzVlYWRlY2NkNzk0MzNmNjFmMWQzODllNw==
+    Mzg2NmQzNmJjYmI0Y2ZhOGY1ODM1YTBhMmE3NjUzNjU5ZjBmZWU4Mw==
 SHA512:
   metadata.gz: !binary |-
-    OTZjYjJjMzliZDljNjY3OTQ2MzU0MWMwOTJlZWU1ODNlMzM1Mjk0MmE0ZmJm
-    MWEwOGMwYzNlMzEzMmIyYjBlNzJlM2MzMWI4ZDZhZmNlMGFlMzcwNjM4NjUz
-    YjRjZjY3YWM1ZTkxYzhlOTE2Y2RkNGY3YWVmMjA5YjI0OGJlMWI=
+    MGRjNjBmNmQ5ZTJkNTVmMjUxMDk3MDM4ZTdlYWQ3MTY0YmY4OGI0Mzk3Y2Ix
+    MmZmY2MyYTI1ZTc0Mjc4MmQ2YjA3NWZhNmRiNTFlOGU2ZDk0NDk5NDJmYjA1
+    NmY5YmQwYTczNWM3MGY2MTI2ZTg4MzBiYTk4MDZmNDQ4NGVlZWY=
   data.tar.gz: !binary |-
-    NGU5ZDkzYjIyZGE1MDU2ZjgzODFjODgzZmZhM2Y5OGM1ODgxOTkwZjE5Mzhk
-    NmU0NjY1ZWI4ZWI2ZGU3ZTljOTlkOTEyOTBjY2UwZmYyZjQwMmQwOTU0NmY4
-    OGY2ZmE1NjJjY2FmZTA2OGNhNzZkOWUyMmJlZDVhYWIzOGNmNWQ=
+    NDRjNjg0NmJhZjhkYmY0OTZmOTg1YjA3MjQ1YmQ5MDAzY2E0OTQ1OGZlYjRl
+    NzQzMDQ0MGVmNTRiNDE0NzIwNGRkYjUwMzljYjA4YTFkOWEyNjAxMWIyODhk
+    Mzc5YWY0MjBiMmVhYzVhNzMzMGVkMWMyYTVhY2JlZmJmMjk2MzI=

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.21 (April 3, 2015)
+
+* Storing original sql alias of a calculated column when numerizing aliases
+* Updating SELECT statement when dealing with auto-aggregated field as a HAVING statement
+* Corrected having multiple HAVING statements within a BigQuery query
+
 == Version 0.1.20 (April 3, 2015)
 
 * Improved HAVING statement detection

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/lib/directive_record/query/big_query.rb

@@ -45,11 +45,13 @@ module DirectiveRecord
           end
         end if options[:group_by]
 
-        [:group_by, :having, :order_by].each do |key|
-          if value = options[key]
-            value = value.join ", "
-            aliases.each{|pattern, replacement| value.gsub! pattern, replacement}
-            options[key] = value
+        {", " => [:group_by, :order_by], " AND " => [:having]}.each do |delimiter, keys|
+          keys.each do |key|
+            if value = options[key]
+              value = value.join delimiter
+              aliases.each{|pattern, replacement| value.gsub! pattern, replacement}
+              options[key] = value
+            end
           end
         end
       end

data/lib/directive_record/query/sql.rb

@@ -150,16 +150,19 @@ SQL
             sql = "ROUND(#{sql}, #{scale})"
             sql_alias ||= quote_alias(path)
           end
-          if options[:numerize_aliases]
-            sql = sql.gsub(/ AS .*$/, "")
-            sql_alias = options[:aliases][prepend_base_alias(sql_alias || sql)] = "c#{array.size + 1}"
-          end
+
           unless sql_alias
             sql.match(/^(.*) AS (.*)$/)
             sql = $1 if $1
             sql_alias = $2
           end
 
+          if options[:numerize_aliases]
+            c_alias = "c#{array.size + 1}"
+            options[:aggregated][sql_alias] = c_alias if !aggregate_method && sql_alias
+            sql_alias = options[:aliases][prepend_base_alias(sql_alias || sql)] = c_alias
+          end
+
           sql.gsub!(/sub:(\w+)\./) { "#{quote_alias($1)}." } if sql.is_a?(String)
           options[:aliases][sql] = sql_alias if sql_alias
 
@@ -242,7 +245,15 @@ SQL
                    .all? do |sql|
             sql.match /(.*?)\s*(=|<=>|>=|>|<=|<|<>|!=|is|like|rlike|regexp|in|between|not|sounds|soundex)(\b|\s|$)/i
             path = $1.strip
-            !(aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i)
+
+            if (options[:aggregates] || {})[path]
+              normalize_select!(opts = options.deep_dup.merge(:select => [path]))
+              options[:select].concat(opts[:select]).uniq!
+              options[:aggregated].merge!(opts[:aggregated])
+              false
+            else
+              !(aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i)
+            end
           end
         end
 

data/lib/directive_record/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Paul Engel