aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1180 from Karunakar/documentation_changeXavier Noria2011-05-211-3/+13
|\ | | | | Documentation Error Fixed for ticket #839
| * Documentation Error Fixed for ticket #839Karunakar (Ruby)2011-05-211-3/+13
| |
* | Merge pull request #1162 from guilleiguaran/singularize_individual_table_nameJon Leighton2011-05-211-2/+2
|\ \ | |/ |/| Singularize individual table name
| * Allow pluralize_table_names for individual modelGuillermo Iguaran2011-05-201-2/+2
| |
* | Syntax cleanup: for in => eachGuillermo Iguaran2011-05-191-1/+1
|/
* Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
|
* Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵Prem Sichanugrist2011-05-151-0/+8
| | | | This method will also return an empty array on an abstract class or a model that the table doesn't exists.
* Fix assigning protected attributes by attributes=knapo2011-05-111-4/+3
|
* fix bug in usage example of #unscopedCorin Langosch2011-05-111-1/+1
|
* Ensure assign_attributes and update_attributes do not fail on nil, closes #478.José Valim2011-05-101-0/+2
|
* renamed mass-assignment scopes to roles, updated code, tests, docs and ↵Josh Kalderimis2011-05-081-6/+6
| | | | security guide
* Class.new.name returns an empty string on 1.8José Valim2011-05-071-1/+1
|
* Revert "Revert the merge because tests did not pass."José Valim2011-05-071-0/+4
| | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3.
* Revert the merge because tests did not pass.José Valim2011-05-061-4/+0
| | | | | | | Revert "Merge pull request #423 from richardiux/master" This reverts commit b8f08c4ea7c56e34e3e17c9006f1ae6d9f7504ee, reversing changes made to fd9df1b1dd1196c2233835e25a6a38956e9e3959.
* Merge pull request #423 from richardiux/masterJosé Valim2011-05-061-0/+4
|\ | | | | Identity Map caching bug
| * Adding base method symbolized_sti_name to activerecord base to be used on ↵Richard Millan2011-05-061-0/+4
| | | | | | | | identity map. Identity map now considers the inheritance when creating the caching keys
* | Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-051-29/+52
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-041-18/+18
|\
| * Remove extra whitespacesSebastian Martinez2011-05-021-18/+18
| |
* | Merge pull request #357 from joshk/assign_attributes.David Heinemeier Hansson2011-05-011-5/+28
|\ \ | | | | | | Assign protected attributes with create/new and control the role.
| * | Added mass-assignment security :as and :without_protection support to AR.new ↵Josh Kalderimis2011-05-011-5/+28
| |/ | | | | | | and AR.create
* / removed the default_scope deprecations and updated the docs and tests to ↵Josh Kalderimis2011-04-281-36/+17
|/ | | | reflect its use cases
* deprecated the use of the guard_protected_attributes argument with ↵Josh Kalderimis2011-04-251-9/+14
| | | | attributes= in AR in favor of assign_attributes(attrs, :without_protection => true)
* Added assign_attributes to Active Record which accepts a mass-assignment ↵Josh Kalderimis2011-04-241-1/+40
| | | | security scope using the :as option, while also allowing mass-assignment security to be bypassed using :with_protected
* Bring back support for passing a callable object to the default_scope macro. ↵Jon Leighton2011-04-181-0/+12
| | | | You can also just use a block.
* Un-deprecate using 'default_scope' as a macro, but if you are calling the ↵Jon Leighton2011-04-181-20/+27
| | | | macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times.
* Evaluate default scopes at the last possible moment in order to avoid ↵Jon Leighton2011-04-121-8/+5
| | | | problems with default scopes getting included into other scopes and then being unable to remove the default part via unscoped.
* Deprecated support for passing hashes and relations to default_scope, in ↵Jon Leighton2011-04-121-51/+93
| | | | favour of defining a 'default_scope' class method in the model. See the CHANGELOG for more details.
* Delegate first!, last!, any? and many? to scopedAndrew White2011-03-291-1/+2
|
* Bring #reorder backSebastian Martinez2011-03-281-1/+1
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Do not in place modify what table_name returnsSantiago Pastorino2011-03-221-1/+1
|
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-051-3/+3
|\ | | | | | | | | Conflicts: activerecord/CHANGELOG
| * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-051-2/+2
| |
| * fixes a missmatched column in examplemjy2011-03-051-1/+1
| |
* | Use Base#type_condition in JoinAssociationJon Leighton2011-03-051-2/+2
|/
* Rewrote AssociationPreload.Jon Leighton2011-02-281-1/+1
|
* Fix missing inheritance from AR::Base in docsJosep M. Bach2011-02-241-1/+1
|
* merges docrailsXavier Noria2011-02-181-4/+1
|\
| * removes unrealistic example (authentication plus gender?), that it is not ↵Xavier Noria2011-02-181-4/+1
| | | | | | | | needed anyway
| * Clarify Example in ActiveRecord baseNicholas Rowe2011-02-181-1/+1
| |
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-151-70/+152
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add interpolation of association conditions back in, in the form of proc { ↵Jon Leighton2011-02-141-6/+0
| | | | | | | | | | | | ... } rather than instance_eval-ing strings
| * | bugfix for serialized_attributes to be class specificRaimonds Simanovskis2011-02-091-1/+3
| | | | | | | | | | | | previously serialized_attributes were kept as class attribute of ActiveRecord::Base - if some attribute was defined as serialized in one subclass then it was serialized in all other subclasses as well (if it had the same name)
| * | make set_table_name take effect immediatelyJan2011-02-081-0/+3
| |/
| * almost fistedAaron Patterson2011-02-041-20/+6
| |
| * allow AR caches to be cleared, clear them on class reloadingAaron Patterson2011-02-031-0/+6
| |
| * Revert "ARel only requires the connection from the AR class. Simply return ↵Aaron Patterson2011-02-031-2/+8
| | | | | | | | | | | | the AR class rather than jump through hoops and store ivars" This reverts commit d65e3b481e72e8c76818a94353e9ac315c7c0272.
| * ARel only requires the connection from the AR class. Simply return the AR ↵Aaron Patterson2011-02-031-8/+2
| | | | | | | | class rather than jump through hoops and store ivars
| * reduce cache misses on STI subclassesAaron Patterson2011-02-031-2/+4
| |
| * this method should be privateAaron Patterson2011-02-031-7/+7
| |