Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-08 | 13 | -61/+79 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | use column names as order by complex function parameters, fix for postgresql ↵ | Raimonds Simanovskis | 2010-11-07 | 1 | -12/+2 |
| | | | | | | | | | | | | adapter to correctly remove ASC/DESC Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Fixes queries using limits and punctuation in order, removes order("col1, ↵ | Santiago Pastorino | 2010-11-05 | 3 | -4/+25 |
| | | | | | | | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed] | ||||
| * | renaming exec in the mysql adapter | Aaron Patterson | 2010-11-05 | 1 | -13/+13 |
| | | |||||
| * | renaming exec in the PG adapter | Aaron Patterson | 2010-11-05 | 2 | -11/+11 |
| | | |||||
| * | converted exec to exec_query for sqlite | Aaron Patterson | 2010-11-05 | 2 | -15/+15 |
| | | |||||
| * | ignoring certain SQL when using Oracle | Aaron Patterson | 2010-11-03 | 1 | -0/+4 |
| | | |||||
| * | select goes through exec(), so no method chaining for query counts | Aaron Patterson | 2010-11-03 | 1 | -12/+0 |
| | | |||||
| * | use bind params in select with query monkeypatch | Aaron Patterson | 2010-11-03 | 1 | -2/+2 |
| | | |||||
| * | Ensure save always updates timestamps when serialized attributes are present | Pratik Naik | 2010-11-02 | 1 | -0/+14 |
| | | |||||
| * | Add timestamps to Topic | Pratik Naik | 2010-11-02 | 3 | -6/+7 |
| | | |||||
* | | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵ | Jon Leighton | 2010-10-31 | 1 | -6/+6 |
| | | | | | | | | fixtures in this branch | ||||
* | | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵ | Jon Leighton | 2010-10-31 | 1 | -1/+2 |
| | | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb | ||||
* | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 14 | -126/+126 |
| | | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 5 | -0/+45 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb | ||||
| * | adding tests for #5234 and #5184. Tests were from Akira Matsuda. Thanks Akira! | Aaron Patterson | 2010-10-30 | 2 | -0/+11 |
| | | |||||
| * | Convert :primary_key in association to a string before comparing to column ↵ | Denis Odorcic | 2010-10-30 | 2 | -0/+8 |
| | | | | | | | | names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved] | ||||
| * | Fix issues when including the same association multiple times and mixing ↵ | Ernie Miller | 2010-10-30 | 1 | -0/+26 |
| | | | | | | | | joins/includes together. | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 21 | -83/+422 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb | ||||
| * | fisting test name | Aaron Patterson | 2010-10-27 | 1 | -1/+1 |
| | | |||||
| * | making query cache work with prepared statements | Aaron Patterson | 2010-10-27 | 1 | -0/+6 |
| | | |||||
| * | setting the authorized session clears the statement cache | Aaron Patterson | 2010-10-26 | 1 | -0/+11 |
| | | |||||
| * | add a session authorization setter to the pg connection | Aaron Patterson | 2010-10-26 | 1 | -1/+8 |
| | | |||||
| * | avoiding statement cache if there are no bind values | Aaron Patterson | 2010-10-26 | 1 | -0/+12 |
| | | |||||
| * | bind substitution is working properly | Aaron Patterson | 2010-10-26 | 1 | -0/+8 |
| | | |||||
| * | bind parameters are now typecast | Aaron Patterson | 2010-10-26 | 1 | -0/+14 |
| | | |||||
| * | basic bind parameters are working | Aaron Patterson | 2010-10-26 | 1 | -0/+12 |
| | | |||||
| * | initial exec() method is working in pg adapter | Aaron Patterson | 2010-10-26 | 1 | -0/+17 |
| | | |||||
| * | one more mysql test left! | Aaron Patterson | 2010-10-26 | 1 | -1/+1 |
| | | |||||
| * | mysql tests are mostly passing | Aaron Patterson | 2010-10-26 | 2 | -3/+61 |
| | | |||||
| * | refactoring tests | Aaron Patterson | 2010-10-26 | 1 | -36/+20 |
| | | |||||
| * | type casting bound value based on column associated with value | Aaron Patterson | 2010-10-26 | 1 | -0/+18 |
| | | |||||
| * | exec returns an AR::Result | Aaron Patterson | 2010-10-26 | 2 | -0/+43 |
| | | |||||
| * | adding bind_values to relations | Aaron Patterson | 2010-10-26 | 1 | -0/+9 |
| | | |||||
| * | adding bind value substitution | Aaron Patterson | 2010-10-26 | 1 | -0/+9 |
| | | |||||
| * | reducing the number of parameters to select() | Aaron Patterson | 2010-10-26 | 1 | -2/+2 |
| | | |||||
| * | removing call to deprecated API, this test is outside AR responsibilities | Aaron Patterson | 2010-10-22 | 1 | -7/+0 |
| | | |||||
| * | made a pass in AR's schema.rb to keep (most) create statements in ↵ | Xavier Noria | 2010-10-22 | 1 | -59/+60 |
| | | | | | | | | lexicographic order, and fixed an FK | ||||
| * | has_one maintains the association with separate after_create/after_update | Xavier Noria | 2010-10-22 | 3 | -0/+65 |
| | | | | | | | | | | This way parent models can get their own after_create and after_update callbacks fired after has_one has done its job. | ||||
| * | adding a test to ensure offsets with no limits will work [#5316 state:resolved] | Aaron Patterson | 2010-10-20 | 1 | -0/+6 |
| | | |||||
| * | removing unused variables | Aaron Patterson | 2010-10-20 | 1 | -2/+2 |
| | | |||||
| * | default scope merge where clauses [#5488 state:resolved] | Jan | 2010-10-20 | 2 | -0/+18 |
| | | |||||
| * | scopes can take an object that responds to `call` | Aaron Patterson | 2010-10-19 | 2 | -0/+13 |
| | | |||||
| * | default scope can accept any object that responds to #call | Aaron Patterson | 2010-10-19 | 1 | -0/+18 |
| | | |||||
| * | Allow default_scope to accept a Proc. | Tim Morgan | 2010-10-19 | 2 | -0/+17 |
| | | |||||
| * | Fix SQLite adapter name [#5842 state:resolved] | Anil Wadghule | 2010-10-19 | 3 | -7/+7 |
| | | |||||
* | | Rename nested_has_many_through_associations_test.rb because it does not only ↵ | Jon Leighton | 2010-10-19 | 1 | -1/+1 |
| | | | | | | | | concern has_many associations | ||||
* | | Add explicit ordering in relations_test.rb, as the lack of this was causing ↵ | Jon Leighton | 2010-10-19 | 1 | -9/+9 |
| | | | | | | | | failures against postgres | ||||
* | | Add explicit ordering to nested_has_many_through_associations_test.rb as ↵ | Jon Leighton | 2010-10-19 | 1 | -32/+37 |
| | | | | | | | | this was causing failures under postgres | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-19 | 3 | -14/+38 |
|\| |