aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-182-9/+1
|\ \
| * | Remove test which was broken on 1.8. This test is now irrelevant since ↵Jon Leighton2011-02-181-8/+0
| | | | | | | | | | | | singular associations no longer return a proxy object.
| * | just use the list of column names to generate attribute methodsAaron Patterson2011-02-181-1/+1
| | |
* | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8Emilio Tagua2011-02-182-8/+4
| | |
* | | No need to have reinit_with inside an InstanceMethods module.Emilio Tagua2011-02-181-17/+15
| | |
* | | Initialize @target instead asking if it is defined.Emilio Tagua2011-02-181-1/+2
| | |
* | | Should use "=" instead "replace" after this commit: ↵Emilio Tagua2011-02-181-1/+1
| | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b
* | | No need to test agaisnt target.Emilio Tagua2011-02-181-1/+1
| | |
* | | Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
| | |
* | | Use to_a instead :load in test, since :load changed.Emilio Tagua2011-02-181-1/+1
| | |
* | | No need to test against target anymore.Emilio Tagua2011-02-181-8/+8
| | |
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1838-771/+833
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb
| * | Split AssociationProxy into an Association class (and subclasses) which ↵Jon Leighton2011-02-1826-502/+392
| | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
| * | Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| | |
| * | Allow building and then later saving has_many :through records, such that ↵Jon Leighton2011-02-187-12/+124
| | | | | | | | | | | | 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]
| * | Ensure that association_ids uses the correct attribute where the association ↵Jon Leighton2011-02-184-2/+20
| | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved]
| * | explicitly allowing lolqueriesAaron Patterson2011-02-162-13/+11
| | |
| * | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| | |
| * | no need for Array.wrapAaron Patterson2011-02-161-1/+1
| | |
| * | fixing whitespace problemsAaron Patterson2011-02-161-3/+3
| | |
| * | removed an unnecessary second query when passing an ActiveRecord::Relation ↵Steven Fenigstein2011-02-162-2/+32
| | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses.
| * | fixture methods can be overridden and super() is usefulAaron Patterson2011-02-152-14/+32
| | |
| * | fixing variable names to reflect realityAaron Patterson2011-02-151-11/+11
| | |
| * | this is in the AR namespace, so AR must existAaron Patterson2011-02-151-1/+1
| | |
| * | Optimization for postgres adapter for add_column method. Set default and not ↵Timothy N. Tsvetkov2011-02-151-6/+10
| | | | | | | | | | | | null in one query
| * | fixing variable names, removing FixtureFile instances from test ivarsAaron Patterson2011-02-152-21/+14
| | |
| * | removing unused variableAaron Patterson2011-02-151-3/+1
| | |
| * | fixed broken link to postgresql docsSergii Boiko2011-02-151-1/+1
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Fix expected queries in relation tests.Emilio Tagua2011-02-151-2/+2
| | |
* | | Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
| | |
* | | Run tests without IdentityMap when IM=false is given.Emilio Tagua2011-02-156-15/+23
| | |
* | | Remove identity map from benchmark script.Emilio Tagua2011-02-151-7/+0
| | |
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-15158-3075/+5503
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | bad tests are badAaron Patterson2011-02-141-18/+0
| | |
| * | remove accidental raise!Aaron Patterson2011-02-141-1/+0
| | |
| * | removing irrelevant testAaron Patterson2011-02-142-18/+1
| | |
| * | Merge branch 'fixtures'Aaron Patterson2011-02-141-28/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | remove unused methodsAaron Patterson2011-02-142-40/+0
| | | |
| | * | extract database activity out of Fixtures instancesAaron Patterson2011-02-141-7/+23
| | | |
| | * | extract rows that should be inserted to a methodAaron Patterson2011-02-141-12/+12
| | | |
| | * | fixtures will return a list of tables that may be effected, delete existing ↵Aaron Patterson2011-02-142-6/+30
| | | | | | | | | | | | | | | | fixtures will delete those tables
| * | | Merge remote branch 'jonleighton/association_fixes'Aaron Patterson2011-02-1423-117/+171
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jonleighton/association_fixes: Add a transaction wrapper in add_to_target. This means that #build will now also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create. Inline ensure_owner_is_persisted! as it is only called from one place @target should always be an array Rename add_record_to_target_with_callbacks to add_to_target Don't pass the block through build_record Move create and create! next to build Get rid of create_record as it is not only used in one place Get rid of AssociationCollection#save_record Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings
| | * | Add a transaction wrapper in add_to_target. This means that #build will now ↵Jon Leighton2011-02-141-27/+27
| | | | | | | | | | | | | | | | also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create.
| | * | Inline ensure_owner_is_persisted! as it is only called from one placeJon Leighton2011-02-141-8/+4
| | | |
| | * | @target should always be an arrayJon Leighton2011-02-141-1/+2
| | | |
| | * | Rename add_record_to_target_with_callbacks to add_to_targetJon Leighton2011-02-142-5/+5
| | | |
| | * | Don't pass the block through build_recordJon Leighton2011-02-141-10/+8
| | | |
| | * | Move create and create! next to buildJon Leighton2011-02-141-21/+21
| | | |
| | * | Get rid of create_record as it is not only used in one placeJon Leighton2011-02-141-8/+7
| | | |
| | * | Get rid of AssociationCollection#save_recordJon Leighton2011-02-145-26/+26
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 01:25:21 +0000