Commit Graph

5526 Commits

Author SHA1 Message Date
Aaron Patterson
a8dae084c9 skip this on oracle 2011-02-28 09:15:19 -08:00
Aaron Patterson
f3e9cbc695 use an attribute rather than a SQL literal 2011-02-26 16:05:15 -08:00
Aaron Patterson
54a2bf6601 removing limits and offsets from COUNT queries unless both are specified. [#6268 state:resolved] 2011-02-25 15:38:59 -08:00
Aaron Patterson
8fc54a2e81 only take the limit if there is a limit to take 2011-02-25 14:24:05 -08:00
Xavier Noria
2e60b00788 Merge branch 'master' of git://github.com/lifo/docrails 2011-02-25 20:53:55 +01:00
Eric Allam
13547c16d9 fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses 2011-02-24 11:17:06 -08:00
Josep M. Bach
55105c4318 Fix missing inheritance from AR::Base in docs 2011-02-24 10:00:09 +01:00
Aaron Patterson
5f1fc0c8ac observers leak across tests, so rather than modify the object, we should just count the number of times the observer was called 2011-02-23 16:04:01 -08:00
Kamal Fariz Mahyuddin
6ba8caf3ee Fix observer callbacks firing multiple times on descendant instances 2011-02-22 16:25:19 -08:00
Prem Sichanugrist
839d06f5f2 We're in 2011, let's update our license
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-22 18:24:20 -02:00
Aaron Patterson
2cce44fa7c expectations change when using IM. Change oracle tests to reflect that 2011-02-22 11:27:12 -08:00
Aaron Patterson
4bd8d2607c Relation will delegate to AR::Base which already uses the Dynamic finders, so eliminate duplicate calls 2011-02-22 11:07:51 -08:00
Aaron Patterson
b3fcabb3a5 adding a test case for custom locking 2011-02-21 16:12:02 -08:00
Jon Leighton
52f8e4b9da Use proper objects to do the work to build the associations (adding methods, callbacks etc) rather than calling a whole bunch of methods with rather long names. 2011-02-21 10:16:15 -08:00
Jon Leighton
a5274bb52c Rename target_klass to klass 2011-02-21 10:16:14 -08:00
Jon Leighton
8b00da5258 Delegate through_reflection and source_reflection to reflection 2011-02-21 10:16:14 -08:00
Jon Leighton
32eef69dc1 Delegate Association#options to the reflection, and replace 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations. 2011-02-21 10:16:14 -08:00
Jon Leighton
73ff0076b3 Singular associations no longer use a proxy, so no need to check for the proxy type on assignment. 2011-02-21 10:16:14 -08:00
Jon Leighton
1d85a73ceb Associations - where possible, call attributes methods rather than directly accessing the instance variables 2011-02-21 10:16:14 -08:00
Xavier Noria
f826e05835 Merge branch 'master' of git://github.com/lifo/docrails 2011-02-21 11:42:26 +01:00
Xavier Noria
b481574a33 copy-edits 8d96b89 2011-02-21 11:37:08 +01:00
Rodrigo Navarro
62fd334684 Adding new examples for update_all method 2011-02-20 22:22:52 -03:00
Rodrigo Navarro
4da0157aaf Adding examples 2011-02-20 22:03:29 -03:00
Nicholas Rowe
2a75c190d4 Tpyo: fixing several cases of the the 2011-02-19 23:47:12 -05:00
Nicholas Rowe
89b3bc4807 Typo: fixing the the 2011-02-19 23:46:30 -05:00
Peer Allan
8d96b89110 Clarification of ActiveRecord ActiveModel validation documentation 2011-02-18 20:51:56 -06:00
Aaron Patterson
289cc15f1a instance_methods includes public and protected, so reduce funcalls and object allocs 2011-02-18 17:32:08 -08:00
Aaron Patterson
8657826f41 oops, no need for puts! 2011-02-18 15:53:54 -08:00
Aaron Patterson
30679bc705 AR::AttributeMethods does not need to be included in an AR::Base class. 2011-02-18 15:51:39 -08:00
Xavier Noria
ce76cfc61f fixes a merge conflict 2011-02-19 00:42:51 +01:00
Xavier Noria
f41bf6938f merges docrails 2011-02-18 23:22:15 +01:00
Xavier Noria
2acb5e348d removes unrealistic example (authentication plus gender?), that it is not needed anyway 2011-02-18 22:54:02 +01:00
Nicholas Rowe
ad3e4e3af6 Clarify Example in ActiveRecord base 2011-02-18 14:43:53 -05:00
Emilio Tagua
00418ac96b Merge remote branch 'rails/master' into identity_map 2011-02-18 16:22:50 -03:00
Emilio Tagua
3927827dbe Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 2011-02-18 16:20:15 -03:00
Emilio Tagua
8052623a3d No need to have reinit_with inside an InstanceMethods module. 2011-02-18 16:04:47 -03:00
Emilio Tagua
49f3525f19 Initialize @target instead asking if it is defined. 2011-02-18 15:55:55 -03:00
Jon Leighton
6975a41adf Remove test which was broken on 1.8. This test is now irrelevant since singular associations no longer return a proxy object. 2011-02-18 18:50:35 +00:00
Aaron Patterson
2e748feb80 just use the list of column names to generate attribute methods 2011-02-18 10:47:19 -08:00
Emilio Tagua
eb23b2247d Should use "=" instead "replace" after this commit: 1644663ba7 2011-02-18 15:44:23 -03:00
Emilio Tagua
d21a454327 No need to test agaisnt target. 2011-02-18 15:40:48 -03:00
Emilio Tagua
356086944d Reindent and remove wrong line left in merge by mistake. 2011-02-18 15:40:06 -03:00
Emilio Tagua
b8c2feb97e Use to_a instead :load in test, since :load changed. 2011-02-18 15:38:17 -03:00
Emilio Tagua
15a03ca9b0 No need to test against target anymore. 2011-02-18 15:38:00 -03:00
Emilio Tagua
0b702ba3de Merge remote branch 'rails/master' into identity_map
Conflicts:
	activerecord/lib/active_record/associations/association.rb
	activerecord/lib/active_record/fixtures.rb
2011-02-18 15:29:33 -03:00
Nicholas Rowe
9a9d895481 Fix Typos: remove several occurences of the the 2011-02-17 20:46:52 -05:00
Jon Leighton
1644663ba7 Split AssociationProxy into an Association class (and subclasses) which manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. 2011-02-18 00:00:13 +00:00
Jon Leighton
1d9f26ed47 Add :nodoc: to ThroughAssociation and HasOneAssociation 2011-02-18 00:00:13 +00:00
Jon Leighton
91fd651056 Allow building and then later saving has_many :through records, such that the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved] 2011-02-18 00:00:13 +00:00
Jon Leighton
f0b9805029 Ensure that association_ids uses the correct attribute where the association is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] 2011-02-18 00:00:13 +00:00