directiverecord 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODFhYjVlZWJhYWQxOTQyZDRjZDgwNmI0ODhjOGM1NzMwMGJmM2I5Zg==
+    NGU4Njg2NzU3OTk2NzUyYzlkYWVhMTQ3OTYwODQ1YWVjNmMyNjRiZQ==
   data.tar.gz: !binary |-
-    MGFhNzc2NWRhOWQ0MGQwM2RjZDVlNWNhYmJhNjY1MGI1MTdlYzgyOA==
+    NWE2MjQ5NThkZTZhMmJlZmZiODZiMzdkMGZlNjk4YWIzODcyMzBhZQ==
 SHA512:
   metadata.gz: !binary |-
-    OGU1MTQ0NTZiNmY1MjBiMmJhN2Y2ZGQ4ZTBiNGQwN2ZkNjFjYzAzN2FhYWM1
-    Nzk4NjllY2ZiZjczMTA1OWM2NmYwM2YwYWY3MTY2ZDVkZDgwMGJkNjQ5YzEx
-    OGQ4MzcxNjllNjRiMDA3ZWJlYmU2MmIyYWViM2M5MDQ1MDc5NGY=
+    N2ZlOGE0Yjc2NDU4YzViOWZmZGRlMzAxOWM1YTY0OWQ4MmU3MjFiODQ4MTlm
+    N2RlYjFhNWE4NzZhYjNlODMxYmFkYTQ5NmQyNDJjMjlkNzE3NmMyZmQ0Njc3
+    YjAxYzhlNTUyY2UwOTQ0NmE3MGNiMTk1ZTI2ODg1ZWI2ZjRhMjQ=
   data.tar.gz: !binary |-
-    YTBjOGM1ODRmYTk4MTI0YmJkY2YwYjljOTUwNDJkMDEzYzg5MmFiMTcwMDA3
-    NDU1ZDg3YTBjNWU4MjM0NjJlYzA5OThkNjJjMjFkMjg1OGExMjA5MWM5Yzk3
-    M2JjMDA0ZmM1NDc2OWE0OWMzMGZhMTE4YTcwZTg4MDhkYmMyN2I=
+    MDdkZWVmZDExZmMwMzY1ZTRkZjdmODI2OWIwY2M4NTc4OTMwZTk1MWZmNmUz
+    ZGZkYjQwNjY3Zjk0ZTQ1NjU0MDExYWU5MzI0Y2E1N2I4NDdhYjk1NTJiYjQ2
+    YTM2YTAzNjFmMzQ2Yzc4NmIzODcwZDllZDg0OWM1ODc5NjhlZDc=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.8 (February 25, 2015)
+
+* Corrected auto-applying MAX(..) aggregate function within BigQuery SELECT statements
+
 == Version 0.1.7 (February 20, 2015)
 
 * Improved BigQuery FROM statement (using TABLE_DATE_RANGE)

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/directive_record/query/big_query.rb

@@ -19,7 +19,7 @@ module DirectiveRecord
           end
           if begin_date
             dataset = ::BigQuery.connection.instance_variable_get(:@dataset) # TODO: fix this
-            options[:from] = "\n  (TABLE_DATE_RANGE(#{dataset}.#{base.table_name}_, TIMESTAMP('#{begin_date}'), TIMESTAMP('#{end_date}')))"
+            options[:from] = "\n  TABLE_DATE_RANGE(#{dataset}.#{base.table_name}_, TIMESTAMP('#{begin_date}'), TIMESTAMP('#{end_date}'))"
           end
         end
       end
@@ -38,7 +38,7 @@ module DirectiveRecord
           select_expression ||= string
           group_by_expression = select_alias || string
 
-          if options[:group_by].include?(group_by_expression) || !select_expression.match(/^\w+(\.\w+)*$/)
+          if options[:group_by].include?(group_by_expression) || options[:group_by].include?(select_expression) || !select_expression.match(/^\w+(\.\w+)*$/)
             string
           else
             ["MAX(#{select_expression})", select_alias].compact.join(" AS ")

data/lib/directive_record/version.rb

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

data/test/unit/query/test_big_query.rb

@@ -23,7 +23,7 @@ module Unit
                      SUM(order_details_price_each) AS sum__order_details_price_each,
                      SUM(order_details_quantity_ordered * order_details_price_each) AS price
               FROM
-                (TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-21'), TIMESTAMP('2015-01-21')))
+                TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-21'), TIMESTAMP('2015-01-21'))
               GROUP BY id
               ORDER BY price DESC
             }.strip.gsub(/\s+/, " "),
@@ -45,7 +45,7 @@ module Unit
             %Q{
               SELECT id, SUM(order_details_quantity_ordered * order_details_price_each)
               FROM
-                (TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-15'), TIMESTAMP('2015-01-21')))
+                TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-15'), TIMESTAMP('2015-01-21'))
               GROUP BY id
               ORDER BY id
             }.strip.gsub(/\s+/, " "),
@@ -63,7 +63,7 @@ module Unit
             %Q{
               SELECT id, MAX(customer_id), SUM(order_details_quantity_ordered * order_details_price_each)
               FROM
-                (TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-15'), TIMESTAMP('2015-01-21')))
+                TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-15'), TIMESTAMP('2015-01-21'))
               GROUP BY id
               ORDER BY id
             }.strip.gsub(/\s+/, " "),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord