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
22,668 Commits 34 Branches 105 Tags
9968b95b6035bb0d2fa115d3effb83eaae7d63ad
Commit Graph

5939 Commits

Author SHA1 Message Date
Santiago Pastorino
9773f6e1aa Add missing require 2011-05-17 19:50:17 -04:00
Aaron Patterson
a898df66e4 bumping arel requirement 2011-05-17 18:05:27 -04:00
Andrew White
f3b0be812e Don't pass a block as we are yielding 2011-05-17 22:33:36 +01:00
Andrew White
3773aa4fbb Add block setting of attributes to singular associations 2011-05-17 22:16:24 +01:00
Andrew White
42f1ad6865 Pass the attribute and option hashes to build_association 
The build_association method was added as an API for plugins
to hook into in 1398db0. This commit restores this API and the
ability to override class.new to return a subclass based on
a virtual attribute in the attributes hash.
 2011-05-17 20:43:30 +01:00
Arun Agrawal
ed119aa5d6 Fixed InnerJoinAssociationTest. Need to load essays fixture. 2011-05-17 20:29:28 +05:30
Guillermo Iguaran
2c89ed9ad6 Adding missing require 2011-05-16 22:22:27 -05:00
Jon Leighton
2033ff825b Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false 
Fixing has_many when ActiveRecord::Base.pluralize_table_names is false
 2011-05-16 15:40:12 -07:00
Sebastian Martinez
2470392e89 Add doc to #attribute_names 2011-05-15 21:33:49 -03:00
Prem Sichanugrist
5ca67eca21 Add ActiveRecord::attribute_names to retrieve a list of attribute names. This method will also return an empty array on an abstract class or a model that the table doesn't exists. 2011-05-15 19:07:40 -04:00
Guillermo Iguaran
ecbde46e57 Fixing has_many association when ActiveRecord::Base.pluralize_table_names is false. fixes #557 2011-05-15 03:53:10 -05:00
Jon Leighton
7e6145b4a2 These extra array operations appear to be unnecessary. Reasoning: 
* It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code)
 * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in)
 2011-05-14 19:49:22 +01:00
Jon Leighton
60b23ea1da CollectionAssociation#merge_target_lists should write to the underlying attributes when copying, rather than using the assignment method 2011-05-14 19:49:22 +01:00
Jon Leighton
6660beef36 An attempt to make CollectionAssociation#merge_target_lists make more sense. 2011-05-14 19:49:22 +01:00
José Valim
e7e1d83ddf Added some docs to controller runtime. 2011-05-14 03:59:14 -07:00
Tom Ward
6d96124284 Reset ActiveRecord::LogSubscriber runtime at the start of each request 
Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called.  Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect.  Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously.
 2011-05-14 10:39:01 +01:00
Xavier Noria
d491130236 Merge branch 'master' of git://github.com/lifo/docrails 
Conflicts:
	actionpack/lib/action_view/helpers/date_helper.rb
	railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
 2011-05-14 11:21:27 +02:00
Jon Leighton
8a1de9b252 Instead of doing find(:all) which does scoped.find(:all) which does scoped.all, just do scoped.all. 2011-05-13 23:53:02 +01:00
Jon Leighton
5d4799d593 Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't see a way that it would happen ever) 2011-05-13 23:53:02 +01:00
Aaron Patterson
a44f228fde backport skip to the AR base class 2011-05-13 13:06:59 -07:00
Aaron Patterson
ce1a1b47be supporting infinity and -infinity for timestamps in PG. fixes #544 2011-05-13 13:04:44 -07:00
Jon Leighton
6e466f17c3 Don't use mass-assignment protection when setting foreign keys or association conditions on singular associations. Fixes #481 (again). 2011-05-12 23:29:22 +01:00
Josh Kalderimis
a0000d0ea0 updated AR#create! to accept an options hash so the mass-assignment security role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures. 2011-05-12 09:24:42 +02:00
Santiago Pastorino
0979a7e680 Merge pull request #491 from arunagw/readme_changes 
Some readme fixes as required.
 2011-05-11 17:01:36 -07:00
Jon Leighton
d192d85668 Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations 
Bug fixes for calculations with includes
 2011-05-11 13:32:04 -07:00
Fadzril Muhamad & Joseph Palermo
1db49ced45 Bug fixes: 
- If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not.
- When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count.  Looks like it was broken here:
b9599502c9
 2011-05-12 04:05:24 +08:00
Santiago Pastorino
c53d3929cd Add missing requires 2011-05-11 13:05:04 -03:00
knapo
bb498a5749 Fix assigning protected attributes by attributes= 2011-05-11 17:17:42 +02:00
Andrew White
0fde84c0f8 Don't remove the target if it has already been destroyed 2011-05-11 14:22:22 +01:00
Michael Ebens
940c31f9de Modified NamedScopeTest to use CollectionAssociation. 2011-05-11 03:37:35 -07:00
Michael Ebens
ad991808d5 Modified CollectionAssociation to refer to the new class name. 2011-05-11 03:27:38 -07:00
Jon Leighton
1dd90f8f12 Don't use select() values from the join model of a through association. Fixes #508. 2011-05-11 08:56:01 +01:00
Jon Leighton
aa1fc1c88c Bring back obj.association_loaded? as a deprecated method. Fixes #472. 2011-05-11 08:56:01 +01:00
Corin Langosch
2bfeda3f09 fix bug in usage example of #unscoped 2011-05-11 09:19:12 +02:00
Jon Leighton
a8c1fa4afd Add test to specify that attributes from an association's conditions should be assigned without mass-assignment protection when a record is built on the association. 2011-05-10 23:35:15 +01:00
Jon Leighton
93a85ce333 Remove unnecessary '|| {}' 2011-05-10 23:35:15 +01:00
Jon Leighton
9a7dbe2c05 Don't use mass-assignment protection when applying the scoped.scope_for_create. Fixes #481. 2011-05-10 22:54:40 +01:00
Vishnu Atrai
9a0e3d44d1 minor cleaning with new api method 2011-05-11 00:15:16 +05:30
Aaron Patterson
558334a899 deprecating CSV fixture support 2011-05-10 11:08:18 -07:00
Aaron Patterson
714fea81e4 deprecating read_csv_fixture_files method 2011-05-10 11:08:18 -07:00
Piotr Sarnacki
9f0af6d6dd Merge pull request #495 from vatrai/minor_fixes 
minor cleaning
 2011-05-10 10:57:15 -07:00
Vishnu Atrai
33f0b6b67d minor cleaning 2011-05-10 22:51:54 +05:30
Aaron Patterson
134a05adcb Merge pull request #493 from guilleiguaran/changelog-fixes 
Merging 3.0.x CHANGELOGs
 2011-05-10 10:04:54 -07:00
Guillermo Iguaran
259c749de1 Merging 3.0.x CHANGELOGs 2011-05-10 11:51:35 -05:00
Arun Agrawal
9870afb37b Some readme fixes as required. 2011-05-10 22:00:06 +05:30
Joshua Wehner
2cef2d411a Methods that return nil should not be considered YAML 2011-05-10 12:06:09 -04:00
slainer68
95b4989559 Puts ActiveRecord::SessionStore attributes in white list, fixes #483 2011-05-10 16:11:28 +02:00
Vijay Dev
a4765f74cd Fix typos in IM documentation 2011-05-10 03:44:57 -07:00
José Valim
302c912bf6 Document identity map inconsistency with associations, closes #474. 2011-05-10 11:33:39 +02:00
José Valim
5fc3564a50 Fix #480. Passing nil to create association works. 2011-05-10 11:18:16 +02:00