directiverecord 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmViNTQwODFjYWQxNThmMzJjYzg0NzI1YjEwMzI3NmU1YzhiYjA1ZA==
+    ODE3NDA0NWNiMzAzMmNlMTg5YjFjNmFkMTFmOWFhOGEwOThjZDdhNw==
   data.tar.gz: !binary |-
-    ZTJjNzVlZDY1YzRmZTQ0NTc5M2VlZDkyYjQ5YWVlZWZlMjhmMGNjMg==
+    ZTU3ZWYyYzhhY2U2MTcxOGFkNGMzOWUxZDgwNDVjN2U5ZDZjMjFiYg==
 SHA512:
   metadata.gz: !binary |-
-    ZDZjZjQ1NGFhMzUwNzUyMzJlMzU0MzQwNGQ3YTQzYTQ5NTQyYWE2ZWFhMDI4
-    NzZlNTgxYjE4OTAxMzJmZTZhN2UzOTRiZmIyODU3NWQwYzc4Y2M3YWM2MzA0
-    NzA3OTA0MjE3ZTVhOGFiNzM3ZTIwOTU1NzZmNDU3ZjNhYTkxNzk=
+    ODhjZTIzZGNhNTE3OTExNjRhMzEwYzkyYjJlNTExMzBhN2QyZmNhMDkyMmRl
+    ZDhhZTU2MTM1MzM2MzIyOWJmYTZhNDI2ZmFlYWM0OTQ4YTZlMjJkZGMxODM3
+    ODE0OGVjNzYxYmYzYTdjZmFkYTU0ODRmMDNkZjQ0MThmYzllZDI=
   data.tar.gz: !binary |-
-    MWQwZWM4NDU1ZmFiZDlkYmE5NDY4ZTZiYmIwNTM2NTI1Mjk1NjhjNjIxNDZi
-    YjI2N2JjOGY5NDUyZDllZGZiMTMxMzI4ODc2Y2I2NGIwZDVmYzkyOGNkYzdl
-    ODYwOTY4Y2QzNDRhZTg1MmU1Mzk1NWQyNDI4MTAzODE1NzU2NGE=
+    MTBiZWE5Y2QwYWQ3M2QyZTE5ZjlhYmIxMDUxOTQ1MjM5MjEyNDA3MzQzODM0
+    MjZiMmJhMjU3ODAzZjc0ZjZhOTAwZTQzZWRmOTgzN2Y1NDBiYWZkNDE4MWU5
+    MWY4YTEyMzVmZmQ0YzkzYTQzMjFlYTEzZjRmYTJlYjIzZTMwNTQ=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.6 (February 11, 2015)
+
+* Improved BigQuery select statement correction concerning the group by statement
+
 == Version 0.1.5 (February 11, 2015)
 
 * Dropped :group_by => :all option

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/directive_record/query/big_query.rb

@@ -33,12 +33,18 @@ module DirectiveRecord
         aliases = options[:aliases] || {}
 
         options[:select].collect! do |string|
-          expression, select_alias = string.match(/^(.*) AS (.*)$/).try(:captures)
-          if select_alias
-            aliases[expression] = select_alias
-            options[:group_by].to_s.include?(expression) || !expression.match(/^\w+(\.\w+)*$/) ? string : "MAX(#{expression}) AS #{select_alias}"
+          if string.match(/^(.*) AS (.*)$/)
+            select_expression, select_alias = $1, $2
+            aliases[select_expression] = select_alias
+          end
+
+          select_expression ||= string
+          group_by_expression = select_alias || string
+
+          if options[:group_by].include?(group_by_expression) || !select_expression.match(/^\w+(\.\w+)*$/)
+            string
           else
-            string.match(/^\w+(\.\w+)*$/) ? "MAX(#{string})" : string
+            ["MAX(#{select_expression})", select_alias].compact.join(" AS ")
           end
         end if options[:group_by]
 

data/lib/directive_record/version.rb

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

data/test/unit/query/test_big_query.rb

@@ -18,7 +18,7 @@ module Unit
         it "generates the expected SQL" do
           assert_equal(
             %Q{
-              SELECT MAX(id),
+              SELECT id,
                      SUM(order_details_quantity_ordered) AS sum__order_details_quantity_ordered,
                      SUM(order_details_price_each) AS sum__order_details_price_each,
                      SUM(order_details_quantity_ordered * order_details_price_each) AS price
@@ -43,7 +43,7 @@ module Unit
 
           assert_equal(
             %Q{
-              SELECT MAX(id), SUM(order_details_quantity_ordered * order_details_price_each)
+              SELECT id, SUM(order_details_quantity_ordered * order_details_price_each)
               FROM
                 [my_stats.orders_20150115],
                 [my_stats.orders_20150116],
@@ -64,6 +64,30 @@ module Unit
               :period => "order_date"
             ).strip.gsub(/\s+/, " ")
           )
+
+          assert_equal(
+            %Q{
+              SELECT id, MAX(customer_id), SUM(order_details_quantity_ordered * order_details_price_each)
+              FROM
+                [my_stats.orders_20150115],
+                [my_stats.orders_20150116],
+                [my_stats.orders_20150117],
+                [my_stats.orders_20150118],
+                [my_stats.orders_20150119],
+                [my_stats.orders_20150120],
+                [my_stats.orders_20150121]
+              GROUP BY id
+              ORDER BY id
+            }.strip.gsub(/\s+/, " "),
+            Order.to_qry(
+              "id", "customer_id", "SUM(order_details.quantity_ordered * order_details.price_each)",
+              :connection => BigQuery.connection,
+              :where => "order_date >= '2015-01-15' AND order_date <= '2015-01-21'",
+              :group_by => "id",
+              :order_by => "id",
+              :period => "order_date"
+            ).strip.gsub(/\s+/, " ")
+          )
         end
       end
 

metadata

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