activerecord_any_of 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fbc387a6c367d20f242594b77938c428e152a61
-  data.tar.gz: ac60682ccb9a6ad90dce8f6239a0c7af516092cf
+  metadata.gz: 2eb1c3bc8c812cafeac5742eda463f36a1517336
+  data.tar.gz: 9e1c425f8faf771056efa3af3c38dcec05ed7353
 SHA512:
-  metadata.gz: ae3cd4256c54bb9d4f854b818d457d148cf2bda22d30941381924a7b026d8da001d47b0b6fe76cb7659fe9a65d86936fa078e5c849132fac6cf299819d3a5350
-  data.tar.gz: efab5a39c488004a6c98f30967d55e670c5afc2395bd5184d3f6c7018cf86937a05f1b11acb5035688774092870a01848f3e09940ad8a71df3000355135ed0e9
+  metadata.gz: 9093159a107a57d4f94e01aaea598e8e66f37b138e7d211be6bdd60f0946d22d98253d2a00999a8783b78d4d131687dbf9305e86f7c448d3529cd38ec3928277
+  data.tar.gz: a18604f93e8fb7ba4fca299a2c376a16a9e641109bb37edcc6b2ec267924ac7a80bc2d97e6160d6542b92afa3698ed6804031d8b4982cb94362703b9a26036fd

data/lib/activerecord_any_of/alternative_builder.rb

@@ -66,7 +66,7 @@ module ActiverecordAnyOf
       private
 
         def with_statement_cache
-          if queries_bind_values.any?
+          if queries && queries_bind_values.any?
             relation = where([queries.reduce(:or).to_sql, *queries_bind_values.map { |v| v[1] }])
           else
             relation = where(queries.reduce(:or).to_sql)
@@ -86,13 +86,13 @@ module ActiverecordAnyOf
 
         def with_statement_cache
           if Rails.version >= '4'
-            if queries_bind_values.any?
+            if queries && queries_bind_values.any?
               relation = where.not([queries.reduce(:or).to_sql, *queries_bind_values.map { |v| v[1] }])
             else
               relation = where.not(queries.reduce(:or).to_sql)
             end
           else
-            if queries_bind_values.any?
+            if queries && queries_bind_values.any?
               relation = where([Arel::Nodes::Not.new(queries.reduce(:or)).to_sql, *queries_bind_values.map { |v| v[1] }])
             else
               relation = where(Arel::Nodes::Not.new(queries.reduce(:or)).to_sql)

data/lib/activerecord_any_of/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordAnyOf
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/dummy/log/test.log

@@ -2489,3 +2489,99 @@ Connecting to database specified by database.yml
   Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE "authors"."name" = 'David' LIMIT 1
   Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" = 1 AND (NOT (("posts"."author_id" = 1 AND "posts"."body" = 'Such a lovely day' OR "posts"."author_id" = 1 AND "posts"."type" = 'SpecialPost')))
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.5ms)  begin transaction
+  Fixture Delete (0.2ms)  DELETE FROM "authors"
+  Fixture Insert (0.1ms)  INSERT INTO "authors" ("id", "name", "created_at", "updated_at") VALUES (1, 'David', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.1ms)  INSERT INTO "authors" ("id", "name", "created_at", "updated_at") VALUES (2, 'Mary', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.1ms)  INSERT INTO "authors" ("id", "name", "created_at", "updated_at") VALUES (3, 'Bob', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Delete (0.0ms)  DELETE FROM "posts"
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (1, 1, 'Welcome to the weblog', 'Such a lovely day', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (2, 1, 'So I was thinking', 'Like I hopefully always am', 'SpecialPost', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (3, 0, 'I don''t have any comments', 'I just don''t want to', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (4, 1, 'sti comments', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (5, 1, 'sti me', 'hello', 'StiPost', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (6, 1, 'habtm sti test', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (7, 2, 'eager loading with OR''d conditions', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (8, 3, 'misc post by bob', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (9, 2, 'misc post by mary', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (10, 3, 'other post by bob', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (11, 2, 'other post by mary', 'hello', 'Post', '2013-08-30 17:04:37', '2013-08-30 17:04:37')
+   (279.5ms)  commit transaction
+   (0.1ms)  begin transaction
+  Author Load (0.2ms)  SELECT "authors".* FROM "authors" WHERE (name like '%av%') AND (("authors"."name" = 'David' AND (name like '%av%') OR "authors"."name" = 'Mary' AND (name like '%av%')))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.1ms)  SELECT "authors".* FROM "authors" INNER JOIN "posts" ON "posts"."author_id" = "authors"."id" WHERE (("posts"."title" = 'Welcome to the weblog' OR "posts"."title" = 'eager loading with OR''d conditions'))
+  SQL (0.1ms)  SELECT "authors"."id" AS t0_r0, "authors"."name" AS t0_r1, "authors"."created_at" AS t0_r2, "authors"."updated_at" AS t0_r3, "posts"."id" AS t1_r0, "posts"."title" AS t1_r1, "posts"."body" AS t1_r2, "posts"."author_id" AS t1_r3, "posts"."type" AS t1_r4, "posts"."created_at" AS t1_r5, "posts"."updated_at" AS t1_r6 FROM "authors" LEFT OUTER JOIN "posts" ON "posts"."author_id" = "authors"."id" WHERE (("posts"."title" = 'Welcome to the weblog' OR "posts"."title" = 'eager loading with OR''d conditions'))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.1ms)  SELECT "authors".* FROM "authors" WHERE (("authors"."name" = 'David' OR "authors"."name" = 'Mary'))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE (("authors"."name" = 'David' OR (name = 'Mary')))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE ((("authors"."name" = 'David' OR (name = 'Mary')) OR "authors"."name" = 'Bob'))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE ((("authors"."name" = 'David' OR (name = 'Mary')) OR "authors"."name" = 'Bob' AND "authors"."id" = 3))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE (name IS NOT 'Mary') AND (("authors"."name" = 'David' OR (name IS NOT 'Mary') AND (name = 'Mary')))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE "authors"."name" = 'David' LIMIT 1
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" = 1 AND (("posts"."author_id" = 1 AND "posts"."body" = 'Such a lovely day' OR "posts"."author_id" = 1 AND "posts"."type" = 'SpecialPost'))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.1ms)  SELECT "authors".* FROM "authors" WHERE (NOT (("authors"."name" = 'David' OR "authors"."name" = 'Mary')))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE "authors"."name" = 'David' LIMIT 1
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" = 1 AND (NOT (("posts"."author_id" = 1 AND "posts"."body" = 'Such a lovely day' OR "posts"."author_id" = 1 AND "posts"."type" = 'SpecialPost')))
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+  Fixture Delete (0.1ms)  DELETE FROM "authors"
+  Fixture Insert (0.1ms)  INSERT INTO "authors" ("id", "name", "created_at", "updated_at") VALUES (1, 'David', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "authors" ("id", "name", "created_at", "updated_at") VALUES (2, 'Mary', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "authors" ("id", "name", "created_at", "updated_at") VALUES (3, 'Bob', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Delete (0.0ms)  DELETE FROM "posts"
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (1, 1, 'Welcome to the weblog', 'Such a lovely day', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (2, 1, 'So I was thinking', 'Like I hopefully always am', 'SpecialPost', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (3, 0, 'I don''t have any comments', 'I just don''t want to', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (4, 1, 'sti comments', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (5, 1, 'sti me', 'hello', 'StiPost', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (6, 1, 'habtm sti test', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (7, 2, 'eager loading with OR''d conditions', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (8, 3, 'misc post by bob', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (9, 2, 'misc post by mary', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (10, 3, 'other post by bob', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+  Fixture Insert (0.0ms)  INSERT INTO "posts" ("id", "author_id", "title", "body", "type", "created_at", "updated_at") VALUES (11, 2, 'other post by mary', 'hello', 'Post', '2013-08-30 17:24:41', '2013-08-30 17:24:41')
+   (808.0ms)  commit transaction
+   (0.1ms)  begin transaction
+  Author Load (0.2ms)  SELECT "authors".* FROM "authors" WHERE (name like '%av%') AND (("authors"."name" = 'David' AND (name like '%av%') OR "authors"."name" = 'Mary' AND (name like '%av%')))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.1ms)  SELECT "authors".* FROM "authors" INNER JOIN "posts" ON "posts"."author_id" = "authors"."id" WHERE (("posts"."title" = 'Welcome to the weblog' OR "posts"."title" = 'eager loading with OR''d conditions'))
+  SQL (0.1ms)  SELECT "authors"."id" AS t0_r0, "authors"."name" AS t0_r1, "authors"."created_at" AS t0_r2, "authors"."updated_at" AS t0_r3, "posts"."id" AS t1_r0, "posts"."title" AS t1_r1, "posts"."body" AS t1_r2, "posts"."author_id" AS t1_r3, "posts"."type" AS t1_r4, "posts"."created_at" AS t1_r5, "posts"."updated_at" AS t1_r6 FROM "authors" LEFT OUTER JOIN "posts" ON "posts"."author_id" = "authors"."id" WHERE (("posts"."title" = 'Welcome to the weblog' OR "posts"."title" = 'eager loading with OR''d conditions'))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.1ms)  SELECT "authors".* FROM "authors" WHERE (("authors"."name" = 'David' OR "authors"."name" = 'Mary'))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE (("authors"."name" = 'David' OR (name = 'Mary')))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE ((("authors"."name" = 'David' OR (name = 'Mary')) OR "authors"."name" = 'Bob'))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE ((("authors"."name" = 'David' OR (name = 'Mary')) OR "authors"."name" = 'Bob' AND "authors"."id" = 3))
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE (name IS NOT 'Mary') AND (("authors"."name" = 'David' OR (name IS NOT 'Mary') AND (name = 'Mary')))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE "authors"."name" = 'David' LIMIT 1
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" = 1 AND (("posts"."author_id" = 1 AND "posts"."body" = 'Such a lovely day' OR "posts"."author_id" = 1 AND "posts"."type" = 'SpecialPost'))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.1ms)  SELECT "authors".* FROM "authors" WHERE (NOT (("authors"."name" = 'David' OR "authors"."name" = 'Mary')))
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Author Load (0.0ms)  SELECT "authors".* FROM "authors" WHERE "authors"."name" = 'David' LIMIT 1
+  Post Load (0.1ms)  SELECT "posts".* FROM "posts" WHERE "posts"."author_id" = 1 AND (NOT (("posts"."author_id" = 1 AND "posts"."body" = 'Such a lovely day' OR "posts"."author_id" = 1 AND "posts"."type" = 'SpecialPost')))
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_any_of
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Olivier El Mekki