directiverecord 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5542ba11ccbf51ecb247505811188c00fd200e83
-  data.tar.gz: c2f672c63f3d1d8ff021337ef5ef6e75bd334157
+  metadata.gz: bc26fa9710b00e61650bf32c723af7b687a82b09
+  data.tar.gz: 81ad26f3c3e8d3724c3d811f0ce4716a48743b95
 SHA512:
-  metadata.gz: 3984980a4f9574c032c46e84dba0d638534ff1906956ac235839f215b71be7e16bbfe7dbeb1a66804a8db010bd292fd82480d19f103cc6a4c042e1db5eb48b25
-  data.tar.gz: edcdfaebee1ab54f5ebcf528751b7439fd74bbd628760530649bd59aadc962f00a7dafb5c742c68faa6545e0fa73a6c3336c1dbd1d508feddda3a5be6c97ae0a
+  metadata.gz: 777881c9461b0e2596f1e355508cfe9e6b8306c3c7a0c2af94a0a87816a21074a38398426af5301477193087013404ec0261461b5c5fe319913ff724abab930c
+  data.tar.gz: ef1bdb1dce944f4927a1ad83c8706270d655006d48f5981b5d769a0c366aceb52ff2c821bffc5e8c954ffee8cbed5108b7707a0fe403a82e2c6c60b14aa33f5c

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.26 (June 9, 2015)
+
+* Fixed error when optimizing a query containing an ordered calculated column
+
 == Version 0.1.25 (May 20, 2015)
 
 * Not assuming that an ActiveRelation where value contains a table alias to a corresponding association

data/VERSION

@@ -1 +1 @@
-0.1.25
+0.1.26

data/lib/directive_record/query/sql.rb

@@ -93,7 +93,9 @@ SQL
       def optimize_query!(options)
         select = options[:select]
         if options[:optimize] && (select != %w(id)) && select.any?{|x| x.match(/^\w+(\.\w+)+$/)}
-          ids = base.connection.select_values(to_sql(options.merge(:select => "id"))).uniq + [0]
+          order_by = options[:order_by] || []
+          select = ["id"] + select.select{|x| x.match(/ AS (\w+)$/) && order_by.any?{|y| y.include?(quote_alias($1))}}
+          ids = base.connection.select_values(to_sql(options.merge(:select => select))).uniq + [0]
           options[:where] = ["id IN (#{ids.join(", ")})"]
           options.delete :limit
           options.delete :offset

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 25
+  TINY  = 26
 
   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.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking