directiverecord 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc70bdc6154246ffdce6e0d4814560fef801f3e3
-  data.tar.gz: 28798e0aac7a3130d121fac1d826182e73510340
+  metadata.gz: 4972f8c98aa0d771e6f66d7b969a7d17d3882b49
+  data.tar.gz: f320a5b19abc343d0ed9b71d078490d29c3d8b76
 SHA512:
-  metadata.gz: d8d91f3ac15f35e23e9888a25d3a7519c9ccafe4bb5bc5ed2b0e5bd3d7df9778b98065d97e7a6b415b76465f953c30b0660ac8fd2ca94bcf21fccdee80b2452f
-  data.tar.gz: c15c5467150524258c277507ef046a0ddd533f4e7dcaf3f834c199adc9571f2a8940629bfc7841f558c379a04fcab9abc2826500b5a135a2d39657a912c2c780
+  metadata.gz: 8c68d43a7a1328c44d0b064e1ee90d95334c70a816b7f1c6b75bb877743e75b20cbc8bde43352edc4623052184c8a93e3582b024363a362c02c9ba23694906b8
+  data.tar.gz: 7f2e85e313ba57b2e9d37a50c40dce288256348a7265ce3b164b3ee34a96bcb51299bc10a02eadde3e326be6338e535eae7aeadfc25ff7a7ccf28368418fd356

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.28 (August 13, 2015)
+
+* Corrected handling HAVING statements for “virtual columns” defined in the GROUP BY
+
 == Version 0.1.27 (July 9, 2015)
 
 * Including extra join conditions

data/VERSION

@@ -1 +1 @@
-0.1.27
+0.1.28

data/lib/directive_record/query/sql.rb

@@ -122,8 +122,8 @@ SQL
         normalize_select!(options)
         normalize_subselect!(options, original_options)
         normalize_from!(options)
-        normalize_where!(options)
         normalize_group_by!(options)
+        normalize_where!(options)
         normalize_order_by!(options)
         options.reject!{|k, v| v.blank?}
       end
@@ -236,6 +236,28 @@ SQL
         options[:from] = "#{base.table_name} #{base_alias}"
       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
+              $2
+            end
+          else
+            x
+          end
+        end if options[:group_by]
+
+        if normalize_select
+          normalize_select!(options)
+        end
+      end
+
       def normalize_where!(options)
         regexp, aliases = /^\S+/, options[:aliases].invert
 
@@ -254,7 +276,10 @@ SQL
               options[:aggregated].merge!(opts[:aggregated])
               false
             else
-              !(aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i)
+              !(
+                (aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i) ||
+                aliases.include?(path)
+              )
             end
           end
         end
@@ -275,21 +300,6 @@ SQL
         end
       end
 
-      def normalize_group_by!(options)
-        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
-              $2
-            end
-          else
-            x
-          end
-        end if options[:group_by]
-      end
-
       def normalize_order_by!(options)
         return unless options[:order_by]
 

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 27
+  TINY  = 28
 
   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.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord