directiverecord 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4972f8c98aa0d771e6f66d7b969a7d17d3882b49
-  data.tar.gz: f320a5b19abc343d0ed9b71d078490d29c3d8b76
+  metadata.gz: 1bfe5ca92925fd12668d8679e9a93f5db099f29f
+  data.tar.gz: b77c4c85e6ecd7ab12b3cf3dbb685ef29bb7f74e
 SHA512:
-  metadata.gz: 8c68d43a7a1328c44d0b064e1ee90d95334c70a816b7f1c6b75bb877743e75b20cbc8bde43352edc4623052184c8a93e3582b024363a362c02c9ba23694906b8
-  data.tar.gz: 7f2e85e313ba57b2e9d37a50c40dce288256348a7265ce3b164b3ee34a96bcb51299bc10a02eadde3e326be6338e535eae7aeadfc25ff7a7ccf28368418fd356
+  metadata.gz: 7dd096afe893a680a35ebe1132f046cf6bee6c5f335a83f43c844ebe0c7a5b699dc1672615f1c7f264e31ca6f11ca1eeeeb67627cd2f11f9672b9d2d2476edae
+  data.tar.gz: c215ece54c252766a1ef0163bca6d135549752947bbbb2dd8f66df5f96b84592f2c0f8ab73a0c260959b7dc2d71c547f2468defca5c87283f99a3a6605d56f07

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.29 (August 17, 2015)
+
+* Not normalizing select option again after having encountered new calculated columns in the GROUP BY statement, instead just register the alias
+
 == Version 0.1.28 (August 13, 2015)
 
 * Corrected handling HAVING statements for “virtual columns” defined in the GROUP BY

data/VERSION

@@ -1 +1 @@
-0.1.28
+0.1.29

data/lib/directive_record/query/sql.rb

@@ -237,25 +237,19 @@ SQL
       end
 
       def normalize_group_by!(options)
-        normalize_select = false
-
         options[:group_by].collect! do |x|
           if x.match(/^(.*?) AS (\w+)$/)
             if options[:select].any?{|x| x.include?("#{$1} AS ")}
               $1
             else
               options[:select] << x
-              normalize_select = true
+              options[:aliases][$1] = $2
               $2
             end
           else
             x
           end
         end if options[:group_by]
-
-        if normalize_select
-          normalize_select!(options)
-        end
       end
 
       def normalize_where!(options)
@@ -276,10 +270,7 @@ SQL
               options[:aggregated].merge!(opts[:aggregated])
               false
             else
-              !(
-                (aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i) ||
-                aliases.include?(path)
-              )
+              !(aliases.include?(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  = 28
+  TINY  = 29
 
   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.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord