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
21,244 Commits 34 Branches 105 Tags
63c8ea9a6a28ecaabb236dae094d99d9d1ee2ecd
Commit Graph

2630 Commits

Author SHA1 Message Date
Xavier Noria
f41dd99be7 revises links to the API websites of individual components (no longer maintained), and rewrites the section about after and around filters in the controller guide 2011-03-09 07:43:18 +01:00
Jon Leighton
532f915037 Referencing a table via the ON condition in a join should force that table to be eager-loaded via a JOIN rather than via subsequent queries. 2011-03-07 08:51:17 -08:00
R.T. Lechow
a1b4d8e7b2 Active Record typos. 2011-03-05 11:56:34 +01:00
Xavier Noria
3b10b8a201 implements ActiveRecord::Base.connection_config to be able to check the configuration of the current connection at runtime 2011-03-05 01:35:02 +01:00
Jon Leighton
8987cda2bb When preloading has_and_belongs_to_many associations, we should only instantiate one AR object per actual record in the database. (Even when IM is off.) 2011-03-04 15:16:07 -08:00
Jon Leighton
d90b4e2615 Rewrote AssociationPreload. 2011-02-28 22:12:34 +00:00
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
Eric Allam
13547c16d9 fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses 2011-02-24 11:17:06 -08: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
Aaron Patterson
2cce44fa7c expectations change when using IM. Change oracle tests to reflect that 2011-02-22 11:27:12 -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
Xavier Noria
f826e05835 Merge branch 'master' of git://github.com/lifo/docrails 2011-02-21 11:42:26 +01:00
Nicholas Rowe
2a75c190d4 Tpyo: fixing several cases of the the 2011-02-19 23:47:12 -05: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
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
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
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
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
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
Aaron Patterson
9c023cc4d2 explicitly allowing lolqueries 2011-02-16 15:11:48 -08:00
Aaron Patterson
2e2e58a6a3 fixing whitespace problems 2011-02-16 11:08:01 -08:00
Steven Fenigstein
9b188c5bfe removed an unnecessary second query when passing an ActiveRecord::Relation to a where clause. And added ability to use subselects in where clauses. 2011-02-16 09:54:09 -08:00
Aaron Patterson
8276a24020 fixture methods can be overridden and super() is useful 2011-02-15 15:52:27 -08:00
Aaron Patterson
f83218561e fixing variable names, removing FixtureFile instances from test ivars 2011-02-15 10:48:01 -08:00
Emilio Tagua
90a850aea4 Fix expected queries in relation tests. 2011-02-15 12:43:15 -03:00
Emilio Tagua
f1778eb44a Run tests without IdentityMap when IM=false is given. 2011-02-15 12:40:41 -03:00
Emilio Tagua
8ee0b44148 Merge remote branch 'rails/master' into identity_map 
Conflicts:
	activerecord/examples/performance.rb
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/autosave_association.rb
	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/relations_test.rb
 2011-02-15 12:01:04 -03:00
Aaron Patterson
c9f1ab5365 bad tests are bad 2011-02-14 17:10:14 -08:00
Aaron Patterson
e4dac4750d removing irrelevant test 2011-02-14 16:01:47 -08:00
Jon Leighton
eab5fb49f8 Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db 2011-02-14 01:40:31 +00:00
Jon Leighton
a7e19b30ca Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings 2011-02-14 01:40:31 +00:00
Santiago Pastorino
9143032a10 Add missing require 2011-02-13 02:38:31 -02:00
Ernie Miller
fbd917f50a Remove Relation#& alias for Relation#merge 2011-02-12 17:23:19 -08:00
Ernie Miller
d72add9c20 Fix table name collision due to incorrect alias count on certain joins. 
[#6423 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2011-02-12 19:52:12 -02:00
Aaron Patterson
6344246654 create_fixtures() should always return a list 2011-02-11 16:09:34 -08:00
Aaron Patterson
fb09d02542 refactor fixtures to do less work in the constructor 2011-02-11 14:33:03 -08:00