github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,373 Commits 34 Branches 105 Tags
2-3-github
Commit Graph

119 Commits

Author SHA1 Message Date
Will Bryant
0fee359278 Don't add non-new records back to the target array after loading targets on associations, as that makes destroy_all destroy any created records that don't match the scope destroy_all is called on 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2010-12-08 09:48:16 +13:00
Neeraj Singh
99cdea7cbe update_attribute and updated_attributes! are now wrapped in a transaction 
[#922 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-18 11:20:25 +02:00
Grant Ammons
0963774c0a fixes #2362, eager loading :through associations will join the :source model if there are :conditions 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 23:08:05 +02:00
Mislav Marohnić
ba9c469113 add missing require to ActiveRecord "base_test.rb" 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-07-08 11:35:46 -07:00
Maxim Chernyak
844da12ba6 Fix eager loading of polymorphic has_one associations nested-included under polymorphic belongs_to associations. [#3233 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 09:09:46 +02:00
Neeraj Singh
a9c69f3bb0 test for #1570 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 09:08:55 +02:00
James Le Cuirot
b41c3ba154 Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2010-06-09 18:20:15 +05:30
Ian White
a5696e36c6 Nested records (re: autosave) are now updated even when the intermediate parent record is unchanged [#4242] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-18 16:10:44 +02:00
Andrew White
03d5d0b5f5 Add the ability to specify table_name_prefix on individual modules 
[#4032 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-03-29 08:55:21 -07:00
Eloy Duran
c9a3929a75 Rollback the transaction when one of the autosave associations fails to save. [#3391 state:resolved] 2010-01-08 21:36:27 +01:00
Bryan Stearns
2aef092625 Add failing test that triggers the stack overflow for #2578. 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2010-01-08 21:36:26 +01:00
Mike Breen
69db137f89 Allows you to pass :all_blank to :reject_if option to automatically create a Proc that will reject any record with blank attributes. 
[#2501 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2010-01-07 13:20:41 +01:00
Stefan Penner
b3dd14adbe Failing test case RE: Ticket 3131 
http://rails.lighthouseapp.com/projects/8994/tickets/3131-multiparamter_attribute-assignment-fails-when-used-via-assoication
 2010-01-02 23:48:08 -08:00
Eloy Duran
90f001ba39 Refactored previous changes to nested attributes. 2009-12-28 21:08:20 +01:00
Murray Steele
3470b306bb Make polymorphic_inverse_of in Reflection throw an InverseOfAssociationNotFoundError if the supplied class doesn't have the appropriate association. [#3520 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-12-28 14:21:42 +01:00
George Ogata
cca75ca23f Add inverse polymorphic association support. [#3520 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-12-28 14:20:58 +01:00
Murray Steele
5374fb3cad Providing support for :inverse_of as an option to associations. 
You can now add an :inverse_of option to has_one, has_many and belongs_to associations.  This is best described with an example:

class Man < ActiveRecord::Base
  has_one :face, :inverse_of => :man
end

class Face < ActiveRecord::Base
  belongs_to :man, :inverse_of => :face
end

m = Man.first
f = m.face

Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again).  With these new :inverse_of options m and f.man are the same in memory instance.

Currently :inverse_of supports has_one and has_many (but not the :through variants) associations.  It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic.

Signed-off-by: Murray Steele <muz@h-lame.com>
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

Conflicts:

	activerecord/lib/active_record/associations/belongs_to_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
 2009-12-21 13:13:32 -08:00
Matt Jones
6c0028d5cc delete correct records for a has_many with :primary_key and :dependent => :delete_all 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-11-10 18:07:04 +13:00
Eloy Duran
6b2291f330 Define autosave association callbacks when using accepts_nested_attributes_for. 
This way we don't define all the validation methods for all associations by
default, but only when needed.

[#3355 state:resolved]
 2009-11-06 23:53:33 +01:00
Pratik Naik
e2127991a1 Allow accepts_nested_attributes_for :reject_if option accept symbols for using a method 2009-10-07 23:45:40 +01:00
Luciano G Panaro
14a6794a8e Make has_one with :conditions hash scope build or creation of the associated object with those conditions 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3088 state:committed]
 2009-09-28 14:51:14 +13:00
Alexey Kovyrin
c0245493cb Define autosave association validation methods only when needed. [#3161 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-09-12 14:55:34 +02:00
Graeme Porteous
a070873771 Fix has_one with foreign_key and primary_key association bug which caused the associated object being lost when saving the owner. [#1756 state:resolved] 
Mixed in a bit from patch by ransom-briggs. [#2813 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-09-12 13:43:16 +02:00
Eloy Duran
2420d6272c Explicitely setting `autosave => false' should override new_record autosaving. [#2214 state:resolved] 
Original author is Jacob.
 2009-09-12 13:23:05 +02:00
Mike Breen
52a50db6c0 Raise an exception with friendlier error message when attempting to build a polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-09-12 13:16:30 +02:00
Dan Croak
33c054d7e0 has_many :through create should not raise validation errors 
[#2934 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-08-09 18:47:25 -07:00
Tristan Dunn
491f1b5f36 Prevent overwriting of table name in merging SQL conditions [#2949 state:resolved] 2009-08-10 00:41:53 +01:00
Gabe da Silveira
b763858ed5 Enable has_many :through for going through a has_one association on the join model [#2719 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-08-10 00:34:32 +01:00
Rich Bradley
0b95a2afab Fix for nested :include with namespaced models. 
[#260 state:committed]
 2009-08-09 00:31:05 -07:00
Matt Duncan
407fbb5090 Adding :from scoping to ActiveRecord calculations 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-08-09 12:42:47 +12:00
Jeremy Kemper
17f336e2f0 Revert "Methods invoked within named scope Procs should respect the scope stack. [#1267 state:resolved]" 
This reverts commit 6a13376525.

Conflicts:

	activerecord/test/cases/named_scope_test.rb
 2009-07-29 16:53:49 -07:00
Szymon Nowak
b3ec7b2d03 Add primary_key option to belongs_to association 
[#765 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-07-15 18:14:00 -07:00
Ian Terrell
a92790ab86 added a failing test case for counting has_many :through associations with scopes 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-06-01 13:54:56 +12:00
Pratik Naik
97b75c9f16 Make sure default_scope#create checks for options[:conditions] [#2181 state:resolved] [James Le Cuirot] 2009-05-18 21:27:55 +02:00
Jeremy Kemper
35e1785081 Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" 
[#2594 state:open]

This reverts commit 93c557828e.
 2009-05-11 12:21:59 -07:00
Ruy Asan
93c557828e Fixed bug with polymorphic has_one :as pointing to an STI record 
[#2594 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-05-01 14:49:38 -07:00
Pratik Naik
3267097393 Fix tests for sqlite3 3.6.xx 2009-04-21 13:08:26 +01:00
Pratik Naik
fc2421b784 Ensure :dependent => :delete_all works for association with hash conditions 2009-04-21 11:33:27 +01:00
Pratik Naik
375e8976e3 Ensure JoinAssociation uses aliased table name when multiple associations have hash conditions on the same table 2009-04-20 13:56:03 +01:00
David Heinemeier Hansson
fa750e08a8 Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH] 2009-04-16 17:26:10 -05:00
Luca Guidi
47bdf3bf40 Ensure AutosaveAssociation runs remove callbacks [#2146 state:resolved] 
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-12 15:24:37 +00:00
Elijah Miller
91b98cf0a5 Returning nil from named scope lambda is equivalent to an empty hash [#1773 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-12 15:06:19 +00:00
Jim Remsik and Tim Pope
1e6c50e21b Ensure has_many :through works with changed primary keys [#736 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-09 13:43:28 +00:00
Jan De Poorter
277c799d58 Fix find_by_last when order is given [#2127 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2009-03-09 13:02:31 +01:00
Arthur Klepchukov
ccb0a92fa2 Ensure validates_uniqueness_of considers limit on the field. [#1042 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-07 13:52:17 +00:00
Adam Cooper
3ca5a0f9fd Ensure belongs_to association with a counter cache in name spaced model works [#1678 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-06 22:05:18 +00:00
Dimitri Krassovski
984bc7a614 Ensure replacing has_one associations respects the supplied :dependent option. [#1305 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-06 19:11:13 +00:00
jvoorhis
6a13376525 Methods invoked within named scope Procs should respect the scope stack. [#1267 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-06 16:47:50 +00:00
Diego Algorta
0dd2f96f5c Fixed bug that makes named_scopes _forgot_ current scope 2009-02-25 09:21:08 -08:00
Lance Ivy
5dbc9d40a4 Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
[#1892 state:committed]
 2009-02-13 21:47:56 +13:00