directiverecord 0.1.18 → 0.1.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2I3ZDI1Yzk0OWViMDIxYjFlMGU2ZjM5NjVhMDY4MzI1NDQ0ZGViZA==
+    Yzk0MWI2Y2VlNTdlZTlhN2YxYmFhNWUzNjFiYWExMmVkY2FjMTNiZA==
   data.tar.gz: !binary |-
-    YjRkYzVkODQwNDNjYzc4ZDZmYWNlNDJhNDMyMjM5ZjhiYTVmZGVkOA==
+    MDBiMWY2N2NkYWRlMDkzOGQwNTRmMmU0MzM1NTgwY2FlOTk4N2UyNQ==
 SHA512:
   metadata.gz: !binary |-
-    YzM2ODg4NTBjZDc4YmQ5MjExYWZiYzA2MDZhY2U5ZTY0Njg2YzAzM2YyZWFl
-    ZjFmNjEyM2FiZTczOTBkMjEwZmRkMTU3NTIwNDUxYzhkMDY5YWQ1NDgyNWY3
-    N2EzZWY0YWI0ODM1YWEwNzJlNzgwNzU5MTNhZWEzY2RlMmY2YWQ=
+    ZGI0ZTBhNTY4MGU5NTQ5YTIyNWI3MTJiYWRkMzlkODRhOTNlZWJmZmJjZDM3
+    NDcxZTg1YjA0NjU3OGUyMDlkYWVlMzUzMjkzYWZmZjg5MTE5ZjEzMTk4ODZk
+    MGU5ODQzOGJiNjE5MzNjZWY4NjBmZjUzZjI2ZTYxZTJiZDc4MDk=
   data.tar.gz: !binary |-
-    NGNmNzZlMDRiNGIxZDcyNDZkYTMxNmFlZTQxYzZhNzMyZWRhYjhmMGY4OGIx
-    Y2ZiYmQ5N2NmYmU3N2UzMmRhMWZhN2VkNWQ5NjYyZTMwZjY2ZGY5MDI5YTRk
-    NzNjMTBkMWRmNzhmNmQwNDhkOTQ0NTYzZmJlYTU5ODBmNzkwZDg=
+    MmEzN2M3ZjhlZWE5YmZkZGRkNDMyN2ZhNDkxZjBkOTc0YWExYjYxMDc5NDQ1
+    MmU2N2JjMGRjZTQ1ODMyNTIzNzYwNWY5OWViZjgwMmEwOWY0OGU3YjZlZTQ0
+    OTAzYjg1ZjQ3MzcyN2QzMGM2MGFiNzZjMDFkZTg1Y2U2OWU1MmU=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.19 (March 25, 2015)
+
+* Corrected normalize_group_by! when dealing with numerized calculations
+
 == Version 0.1.18 (March 18, 2015)
 
 * Being able to “flatten” a subselect (in order to aggregate a subselect within a subselect)

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

data/lib/directive_record/query/sql.rb

@@ -264,9 +264,13 @@ SQL
 
       def normalize_group_by!(options)
         options[:group_by].collect! do |x|
-          if x.match(/ AS (\w+)$/)
-            options[:select] << x unless options[:select].include?(x)
-            $1
+          if x.match(/^(.*?) AS (\w+)$/)
+            if options[:select].any?{|x| x.include?("#{$1} AS ")}
+              $1
+            else
+              options[:select] << x
+              $2
+            end
           else
             x
           end

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 18
+  TINY  = 19
 
   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.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord