| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | Run tests without IdentityMap when IM=false is given. | Emilio Tagua | 2011-02-15 | 6 | -15/+23 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 90 | -783/+2261 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 bad | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db | Jon Leighton | 2011-02-14 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 10 | -25/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... } rather than instance_eval-ing strings | |||||
| | * | | | | | | | | | | | | | Add missing require | Santiago Pastorino | 2011-02-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 3 | -10/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | create_fixtures() should always return a list | Aaron Patterson | 2011-02-11 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | refactor fixtures to do less work in the constructor | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | favor composition over inheritence. use AS::OrderedHash rather than omap | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing tests on 1.8, using a list of lists because order is important | Aaron Patterson | 2011-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | simplify bind parameter logging | Aaron Patterson | 2011-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | bind parameters are logged to debug log | Aaron Patterson | 2011-02-10 | 1 | -2/+36 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | test cases for bind parameter logging | Aaron Patterson | 2011-02-10 | 1 | -0/+56 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | rawr, mysql, mysql2, why do you hate me. :'( | Aaron Patterson | 2011-02-09 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | The optimistic lock column should be increased when calling touch | Franck Verrot | 2011-02-09 | 2 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | use parenthesis so limit works on all dbs | Aaron Patterson | 2011-02-09 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | bugfix for serialized_attributes to be class specific | Raimonds Simanovskis | 2011-02-09 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | |||||
| | * | | | | | | | | | | | | | Allow limit values to accept an ARel SQL literal. | Ken Collins | 2011-02-09 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | comma limits do not make sense on oracle or pg | Aaron Patterson | 2011-02-08 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | primary keys should not be cleared on cache clear, fixing oracle tests | Aaron Patterson | 2011-02-08 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | limit() should sanitize limit values | Aaron Patterson | 2011-02-08 | 1 | -0/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes CVE-2011-0448 | |||||
| | * | | | | | | | | | | | | | ignore max identifier length queries from pg | Aaron Patterson | 2011-02-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | this test requires the job model, so we should require it | Aaron Patterson | 2011-02-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | make set_table_name take effect immediately | Jan | 2011-02-08 | 3 | -0/+19 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | require tag since we need it for this test | Aaron Patterson | 2011-02-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Refactor the implementations of AssociatioCollection#delete and #destroy to ↵ | Jon Leighton | 2011-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be more consistent with each other, and to stop passing blocks around, thus making the execution easier to follow. | |||||
| | * | | | | | | | | | | | | | Correctly update counter caches on deletion for has_many :through [#2824 ↵ | Jon Leighton | 2011-02-07 | 5 | -10/+67 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved]. Also fixed a bunch of other counter cache bugs in the process, as once I fixed this one others started appearing like nobody's business. | |||||
| | * | | | | | | | | | | | | | Support the :dependent option on has_many :through associations. For ↵ | Jon Leighton | 2011-02-07 | 4 | -1/+139 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | historical and practical reasons, :delete_all is the default deletion strategy employed by association.delete(*records), despite the fact that the default strategy is :nullify for regular has_many. Also, this only works at all if the source reflection is a belongs_to. For other situations, you should directly modify the through association. | |||||
| | * | | | | | | | | | | | | | Make record.association.destroy(*records) on habtm and hm:t only delete ↵ | Jon Leighton | 2011-02-07 | 3 | -84/+199 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | records in the join table. This is to make the destroy method more consistent across the different types of associations. For more details see the CHANGELOG entry. | |||||
| | * | | | | | | | | | | | | | we do not use this method, so delete | Aaron Patterson | 2011-02-07 | 1 | -12/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | update ignored SQL for oracle | Aaron Patterson | 2011-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing some freedom patches. use notification system to count sql queries | Aaron Patterson | 2011-02-07 | 1 | -17/+18 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | the connection pool caches table_exists? calls | Aaron Patterson | 2011-02-07 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | do not to_s where you are testing that a string value is stored for the ↵ | Akira Matsuda | 2011-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before_type_cast Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | avoid nil.dup | Akira Matsuda | 2011-02-07 | 1 | -0/+8 | |
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | adjust query counts to be consistent across databases, make sure database ↵ | Aaron Patterson | 2011-02-04 | 3 | -5/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log the same things | |||||
| | * | | | | | | | | | | | | column cache now lives on the connection pool | Aaron Patterson | 2011-02-04 | 2 | -2/+22 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | almost fisted | Aaron Patterson | 2011-02-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | making sure primary key is set on the columns | Aaron Patterson | 2011-02-04 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | connection pool can cache column, table, and primary key information | Aaron Patterson | 2011-02-04 | 1 | -0/+35 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fixing ordering of HABTM association deletion [#6191 state:resolved] | Edward Faulkner | 2011-02-04 | 5 | -1/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | introduce a fake AR adapter for mocking database return values | Aaron Patterson | 2011-02-04 | 2 | -5/+43 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | allow AR caches to be cleared, clear them on class reloading | Aaron Patterson | 2011-02-03 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Revert "ARel only requires the connection from the AR class. Simply return ↵ | Aaron Patterson | 2011-02-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the AR class rather than jump through hoops and store ivars" This reverts commit d65e3b481e72e8c76818a94353e9ac315c7c0272. | |||||
| | * | | | | | | | | | | | | The type_cast_calculated_value method will trust DB types before casting to ↵ | Ken Collins | 2011-02-03 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a BigDecimal. [#6365 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | ARel only requires the connection from the AR class. Simply return the AR ↵ | Aaron Patterson | 2011-02-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class rather than jump through hoops and store ivars | |||||
| | * | | | | | | | | | | | | Make serialized columns with explicit object_type return a new instance of ↵ | Guillermo Álvarez | 2011-02-03 | 2 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the object instead of nil | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |