Commit Graph

21131 Commits

Author SHA1 Message Date
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
7d9a80be93 Remove awkward phrasing from Ajax on Rails guide 2011-02-17 20:49:25 -05:00
Nicholas Rowe
9a9d895481 Fix Typos: remove several occurences of the the 2011-02-17 20:46:52 -05:00
Nicholas Rowe
a906deabc6 fix type: remove extra period 2011-02-17 20:34:22 -05:00
Kedar Mhaswade
1c21f75f1b Created a new Troubleshooting section in the migrations guide.
Added a bullet point there showing how the Uninitialized Constant
(missing migration class) error looks like.
2011-02-17 16:27:01 -08: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
genlinux
23a5be74ce commas to set off expressions that interrupt sentence flow 2011-02-17 22:40:58 +05:30
Ben Orenstein
b131cfba05 Remove unused line in test setup.
[#6442 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-17 14:38:51 -02:00
Brian Durand
017012b43a Add description of transaction callbacks to ActiveRecord callbacks guide. 2011-02-17 10:18:56 -06:00
Brian Durand
fead0fc448 update caching guide with the changes to ActiveSupport::Cache from the 3.0.0 release. 2011-02-17 10:14:22 -06:00
Vijay Dev
465dd379e4 fix typo 2011-02-17 17:19:51 +05:30
Vijay Dev
ed630dfc72 fix typo 2011-02-17 16:59:03 +05:30
Aaron Patterson
9c023cc4d2 explicitly allowing lolqueries 2011-02-16 15:11:48 -08:00
Jimmy Cuadra
bd7d8665a0 add note about observer config for rails apps
ActiveModel::Observer and ActiveRecord::Observer have similar
documentation, but a Rails user looking at the ActiveModel version
might not realize that a change to config/application.rb is
required to activate the observer. This change adds a note to
that effect, pointing to the AR version from the AM version.
2011-02-16 14:15:48 -08:00
Aaron Patterson
ceb2f0f216 use the arel table rather than generating strings 2011-02-16 11:46:55 -08:00
Aaron Patterson
1dea7b5a61 no need for Array.wrap 2011-02-16 11:22:30 -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
Timothy N. Tsvetkov
c6fac7b449 Fixed issue #6363, avoid to pluralized already pluralized names and singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case
[#6363 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-16 15:09:06 -02:00
Dan Pickett
1754bd9b20 handle double pluralization for irregular plurals
[#6363]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-16 15:08:25 -02:00
Ben Orenstein
2eed9286ce Remove unused code.
[#6437 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-16 13:20:04 -02:00
Aaron Patterson
8276a24020 fixture methods can be overridden and super() is useful 2011-02-15 15:52:27 -08:00
Aaron Patterson
8c4c07e4cb fixing variable names to reflect reality 2011-02-15 15:35:10 -08:00
Aaron Patterson
13e72db770 this is in the AR namespace, so AR must exist 2011-02-15 15:05:52 -08:00
Joel Nimety
ef57334210 GcTime incorrectly checks GC.respond_to?(:total_time), it should check GC::Profiler.respond_to?(:total_time)
[#6435 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-15 20:13:06 -02:00
Xavier Noria
5444ed56ab Revert "Fix error: docrails is a fork, not a branch."
Reason: Calling docrails a "branch" is fine, no need to change the terminology. It is a remote in my machine, and it has been called branch since the very beginning: http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch

This reverts commit 35a266edfd9ac0f3afe7f7f13c2dcf29cb4b651f.
2011-02-15 22:17:25 +01:00
Timothy N. Tsvetkov
09ccdc3737 Optimization for postgres adapter for add_column method. Set default and not null in one query 2011-02-15 10:52:14 -08:00
Aaron Patterson
f83218561e fixing variable names, removing FixtureFile instances from test ivars 2011-02-15 10:48:01 -08:00
Aaron Patterson
f0b1173965 removing unused variable 2011-02-15 10:07:19 -08:00
Steve Schwartz
f4ddb4da89 Added RDoc info for accepted options for simple_format in TextHelper. 2011-02-15 12:58:57 -05:00
Ben Orenstein
35a266edfd Fix error: docrails is a fork, not a branch. 2011-02-15 11:51:07 -05:00
Emilio Tagua
90a850aea4 Fix expected queries in relation tests. 2011-02-15 12:43:15 -03:00
Emilio Tagua
c13b7c4a0f Don't shadow outer local variable. 2011-02-15 12:41:57 -03:00
Emilio Tagua
f1778eb44a Run tests without IdentityMap when IM=false is given. 2011-02-15 12:40:41 -03:00
Emilio Tagua
ca75091fc7 Remove identity map from benchmark script. 2011-02-15 12:06:44 -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
Ken Mazaika
1bedee5631 ActiveResource validation tests did not test ActiveModel validations. Adjust the test to be done the Rails3 way.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-15 12:04:42 -02:00
Sergii Boiko
471327169d fixed broken link to postgresql docs
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-02-15 12:01:15 -02:00
Ben Orenstein
25e3d2caf4 Correct bad wording in description. 2011-02-14 20:41:32 -05:00
Aaron Patterson
c9f1ab5365 bad tests are bad 2011-02-14 17:10:14 -08:00
Aaron Patterson
02fc45a057 remove accidental raise! 2011-02-14 16:48:18 -08:00
Aaron Patterson
e4dac4750d removing irrelevant test 2011-02-14 16:01:47 -08:00
Aaron Patterson
fab9c2eaaa Merge branch 'fixtures'
* fixtures:
  remove unused methods
  extract database activity out of Fixtures instances
  extract rows that should be inserted to a method
  fixtures will return a list of tables that may be effected, delete existing fixtures will delete those tables
2011-02-14 14:55:25 -08:00