Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 17, 2010
  1. @josevalim
Commits on Jan 1, 2010
  1. @lifo
Commits on Dec 31, 2009
  1. @lifo
Commits on Dec 25, 2009
  1. @lifo
Commits on Nov 23, 2009
  1. @jeremy

    Revert "Revert "Assert primary key does not exist in habtm when the a…

    jeremy authored
    …ssociation is defined, instead of doing that everytime a record is inserted.""
    
    This reverts commit 2b82708.
    
    [#3128 state:resolved]
    
    Conflicts:
    
    	activerecord/lib/active_record/associations.rb
    	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Commits on Nov 13, 2009
  1. @jeremy

    Revert "Split arel_table into method to get a relation and another to…

    jeremy authored
    … memoize the default relation."
    
    This reverts commit bd51790.
  2. @jeremy
Commits on Nov 3, 2009
  1. @jeremy
Commits on Sep 14, 2009
  1. @miloops

    Merge commit 'rails/master'

    miloops authored
Commits on Sep 12, 2009
  1. @sdsykes @jeremy

    Fix habtm associations when using multiple databases

    sdsykes authored jeremy committed
    [#3128]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Sep 8, 2009
  1. @miloops

    Merge commit 'rails/master'

    miloops authored
    Conflicts:
    	activerecord/lib/active_record/associations.rb
Commits on Sep 2, 2009
  1. @jeremy

    Revert "Assert primary key does not exist in habtm when the associati…

    jeremy authored
    …on is defined, instead of doing that everytime a record is inserted."
    
    Test failures on PostgreSQL.
    
    [#3128 state:open]
    
    This reverts commit da63680.
Commits on Sep 1, 2009
  1. @miloops

    Merge commit 'rails/master'

    miloops authored
    Conflicts:
    	activerecord/lib/active_record/associations.rb
  2. @josevalim @jeremy

    Assert primary key does not exist in habtm when the association is de…

    josevalim authored jeremy committed
    …fined, instead of doing that everytime a record is inserted.
    
    [#3128 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Aug 18, 2009
  1. @miloops
  2. @miloops
Commits on Aug 10, 2009
  1. @bellmyer @jeremy

    raises an exception on habtm join table inserts if join table contain…

    bellmyer authored jeremy committed
    …s a primary key. Caches this check to save time on subsequent inserts.
    
    [#2086 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  2. @bellmyer @jeremy

    raises exception (ActiveRecord::ConfigurationError with message) on h…

    bellmyer authored jeremy committed
    …abtm association creation if join table contains a primary key
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Jun 30, 2009
  1. @lifo

    Revert "Revert "Generate proper :counter_sql from :finder_sql when th…

    lifo authored
    …ere is a newline character immediately following 'SELECT' [#2118 state:resolved]""
    
    This reverts commit 80f1f86.
    
    The feature doesn't work on Postgres, so don't test it on Postgres.
    Also, Postgres compatibility is irrelevant to the ticket/patch in question.
Commits on Jun 22, 2009
  1. Revert "Generate proper :counter_sql from :finder_sql when there is a…

    Yehuda Katz + Carl Lerche authored
    … newline character immediately following 'SELECT' [#2118 state:resolved]"
    
    This reverts commit 4851ca9.
    
    The tests do not pass for postgresql.
Commits on Jun 21, 2009
  1. @KeeperPat @lifo

    Generate proper :counter_sql from :finder_sql when there is a newline…

    KeeperPat authored lifo committed
    … character immediately following 'SELECT' [#2118 state:resolved]
    
    Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Commits on Feb 27, 2009
  1. @dhh
Commits on Jan 17, 2009
  1. @lukeludwig @NZKoz

    Cache columns for has_and_belongs_to_many associations

    lukeludwig authored NZKoz committed
    This avoids repeatedly calling SHOW COLUMNS when the association is queried
    [#1738 state:committed]
Commits on Aug 28, 2008
  1. @ernie @jeremy

    Refactored AssociationCollection#count for uniformity and Ruby 1.8.7 …

    ernie authored jeremy committed
    …support.
    
    [#831 state:resolved]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Commits on Aug 16, 2008
  1. @zerowidth @lifo

    Updated has_and_belongs_to_many association to fix :finder_sql interp…

    zerowidth authored lifo committed
    …olation. [#848 state:resolved]
    
    Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Commits on Jun 26, 2008
  1. @indirect @jeremy
Commits on Jun 9, 2008
  1. @bkeepers @technoweenie

    fix eager loading with dynamic finders

    bkeepers authored technoweenie committed
Commits on Apr 23, 2008
  1. @ddollar @NZKoz

    Fixes a subtle bug when using symbols for key definitions in habtm as…

    ddollar authored NZKoz committed
    …sociations
Commits on Apr 6, 2008
  1. @lifo

    Remove duplicate code from associations. [Pratik]

    lifo authored
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9231 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  2. @lifo

    Refactor HasManyThroughAssociation to inherit from HasManyAssociation…

    lifo authored
    …. Association callbacks and <association>_ids= now work with hm:t. Closes #11516 [rubyruy]
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9230 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Commits on Apr 5, 2008
  1. @lifo

    Ensure HABTM#create and HABTM#build do not load entire association. […

    lifo authored
    …Pratik]
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9229 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Commits on Apr 4, 2008
  1. @NZKoz

    Make HABTM#create behave the same as << with after_add callbacks. Clo…

    NZKoz authored
    …ses #11374 [freels]
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9224 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Commits on Jan 18, 2008
  1. @technoweenie

    Ensure that modifying has_and_belongs_to_many actions clear the query…

    technoweenie authored
    … cache. Closes #10840 [john.andrews]
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8653 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Commits on Jan 5, 2008
  1. @jeremy

    More thoroughly quote table names. Exposes some issues with sqlite2 a…

    jeremy authored
    …dapter. Closes #10698.
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Commits on Dec 22, 2007
  1. @jeremy

    Ruby 1.9 compat: fix warnings, shadowed block vars, and unitialized i…

    jeremy authored
    …nstance vars
    
    git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8481 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Something went wrong with that request. Please try again.