baby_squeel 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4567e1ad82a18c7be246a9c76c51d97869dacdac
-  data.tar.gz: c0fdfe706fad8048de09f7f4dbd714cbd1a86f32
+  metadata.gz: 3a93b2e6f4683805f7d23a2b7ce9ac30756052ac
+  data.tar.gz: 4179fa1811a17756568b82758ae9fa02267d3f98
 SHA512:
-  metadata.gz: 560f14bb971c76e166d4ac673c483d7fcee7929ad13337fadcb40cb90f965709422745c402464703d634247c6ae03229f86da3be64ced4e20c50034287efb232
-  data.tar.gz: c02dcaaf7afb4011dd364ba749f2bb0132ab61f3ad1a7cd3a52c708811044d7049b87969774808d8dc041784b0eab461548cd3ea7c5900a61ba4ed79a0480ce9
+  metadata.gz: 3e61f2a56c95418acbbd6abdad4aaf942cdb86f2ae88703e3a9ede99c8e133716145ce2b2d19109c2328c7aa208d5637fecb9478557e4d4492c78e31244323b5
+  data.tar.gz: 7b2b9836c944357c7e181baa5a463fc9948eabe2e4d30a6d9a1c135f38a61a5ef33df1fb9c4d5372baef6b660c3ecb280a3f313ea1ae1814cdcff419d574e42b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Nothing to see here.
 
+## [1.1.4] - 2017-04-13
+### Fixed
+- Nodes::Attribute#in and #not_in generate valid SQL when given ActiveRecord::NullRelations.
+
 ## [1.1.3] - 2017-03-31
 ### Fixed
 - Nodes::Attribute#in was not returning BabySqueel node. As a result, you couldn't chain on it. This fixes #61.
@@ -114,7 +118,8 @@ Nothing to see here.
 ### Added
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.1.4...HEAD
+[1.1.3]: https://github.com/rzane/baby_squeel/compare/v1.1.3...v1.1.4
 [1.1.3]: https://github.com/rzane/baby_squeel/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/rzane/baby_squeel/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/rzane/baby_squeel/compare/v1.1.0...v1.1.1

data/lib/baby_squeel/nodes/attribute.rb

@@ -11,8 +11,7 @@ module BabySqueel
 
       def in(rel)
         if rel.is_a? ::ActiveRecord::Relation
-          expr = ::Arel.sql(rel.to_sql)
-          Nodes.wrap ::Arel::Nodes::In.new(self, expr)
+          Nodes.wrap ::Arel::Nodes::In.new(self, sanitize_relation(rel))
         else
           super
         end
@@ -20,7 +19,7 @@ module BabySqueel
 
       def not_in(rel)
         if rel.is_a? ::ActiveRecord::Relation
-          ::Arel::Nodes::NotIn.new(self, Arel.sql(rel.to_sql))
+          Nodes.wrap ::Arel::Nodes::NotIn.new(self, sanitize_relation(rel))
         else
           super
         end
@@ -33,6 +32,23 @@ module BabySqueel
           super
         end
       end
+
+      private
+
+      # NullRelation must be treated as a special case, because
+      # NullRelation#to_sql returns an empty string. As such,
+      # we need to convert the NullRelation to regular relation.
+      # Conveniently, this approach automatically adds a 1=0.
+      # I have literally no idea why, but I'll take it.
+      def sanitize_relation(rel)
+        if rel.kind_of? ::ActiveRecord::NullRelation
+          other = rel.spawn
+          other.extending_values -= [::ActiveRecord::NullRelation]
+          sanitize_relation rel.unscoped.merge(other)
+        else
+          Arel.sql rel.to_sql
+        end
+      end
     end
   end
 end

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord