orm_adapter 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc52f312f40978e98faccf378d0478a5bc4778b0
-  data.tar.gz: fc8d36e106c659dbac6b7f620657899c81245248
+  metadata.gz: c94ff61c9aabbe1129b7037d1187a29e803ebb52
+  data.tar.gz: cf04bc145952fb582c6015a9b85d0129d2d801cf
 SHA512:
-  metadata.gz: 9b4889fc827dfe94918c89873dbf5b6bd9063321674115ac3990d1422be7263b8c9a777e3f1692511cd404ae31bbe292bf6eedab7e4e5231ed868258ab62991b
-  data.tar.gz: 2833a8437efde00b070b520926d2ff42c080a9f5737db60bfe3687e766324148bfbe38cc4d5049be69a72d0169c9bec75a71ba35f3d4204a8758cb9b1e6ed752
+  metadata.gz: cdadd8d9a6cd0483802fc6c4f6865dd2647842c1ddbde7e078efdb413b23b98228a55c9fc95620d73029dbdfe9a3706e31371b1325d6b77eb4da612001c9f137
+  data.tar.gz: 9af572ba4d45256586ec8b0c49ef1e23fb55a646045c268a9cdaa02f0143539678c477fd25f6b2bd5a84f3f7e3bc8644652e0b16a854fafd7977443472953814

data/History.txt

@@ -1,3 +1,8 @@
+== 0.5.0
+
+  * Only send relation modifiers to ActiveRecord if they apply (don't send #order, #limit, #offset unless specified)
+    Fixes plataformatec/devise#2711, ianwhite/orm_adapter#22
+
 == 0.4.1
 
   * Adds activerecord 4 to the test suite

data/lib/orm_adapter/adapters/active_record.rb

@@ -19,14 +19,12 @@ module OrmAdapter
 
     # @see OrmAdapter::Base#find_first
     def find_first(options = {})
-      conditions, order = extract_conditions!(options)
-      klass.where(conditions_to_fields(conditions)).order(*order_clause(order)).first
+      construct_relation(klass, options).first
     end
 
     # @see OrmAdapter::Base#find_all
     def find_all(options = {})
-      conditions, order, limit, offset = extract_conditions!(options)
-      klass.where(conditions_to_fields(conditions)).order(*order_clause(order)).limit(limit).offset(offset)
+      construct_relation(klass, options)
     end
 
     # @see OrmAdapter::Base#create!
@@ -40,6 +38,16 @@ module OrmAdapter
     end
 
   protected
+    def construct_relation(relation, options)
+      conditions, order, limit, offset = extract_conditions!(options)
+
+      relation = relation.where(conditions_to_fields(conditions))
+      relation = relation.order(order_clause(order)) if order.any?
+      relation = relation.limit(limit) if limit
+      relation = relation.offset(offset) if offset
+
+      relation
+    end
 
     # Introspects the klass to convert and objects in conditions into foreign key and type fields
     def conditions_to_fields(conditions)

data/lib/orm_adapter/version.rb

@@ -1,3 +1,3 @@
 module OrmAdapter
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orm_adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ian White