directiverecord 0.1.10 → 0.1.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDNjNWU1NTk0ZmM0MTViZDgyZDAxMmJkNmI5OWYwZTQ4MGUzNmIzZQ==
+    OTcxNmYzYThjODg4OGZmZGVhZWIwMjQzZmQ2ZGExY2I2YWI1YWI3NA==
   data.tar.gz: !binary |-
-    MDEwNjA5YmQ2ZTRkM2Q2ZjFjZDY3MGViYTE0ZTJmN2YyZDQyMzQxOA==
+    YTdmNzI2MjM4ZTI4NzA3NDBmZGI2NTAwMGI1OGZhNDAwNDJjNzBiNA==
 SHA512:
   metadata.gz: !binary |-
-    ZmE4ZjdjNzVhNzRhYjk4NjI5NjkzMzY0ZDQyZDE3OTAxMTM2YWVjODNmZDlm
-    NGRmN2RkMzBkMGFmZDUyMDc5ODk1YjlhNjUxNDU3NGU2NDE3YTFhNzkzZWRl
-    ZTkzNmE3YTJhODA0ZTIyMjBhZDY2OGI3ZmIxY2ZiZWYwOTUxY2I=
+    ZjhiNmRhMzU0ZWRkOWQ1ODVhMWExNzE1MzY3ZGMwYWMzZTkwMmI0MDlmYjA2
+    OGM5NzcwYWM1NjE5ZTBiMzcxZDQxYzA3NGZlZWYxZDA4M2RmYjU1OWI0ZTE5
+    YzEzMDQyYTEwMjkwNGFiYzg0MjBkYTQyNjU2ZmM2NGM4ZmE0YWY=
   data.tar.gz: !binary |-
-    NmNlNjkyZDE1NjRhZjI2NmZlNDk3MmM0M2IzYjJiZDUxY2ZhMjg3MWM0Mjc2
-    NjU4NjM0M2YwZWY3ZTY0MGZlZWRjN2VkN2M0ZjU0ZDBjOWVjYjdlY2NlMTE1
-    MDJjMWVmMmYwZDk1NTE0YTE4MDAwM2M0MDk3OTNiYzEyMDQ5MDc=
+    YmM4OTgxZDc3NzJjZTY0ZjhiNjQwYjhiNDZhYTc4OWU5ZDgyNzY5ZmI0MGY5
+    MTBjZDg2NTYxOWYyZTk3MzM5NDUxYjQyMjRmZTQxMDFmZDg4NGM1OTk0MzIy
+    NmExMTA4MmZlN2EzMGQwYjllZGFiYzc0M2JlYzI1OWMzMDJjNzc=

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.11 (March 6, 2015)
+
+* Counting ‘DISTINCT id’ instead of ‘*’ in ActiveRecord::Relation#count(:all) override
+* Leaving sub selects alone
+
 == Version 0.1.10 (March 5, 2015)
 
 * Overridden ActiveRecord::Relation#count(:all) to hook in DirectiveRecord query mechanism

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/directive_record/gem_ext/active_record/relation.rb

@@ -17,7 +17,7 @@ module ActiveRecord
 
     def count(column_name = nil, options = {})
       if !loaded? && (column_name == :all) && (options == {})
-        qry("COUNT(*)")[0][0]
+        qry("COUNT(DISTINCT id)")[0][0]
       else
         original_count column_name, options
       end

data/lib/directive_record/query/sql.rb

@@ -296,6 +296,7 @@ SQL
       end
 
       def prepend_base_alias(sql, aliases = {})
+        return sql if sql.include?("SELECT")
         columns = base.columns_hash.keys
         sql.gsub(/("[^"]*"|'[^']*'|`[^`]*`|[a-zA-Z_#{aggregate_delimiter}]+(\.[a-zA-Z_\*]+)*)/) do
           columns.include?($1) ? "#{base_alias}.#{$1}" : begin

data/lib/directive_record/version.rb

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

data/test/unit/gem_ext/active_record/test_relation.rb

@@ -47,7 +47,7 @@ module Unit
               describe "when not loaded" do
                 it "uses qry to count the records" do
                   @relation.expects(:loaded?).returns(false)
-                  @relation.expects(:qry).with("COUNT(*)").returns([[1982]])
+                  @relation.expects(:qry).with("COUNT(DISTINCT id)").returns([[1982]])
                   assert_equal 1982, @relation.count(:all)
                 end
               end

data/test/unit/query/test_mysql.rb

@@ -17,7 +17,17 @@ module Unit
                 FROM offices `o`
               }
             ),
-            Office.to_qry("id, city")
+            Office.to_qry("id", "city")
+          )
+
+          assert_equal(
+            strip(
+              %Q{
+                SELECT `o`.id, `o`.city, (SELECT o1.id FROM offices o1)
+                FROM offices `o`
+              }
+            ),
+            Office.to_qry("id", "city", "(SELECT o1.id FROM offices o1)")
           )
 
           assert_equal(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord