squeel 1.0.8 → 1.0.9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.9 (2012-08-06)
+
+* Fix issue with duplication of order conditions in default_scope on AR 3.0.x
+
 ## 1.0.8 (2012-07-28)
 
 * Fix an issue with properly casting values to column type when used

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

@@ -16,6 +16,36 @@ module Arel
         ::Arel::Attribute.new self, name.to_sym
       end
     end
+
+    def hash
+      [name, engine].hash
+    end
+
+    def eql?(other)
+      self.class == other.class &&
+        self.name == other.name &&
+        self.engine == other.engine
+    end
+    alias :== :eql?
+  end
+
+  module Attributes
+
+    class Attribute < Attribute.superclass
+
+      def hash
+        [relation, name].hash
+      end
+
+      def eql?(other)
+        self.class == other.class &&
+          self.relation == other.relation &&
+          self.name == other.name
+      end
+      alias :== :eql?
+
+    end
+
   end
 
   module Nodes

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/spec/console.rb

@@ -3,9 +3,11 @@ require 'machinist/active_record'
 require 'sham'
 require 'faker'
 
-Dir[File.expand_path('../../spec/{helpers,support,blueprints}/*.rb', __FILE__)].each do |f|
+Dir[File.expand_path('../helpers/*.rb', __FILE__)].each do |f|
   require f
 end
+require File.expand_path('../support/schema.rb', __FILE__)
+require File.expand_path('../support/models.rb', __FILE__)
 
 Sham.define do
   name        { Faker::Name.name }
@@ -17,7 +19,7 @@ Sham.define do
   object_name { Faker::Lorem.words(1).first }
 end
 
-Schema.create
+Models.make
 
 require 'squeel'
 

data/spec/spec_helper.rb

@@ -26,9 +26,11 @@ module ActiveRecord
   ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 end
 
-Dir[File.expand_path('../{helpers,support,blueprints}/*.rb', __FILE__)].each do |f|
+Dir[File.expand_path('../helpers/*.rb', __FILE__)].each do |f|
   require f
 end
+require File.expand_path('../support/schema.rb', __FILE__)
+require File.expand_path('../support/models.rb', __FILE__)
 
 Sham.define do
   name     { Faker::Name.name }
@@ -45,7 +47,7 @@ RSpec.configure do |config|
     puts '=' * 80
     puts "Running specs against ActiveRecord #{ActiveRecord::VERSION::STRING} and ARel #{Arel::VERSION}..."
     puts '=' * 80
-    Schema.create
+    Models.make
   end
   config.before(:all)   { Sham.reset(:before_all) }
   config.before(:each)  { Sham.reset(:before_each) }
@@ -64,4 +66,4 @@ require 'squeel'
 
 Squeel.configure do |config|
   config.load_core_extensions :hash, :symbol
-end
+end

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

@@ -754,7 +754,20 @@ module Squeel
 
           it "doesn't ruin everything when a group exists" do
             relation = Person.scoped.merge(Person.group{name})
-            count_hash = relation.count
+            count_hash = {}
+            expect { count_hash = relation.count }.should_not raise_error
+            count_hash.size.should eq Person.scoped.size
+            count_hash.values.all? {|v| v == 1}.should be_true
+            count_hash.keys.should =~ Person.select{name}.map(&:name)
+          end
+
+          it "doesn't merge the default scope more than once" do
+            relation = PersonNamedBill.scoped.highly_compensated.ending_with_ill
+            sql = relation.to_sql
+            sql.scan(/"people"."name" = 'Bill'/).should have(1).item
+            sql.scan(/"people"."name" LIKE '%ill'/).should have(1).item
+            sql.scan(/"people"."salary" > 200000/).should have(1).item
+            sql.scan(/"people"."id"/).should have(1).item
           end
 
         end

data/spec/support/models.rb

@@ -0,0 +1,99 @@
+class Person < ActiveRecord::Base
+  belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
+  has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
+  has_many   :articles
+  has_many   :articles_with_condition, :class_name => 'Article', :conditions => {:title => 'Condition'}
+  has_many   :comments
+  has_many   :condition_article_comments, :through => :articles_with_condition, :source => :comments
+  has_many   :authored_article_comments, :through => :articles,
+             :source => :comments
+  has_many   :notes, :as => :notable
+  has_many   :unidentified_objects
+
+  has_many   :outgoing_messages, :class_name => 'Message', :foreign_key => :author_id
+  has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
+
+  scope :nil_scope, lambda { nil }
+
+  sifter :name_starts_or_ends_with do |value|
+    (name =~ "#{value}%") | (name =~ "%#{value}")
+  end
+end
+
+class PersonWithNamePrimaryKey < ActiveRecord::Base
+  set_primary_key 'name'
+  # Set this second, because I'm lazy and don't want to populate another table,
+  # and also don't want to clobber the AR connection's primary_key cache.
+  set_table_name 'people'
+end
+
+class PersonNamedBill < ActiveRecord::Base
+  self.table_name = 'people'
+  belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
+  default_scope where{name == 'Bill'}.order{id}
+  scope :highly_compensated, where{salary > 200000}
+  scope :ending_with_ill, where{name =~ '%ill'}
+end
+
+class Message < ActiveRecord::Base
+  belongs_to :author, :class_name => 'Person'
+  belongs_to :recipient, :class_name => 'Person'
+end
+
+class UnidentifiedObject < ActiveRecord::Base
+  belongs_to :person
+end
+
+class Article < ActiveRecord::Base
+  belongs_to              :person
+  has_many                :comments
+  has_and_belongs_to_many :tags
+  has_many   :notes, :as => :notable
+  has_many :commenters, :through => :comments, :source => :person
+  has_many :uniq_commenters, :through => :comments, :source => :person, :uniq => true
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :person
+end
+
+class Tag < ActiveRecord::Base
+  has_and_belongs_to_many :articles
+end
+
+class Note < ActiveRecord::Base
+  belongs_to :notable, :polymorphic => true
+end
+
+Dir[File.expand_path('../../blueprints/*.rb', __FILE__)].each do |f|
+  require f
+end
+
+class Models
+  def self.make
+    10.times do
+      person = Person.make
+      2.times do
+        UnidentifiedObject.create(:person => person, :name => Sham.object_name)
+      end
+      Note.make(:notable => person)
+      3.times do
+        article = Article.make(:person => person)
+        3.times do
+          article.tags = [Tag.make, Tag.make, Tag.make]
+        end
+        Note.make(:notable => article)
+        10.times do
+          Comment.make(:article => article)
+        end
+      end
+      2.times do
+        Comment.make(:person => person)
+      end
+    end
+
+    Comment.make(:body => 'First post!', :article => Article.make(:title => 'Hello, world!'))
+    Comment.make(:body => 'Last post!', :article => Article.first, :person => Article.first.commenters.first)
+  end
+end

data/spec/support/schema.rb

@@ -6,147 +6,53 @@ ActiveRecord::Base.establish_connection(
   :database => ':memory:'
 )
 
-class Person < ActiveRecord::Base
-  belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
-  has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
-  has_many   :articles
-  has_many   :articles_with_condition, :class_name => 'Article', :conditions => {:title => 'Condition'}
-  has_many   :comments
-  has_many   :condition_article_comments, :through => :articles_with_condition, :source => :comments
-  has_many   :authored_article_comments, :through => :articles,
-             :source => :comments
-  has_many   :notes, :as => :notable
-  has_many   :unidentified_objects
-
-  has_many   :outgoing_messages, :class_name => 'Message', :foreign_key => :author_id
-  has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
-
-  scope :nil_scope, lambda { nil }
-
-  sifter :name_starts_or_ends_with do |value|
-    (name =~ "#{value}%") | (name =~ "%#{value}")
-  end
-end
-
-class PersonWithNamePrimaryKey < ActiveRecord::Base
-  set_primary_key 'name'
-  # Set this second, because I'm lazy and don't want to populate another table,
-  # and also don't want to clobber the AR connection's primary_key cache.
-  set_table_name 'people'
-end
-
-class PersonNamedBill < ActiveRecord::Base
-  self.table_name = 'people'
-  belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
-  default_scope where{name == 'Bill'}
-end
-
-class Message < ActiveRecord::Base
-  belongs_to :author, :class_name => 'Person'
-  belongs_to :recipient, :class_name => 'Person'
-end
-
-class UnidentifiedObject < ActiveRecord::Base
-  belongs_to :person
-end
-
-class Article < ActiveRecord::Base
-  belongs_to              :person
-  has_many                :comments
-  has_and_belongs_to_many :tags
-  has_many   :notes, :as => :notable
-  has_many :commenters, :through => :comments, :source => :person
-  has_many :uniq_commenters, :through => :comments, :source => :person, :uniq => true
-end
-
-class Comment < ActiveRecord::Base
-  belongs_to :article
-  belongs_to :person
-end
-
-class Tag < ActiveRecord::Base
-  has_and_belongs_to_many :articles
-end
-
-class Note < ActiveRecord::Base
-  belongs_to :notable, :polymorphic => true
-end
-
-module Schema
-  def self.create
-    ActiveRecord::Base.silence do
-      ActiveRecord::Migration.verbose = false
-
-      ActiveRecord::Schema.define do
-        create_table :people, :force => true do |t|
-          t.integer  :parent_id
-          t.string   :name
-          t.integer  :salary
-        end
-
-        create_table :messages, :force => true do |t|
-          t.integer :author_id
-          t.integer :recipient_id
-        end
-
-        create_table :unidentified_objects, :id => false, :force => true do |t|
-          t.integer  :person_id
-          t.string   :name
-        end
-
-        create_table :articles, :force => true do |t|
-          t.integer :person_id
-          t.string  :title
-          t.text    :body
-        end
+ActiveRecord::Base.silence do
+  ActiveRecord::Migration.verbose = false
+
+  ActiveRecord::Schema.define do
+    create_table :people, :force => true do |t|
+      t.integer  :parent_id
+      t.string   :name
+      t.integer  :salary
+    end
 
-        create_table :comments, :force => true do |t|
-          t.integer :article_id
-          t.integer :person_id
-          t.text    :body
-        end
+    create_table :messages, :force => true do |t|
+      t.integer :author_id
+      t.integer :recipient_id
+    end
 
-        create_table :tags, :force => true do |t|
-          t.string :name
-        end
+    create_table :unidentified_objects, :id => false, :force => true do |t|
+      t.integer  :person_id
+      t.string   :name
+    end
 
-        create_table :articles_tags, :force => true, :id => false do |t|
-          t.integer :article_id
-          t.integer :tag_id
-        end
+    create_table :articles, :force => true do |t|
+      t.integer :person_id
+      t.string  :title
+      t.text    :body
+    end
 
-        create_table :notes, :force => true do |t|
-          t.integer :notable_id
-          t.string  :notable_type
-          t.string  :note
-        end
+    create_table :comments, :force => true do |t|
+      t.integer :article_id
+      t.integer :person_id
+      t.text    :body
+    end
 
-      end
+    create_table :tags, :force => true do |t|
+      t.string :name
     end
 
-    10.times do
-      person = Person.make
-      2.times do
-        UnidentifiedObject.create(:person => person, :name => Sham.object_name)
-      end
-      Note.make(:notable => person)
-      3.times do
-        article = Article.make(:person => person)
-        3.times do
-          article.tags = [Tag.make, Tag.make, Tag.make]
-        end
-        Note.make(:notable => article)
-        10.times do
-          Comment.make(:article => article)
-        end
-      end
-      2.times do
-        Comment.make(:person => person)
-      end
+    create_table :articles_tags, :force => true, :id => false do |t|
+      t.integer :article_id
+      t.integer :tag_id
     end
 
-    Comment.make(:body => 'First post!', :article => Article.make(:title => 'Hello, world!'))
-    Comment.make(:body => 'Last post!', :article => Article.first, :person => Article.first.commenters.first)
+    create_table :notes, :force => true do |t|
+      t.integer :notable_id
+      t.string  :notable_type
+      t.string  :note
+    end
 
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -224,6 +224,7 @@ files:
 - spec/squeel/visitors/attribute_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
 - spec/squeel/visitors/symbol_visitor_spec.rb
+- spec/support/models.rb
 - spec/support/schema.rb
 - squeel.gemspec
 homepage: http://erniemiller.org/projects/squeel
@@ -240,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2726279138342504508
+      hash: -377980682331781514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2726279138342504508
+      hash: -377980682331781514
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.8.24
@@ -287,4 +288,5 @@ test_files:
 - spec/squeel/visitors/attribute_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
 - spec/squeel/visitors/symbol_visitor_spec.rb
+- spec/support/models.rb
 - spec/support/schema.rb