squeel 1.0.14 → 1.0.15

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.15 (2013-01-23)
+
+* Fix issue #214, don't alter table name when mergine a relation with a default
+  scope
+
 ## 1.0.14 (2012-12-04 OpenHack Louisville Edition!)
 
 * Use bind values in where_values_hash, to prep for compatibility with 3.2.10

data/README.md

@@ -1,7 +1,7 @@
 # Squeel [![Build Status](https://secure.travis-ci.org/ernie/squeel.png)](http://travis-ci.org/ernie/squeel) [![endorse](http://api.coderwall.com/ernie/endorsecount.png)](http://coderwall.com/ernie)
 
-Squeel lets you write your ActiveRecord queries with fewer strings, and more Ruby,
-by making the ARel awesomeness that lies beneath ActiveRecord more accessible.
+Squeel lets you write your Active Record queries with fewer strings, and more Ruby,
+by making the ARel awesomeness that lies beneath Active Record more accessible.
 
 Squeel lets you rewrite...
 
@@ -31,7 +31,7 @@ create a sample initializer with:
 
 ## The Squeel Query DSL
 
-Squeel enhances the normal ActiveRecord query methods by enabling them to accept
+Squeel enhances the normal Active Record query methods by enabling them to accept
 blocks. Inside a block, the Squeel query DSL can be used. Note the use of curly braces
 in these examples instead of parentheses. `{}` denotes a Squeel DSL query.
 
@@ -73,7 +73,7 @@ very handy.
 ### KeyPaths
 
 A Squeel keypath is essentially a more concise and readable alternative to a
-deeply nested hash. For instance, in standard ActiveRecord, you might join several
+deeply nested hash. For instance, in standard Active Record, you might join several
 associations like this to perform a query:
 
     Person.joins(:articles => {:comments => :person})
@@ -183,13 +183,13 @@ All of the following will generate the above SQL:
     Person.where{name == 'Joe Blow'}
     
 Not a very exciting example since equality is handled just fine via the
-first example in standard ActiveRecord. But consider the following query:
+first example in standard Active Record. But consider the following query:
 
     SELECT "people".* FROM people
     WHERE ("people"."name" LIKE 'Ernie%' AND "people"."salary" < 50000)
       OR  ("people"."name" LIKE 'Joe%' AND "people"."salary" > 100000)
       
-To do this with standard ActiveRecord, we'd do something like:
+To do this with standard Active Record, we'd do something like:
 
     Person.where(
       '(name LIKE ? AND salary < ?) OR (name LIKE ? AND salary > ?)',
@@ -404,7 +404,59 @@ custom operator, such as the standard SQL concatenation operator, `||`:
 
 As you can see, just like functions, these operations can be given aliases.
 
-## Legacy compatibility
+## Compatibility with Active Record 
+
+Most of the new functionality provided by Squeel is accessed with the new block-style `where{}`
+syntax.
+
+All your existing code that uses plain Active Record `where()` queries should continue to work the
+same after adding Squeel to your project with one exception: symbols as the value side of a
+condition (in normal `where()` clauses).
+
+### Symbols as the value side of a condition (in normal `where()` clauses)
+
+If you have any `where()` clauses that use a symbol as the value side
+(right-hand side) of a condition, **you will need to change the symbol into a
+string in order for it to continue to be treated as a value**.
+
+Squeel changes the meaning of symbols in the value of a condition to refer to
+the name of a **column** instead of simply treating the symbol as a **string literal**.
+
+For example, this query:
+
+    Person.where(:first_name => :last_name)
+
+produces this SQL query in plain Active Record:
+
+    SELECT people.* FROM people WHERE people.first_name = 'last_name'.
+
+but produces this SQL query if you are using Squeel:
+
+    SELECT people.* FROM people WHERE people.first_name = people.last_name
+
+Note that this new behavior applies to the plain `where()`-style expressions in addition to the new
+`where{}` Squeel style.
+
+In order for your existing  `where()` clauses with symbols to continue to behave the same, you
+**must** change the symbols into strings. These scopes, for example:
+
+    scope :active, where(:state => :active)
+    scope :in_state, lambda {|state| where(:state => state) }
+
+should be changed to this:
+
+    scope :active, where(:state => 'active')
+    scope :in_state, lambda {|state| where(:state => state.to_s) }
+
+For further information, see
+[this post to the Rails list](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-core/NQJJzZ7R7S0),
+[this commit](https://github.com/lifo/docrails/commit/50c5005bafe7e43f81a141cd2c512379aec74325) to
+the [Active Record guides](http://edgeguides.rubyonrails.org/active_record_querying.html#hash-conditions),
+[#67](https://github.com/ernie/squeel/issues/67),
+[#75](https://github.com/ernie/squeel/issues/75), and
+[#171](https://github.com/ernie/squeel/issues/171).
+
+## Compatibility with MetaWhere
 
 While the Squeel DSL is the preferred way to access advanced query functionality, you can
 still enable methods on symbols to access ARel predications in a similar manner to MetaWhere:

data/lib/squeel/adapters/active_record.rb

@@ -9,5 +9,5 @@ when 3
     require f
   end
 else
-  raise NotImplementedError, "Squeel does not support ActiveRecord version #{ActiveRecord::VERSION::STRING}"
+  raise NotImplementedError, "Squeel does not support Active Record version #{ActiveRecord::VERSION::STRING}"
 end

data/lib/squeel/adapters/active_record/3.0/relation_extensions.rb

@@ -14,6 +14,12 @@ module Squeel
           @join_dependency ||= (build_join_dependency(table, @joins_values) && @join_dependency)
         end
 
+        # We don't need to call with_default_scope in AR 3.0.x. In fact, since
+        # there is no with_default_scope in 3.0.x, that'd be pretty dumb.
+        def visited
+          clone.visit!
+        end
+
         def build_arel
           arel = table
 

data/lib/squeel/adapters/active_record/relation_extensions.rb

@@ -26,7 +26,7 @@ module Squeel
         end
 
         # We need to be able to support merging two relations without having
-        # to get our hooks too deeply into ActiveRecord. That proves to be
+        # to get our hooks too deeply into Active Record. That proves to be
         # easier said than done. I hate Relation#merge. If Squeel has a
         # nemesis, Relation#merge would be it.
         #
@@ -45,7 +45,7 @@ module Squeel
         end
 
         def visited
-          clone.visit!
+          with_default_scope.visit!
         end
 
         def visit!
@@ -67,7 +67,7 @@ module Squeel
           end
         end
 
-        # So, building a select for a count query in ActiveRecord is
+        # So, building a select for a count query in Active Record is
         # pretty heavily dependent on select_values containing strings.
         # I'd initially expected that I could just hack together a fix
         # to select_for_count and everything would fall in line, but

data/lib/squeel/nodes/key_path.rb

@@ -170,7 +170,8 @@ module Squeel
         path[0..-2]
       end
 
-      # Implement #to_s (and alias to #to_str) to play nicely with ActiveRecord grouped calculations
+      # Implement #to_s (and alias to #to_str) to play nicely with Active Record
+      # grouped calculations
       def to_s
         path.map(&:to_s).join('.')
       end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

data/lib/squeel/visitors/visitor.rb

@@ -352,7 +352,7 @@ module Squeel
         op
       end
 
-      # Visit an ActiveRecord Relation, returning an Arel::SelectManager
+      # Visit an Active Record Relation, returning an Arel::SelectManager
       # @param [ActiveRecord::Relation] o The Relation to visit
       # @param parent The parent object in the context
       # @return [Arel::SelectManager] The ARel select manager that represents

data/spec/spec_helper.rb

@@ -45,7 +45,7 @@ end
 RSpec.configure do |config|
   config.before(:suite) do
     puts '=' * 80
-    puts "Running specs against ActiveRecord #{ActiveRecord::VERSION::STRING} and ARel #{Arel::VERSION}..."
+    puts "Running specs against Active Record #{ActiveRecord::VERSION::STRING} and ARel #{Arel::VERSION}..."
     puts '=' * 80
     Models.make
   end

data/spec/squeel/adapters/active_record/relation_extensions_spec.rb

@@ -430,7 +430,7 @@ module Squeel
               counts = Person.group{name.op('||', '-diddly')}.count
               counts.should eq Person.group("name || '-diddly'").count
             else
-              pending 'Unsupported in ActiveRecord < 3.2.7'
+              pending 'Unsupported in Active Record < 3.2.7'
             end
           end
         end
@@ -665,12 +665,12 @@ module Squeel
               article.person.should eq person
               article.title.should eq 'Condition'
             else
-              pending 'Unsupported on ActiveRecord < 3.1'
+              pending 'Unsupported on Active Record < 3.1'
             end
           end
 
           it 'creates new records with equality predicates from has_many :through associations' do
-            pending "When ActiveRecord supports this, we'll want to, too"
+            pending "When Active Record supports this, we'll want to, too"
             person = Person.first
             comment = person.article_comments_with_first_post.new
             comment.body.should eq 'first post'
@@ -751,7 +751,7 @@ module Squeel
               sql.should_not match /Bill/
               sql.should match /Ernie/
             else
-              pending 'Unsupported in ActiveRecord < 3.1'
+              pending 'Unsupported in Active Record < 3.1'
             end
           end
 
@@ -786,6 +786,12 @@ module Squeel
             sql.scan(/"people"."id"/).should have(1).item
           end
 
+          it "doesn't hijack the table name when merging a relation with different base and default_scope" do
+            relation = Article.joins(:person).merge(PersonNamedBill.scoped)
+            sql = relation.to_sql
+            sql.scan(/"people"."name" = 'Bill'/).should have(1).item
+          end
+
           it 'merges scopes that contain functions' do
             relation = PersonNamedBill.scoped.with_salary_equal_to(100)
             sql = relation.to_sql

data/squeel.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Ernie Miller"]
   s.email       = ["ernie@erniemiller.org"]
   s.homepage    = "http://erniemiller.org/projects/squeel"
-  s.summary     = %q{ActiveRecord 3, improved.}
+  s.summary     = %q{Active Record 3, improved.}
   s.description = %q{
       Squeel unlocks the power of ARel in your Rails 3 application with
       a handy block-based syntax. You can write subqueries, access named

metadata

@@ -1,142 +1,138 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: squeel
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.0.15
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 14
-  version: 1.0.14
 platform: ruby
-authors: 
+authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: polyamorous
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
   name: machinist
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.0.6
   type: :development
-  requirement: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+- !ruby/object:Gem::Dependency
   name: faker
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 9
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.9.5
   type: :development
-  requirement: *id006
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  requirement: *id007
   prerelease: false
-description: "\n      Squeel unlocks the power of ARel in your Rails 3 application with\n      a handy block-based syntax. You can write subqueries, access named\n      functions provided by your RDBMS, and more, all without writing\n      SQL strings.\n    "
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
+  with\n      a handy block-based syntax. You can write subqueries, access named\n
+  \     functions provided by your RDBMS, and more, all without writing\n      SQL
+  strings.\n    "
+email:
 - ernie@erniemiller.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -247,38 +243,35 @@ files:
 - squeel.gemspec
 homepage: http://erniemiller.org/projects/squeel
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3781393016892573538
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3781393016892573538
 requirements: []
-
 rubyforge_project: squeel
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: ActiveRecord 3, improved.
-test_files: 
+summary: Active Record 3, improved.
+test_files:
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb