directiverecord 0.1.11 → 0.1.12

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTcxNmYzYThjODg4OGZmZGVhZWIwMjQzZmQ2ZGExY2I2YWI1YWI3NA==
-  data.tar.gz: !binary |-
-    YTdmNzI2MjM4ZTI4NzA3NDBmZGI2NTAwMGI1OGZhNDAwNDJjNzBiNA==
+SHA1:
+  metadata.gz: df721b5ec99c98a868667e250aea31187c079bea
+  data.tar.gz: f7ef75ed7fb5f252622ad38f7def0e17a44aba60
 SHA512:
-  metadata.gz: !binary |-
-    ZjhiNmRhMzU0ZWRkOWQ1ODVhMWExNzE1MzY3ZGMwYWMzZTkwMmI0MDlmYjA2
-    OGM5NzcwYWM1NjE5ZTBiMzcxZDQxYzA3NGZlZWYxZDA4M2RmYjU1OWI0ZTE5
-    YzEzMDQyYTEwMjkwNGFiYzg0MjBkYTQyNjU2ZmM2NGM4ZmE0YWY=
-  data.tar.gz: !binary |-
-    YmM4OTgxZDc3NzJjZTY0ZjhiNjQwYjhiNDZhYTc4OWU5ZDgyNzY5ZmI0MGY5
-    MTBjZDg2NTYxOWYyZTk3MzM5NDUxYjQyMjRmZTQxMDFmZDg4NGM1OTk0MzIy
-    NmExMTA4MmZlN2EzMGQwYjllZGFiYzc0M2JlYzI1OWMzMDJjNzc=
+  metadata.gz: 732c2dfe564ef73a4ede1fc6a5d710570a232eae2815fdc125fae9bd65310f8a75f7453279a00139367e54f29ef809acd029971fa2d31a8ae219d22ec476aa61
+  data.tar.gz: b7a5ec354819ec0c0cf68e5591c621e5f2457356858d63702fc68ed723ff77a08be74e3d993ee4b66a647986edd91ce9842042583ef4de3351b0a2f9dc49d68c

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.12 (March 8, 2015)
+
+* Being able to specify calculated :group_by option
+* Not adding ORDER BY statement automatically
+
 == Version 0.1.11 (March 6, 2015)
 
 * Counting ‘DISTINCT id’ instead of ‘*’ in ActiveRecord::Relation#count(:all) override

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/directive_record/query/sql.rb

@@ -117,6 +117,7 @@ SQL
         normalize_select!(options)
         normalize_from!(options)
         normalize_where!(options)
+        normalize_group_by!(options)
         normalize_order_by!(options)
         options.reject!{|k, v| v.blank?}
       end
@@ -196,12 +197,18 @@ SQL
         end
       end
 
-      def normalize_order_by!(options)
-        options[:order_by] ||= (options[:group_by] || []).collect do |path|
-          direction = "DESC" if path.to_s == "date"
-          "#{path} #{direction}".strip
-        end unless options[:select] == "COUNT(*)"
+      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
+          else
+            x
+          end
+        end if options[:group_by]
+      end
 
+      def normalize_order_by!(options)
         return unless options[:order_by]
 
         options[:order_by].collect! do |x|

data/lib/directive_record/version.rb

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

data/test/unit/query/test_big_query.rb

@@ -76,6 +76,22 @@ module Unit
               :period => "order_date"
             ).strip.gsub(/\s+/, " ")
           )
+
+          assert_equal(
+            %Q{
+              SELECT COUNT(id), YEAR(order_date) AS year
+              FROM
+                TABLE_DATE_RANGE(my_stats.orders_, TIMESTAMP('2015-01-15'), TIMESTAMP('2015-01-21'))
+              GROUP BY year
+            }.strip.gsub(/\s+/, " "),
+            Order.to_qry(
+              "COUNT(id)",
+              :connection => BigQuery.connection,
+              :where => "order_date >= '2015-01-15' AND order_date <= '2015-01-21'",
+              :group_by => "YEAR(order_date) AS year",
+              :period => "order_date"
+            ).strip.gsub(/\s+/, " ")
+          )
         end
       end
 

data/test/unit/query/test_mysql.rb

@@ -90,7 +90,6 @@ module Unit
                 LEFT JOIN tags `tags` ON `tags`.id = `tags_bridge_table`.tag_id
                 WHERE (`tags`.name LIKE '%gifts%')
                 GROUP BY `tags`.id
-                ORDER BY `tags`.id
               }
             ),
             Customer.where("tags.name LIKE ?", "%gifts%").group("tags.id").to_qry("tags.*")
@@ -104,7 +103,6 @@ module Unit
                 LEFT JOIN orders `orders` ON `orders`.customer_id = `c`.id
                 GROUP BY `c`.id
                 HAVING (order_count > 3)
-                ORDER BY `c`.id
               }
             ),
             Customer.to_qry("id", "name", "COUNT(orders.id) AS order_count", :where => "order_count > 3", :group_by => "id")
@@ -174,7 +172,6 @@ module Unit
                 SELECT ROUND(SUM(`od`.price_each), 2) AS `sum:price_each`
                 FROM order_details `od`
                 GROUP BY `od`.order_id
-                ORDER BY `od`.order_id
               }
             ),
             OrderDetail.to_qry("price_each", :aggregates => {"price_each" => :sum}, :group_by => "order_id")
@@ -187,7 +184,6 @@ module Unit
                 FROM order_details `od`
                 LEFT JOIN orders `order` ON `order`.id = `od`.order_id
                 GROUP BY c1
-                ORDER BY c1
               }
             ),
             OrderDetail.to_qry("order.id", "price_each", :aggregates => {"price_each" => :sum}, :group_by => "order.id", :numerize_aliases => true)
@@ -250,6 +246,18 @@ module Unit
             ),
             Office.usa.to_qry
           )
+
+          assert_equal(
+            strip(
+              %Q{
+                SELECT `o`.*, YEAR(created_at) AS year
+                FROM offices `o`
+                WHERE (`o`.country = 'USA')
+                GROUP BY year
+              }
+            ),
+            Office.usa.to_qry(:group_by => "YEAR(created_at) AS year")
+          )
         end
       end
 

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A layer on top of ActiveRecord for using paths within queries without
@@ -143,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
@@ -195,17 +195,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking