Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removing unused variables | Aaron Patterson | 2010-10-20 | 1 | -2/+2 |
| | |||||
* | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 4 | -11/+33 |
| | | | | was previously untested | ||||
* | AssociationCollection#include? working properly for objects added with build ↵ | Marcelo Giorgi | 2010-09-30 | 3 | -0/+26 |
| | | | | method [#3472 state:resolved] | ||||
* | Revert "porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master" | Aaron Patterson | 2010-09-28 | 1 | -6/+0 |
| | | | | This reverts commit bee447a5b9fe1d683c6cc69aefb7fc22c2a9d9af. | ||||
* | Set attributes properly for model built from association with conditions ↵ | Marcelo Giorgi | 2010-09-28 | 5 | -0/+46 |
| | | | | | | [#5562 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master | Aaron Patterson | 2010-09-28 | 1 | -0/+6 |
| | |||||
* | remove join table rows before removing owner row for habtm associations, ↵ | Hemant Kumar | 2010-09-21 | 1 | -1/+1 |
| | | | | fixes#5674 | ||||
* | providing arel with column information when possible [#5392 state:resolved] | Aaron Patterson | 2010-09-21 | 1 | -0/+10 |
| | |||||
* | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 2 | -41/+10 |
| | |||||
* | removing unused code | Aaron Patterson | 2010-08-22 | 1 | -2/+2 |
| | |||||
* | updated test_should_record_timestamp_for_join_table for Oracle | Raimonds Simanovskis | 2010-08-22 | 1 | -1/+1 |
| | |||||
* | While creating a new record using has_many create method default scope of ↵ | Neeraj Singh | 2010-08-19 | 1 | -0/+19 |
| | | | | | | | | | | | child should be respected. author.posts.create should take into account default_scope defined on post. [#3939: state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | avoids warnings about mismatched indentations in Ruby 1.9.2 | Xavier Noria | 2010-08-19 | 1 | -8/+5 |
| | |||||
* | code gardening: we have assert_(nil|blank|present), more concise, with ↵ | Xavier Noria | 2010-08-17 | 4 | -6/+6 |
| | | | | better default failure messages - let's use them | ||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 3 | -14/+14 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | fixed indentation in test cases | Mark Turner | 2010-08-11 | 1 | -2/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Merge branch 'master' into mysql2 | Brian Lopez | 2010-08-02 | 1 | -1/+39 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Bring returning back to ease migration. Remove duplicated logic. Eager loading an association should not change the count of children fix loading of different elements in array then int and string [#5036 state:resolved] Tidy up previous commit. test and fix collection_singular_ids= with string primary keys [#5125 state:resolved] Handle edge cases in the previous patch. Improved how AppGenerator generates the application name. It now detects the current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator. ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:resolved] Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 state:resolved] Add an internal (private API) after_touch callback. [#5271 state:resolved] added failing touch propagation test Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when using the deprecated syntax Failing test to check for route file corruption if legacy map parameter is used. [#5263 state:open] Corrected the rake test:units and test:functionals description [#5251 state:committed] Use AS::OrderedHash when trusting in the order of the hash Fix label form helper to use I18n and html options, without the need of 'nil' text param: | ||||
| * | Tidy up previous commit. | José Valim | 2010-08-02 | 1 | -1/+1 |
| | | |||||
| * | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 1 | -1/+39 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | update tests for mysql2 support | Brian Lopez | 2010-08-02 | 2 | -3/+8 |
|/ | |||||
* | Don't increment and then decrement the same counter when re-assigning a ↵ | Tarmo Tänav | 2010-07-29 | 1 | -0/+4 |
| | | | | | | | | belongs_to association [#2786 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | fixed joining of attributes when using find_or_create_by with multiple ↵ | Jon Buda | 2010-07-28 | 1 | -0/+9 |
| | | | | | | attributes through an association Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | removing unused models from tests | Subba Rao Pasupuleti | 2010-07-21 | 4 | -11/+0 |
| | | | | | | [#5153 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Timestamp columns of HABTM join table should record timestamps | Neeraj Singh | 2010-07-21 | 1 | -1/+34 |
| | | | | [#5161 state:resolved] | ||||
* | Ensure that primary_keys of HABTM records is not double quoted | Neeraj Singh | 2010-07-20 | 1 | -0/+18 |
| | | | | [#5152 state:reslved] | ||||
* | Removed warnings when a variable is shadowed | Łukasz Strzałkowski | 2010-07-19 | 1 | -2/+2 |
| | |||||
* | fixing typeo. thanks bamnet! | Aaron Patterson | 2010-07-16 | 1 | -1/+1 |
| | |||||
* | JoinDependency#graft does not properly set parent join [#5124 state:resolved] | David Genord II | 2010-07-16 | 1 | -0/+7 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Remove unintentional API changes. [#1108] | Pratik Naik | 2010-07-14 | 1 | -41/+9 |
| | |||||
* | count method should not take options if it is operated on has_many ↵ | Neeraj Singh | 2010-07-13 | 1 | -0/+26 |
| | | | | | | | | association which has finder_sql or counter_sql [#2395 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | string IDs are now quoted correctly [#5064 state:resolved] | Will St. Clair + Neeraj Singh | 2010-07-13 | 1 | -1/+11 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | renaming test name to fix accidently override | Subba Rao Pasupuleti | 2010-07-13 | 1 | -1/+1 |
| | | | | | | [#5076 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Eager loading :through associations will join the :source model if there are ↵ | Grant Ammons | 2010-07-08 | 1 | -0/+6 |
| | | | | | | :conditions. [#2362 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | fix ActiveRecord `destroy_all` so it returns destroyed records | Mislav Marohnić | 2010-07-08 | 1 | -2/+5 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | This test never runs and it has never run. Since the day this file | Neeraj Singh | 2010-07-08 | 1 | -4/+0 |
| | | | | | | | | was created this test has name not beginning with test_. Also this test is trying to use has_many on another has_many which is not supported. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fixed gruoped_by_title spelling [#5063 state:committed] | Ben Somers | 2010-07-08 | 1 | -2/+2 |
| | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | AssociationCollection#create_by_*, find_or_create_by_* work properly now. ↵ | Aaron Patterson | 2010-06-29 | 1 | -0/+62 |
| | | | | | | [#1108 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Order is not guaranteed here, ordering by id of people table makes it work | Santiago Pastorino | 2010-06-25 | 1 | -2/+2 |
| | |||||
* | Make sure about which is the first element of the query, fixes a postgresql ↵ | Santiago Pastorino | 2010-06-09 | 1 | -2/+2 |
| | | | | | | 8.4 failing test Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 1 | -1/+9 |
| | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge remote branch 'rsim/oracle_enhanced_rails3' | wycats | 2010-06-07 | 2 | -1/+5 |
|\ | |||||
| * | fix test_belongs_to_with_primary_key_joins_on_correct_column test on Oracle | Raimonds Simanovskis | 2010-06-04 | 1 | -0/+4 |
| | | |||||
| * | do order by id when finding first fixture to ensure that it is correct one | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+1 |
| | | | | | | | | (as otherwise was failing under JRuby and oracle_enhanced adapter) | ||||
* | | removes Array#random_element and backports Array#sample from Ruby 1.9, ↵ | Xavier Noria | 2010-06-05 | 1 | -7/+7 |
|/ | | | | thanks to Marc-Andre Lafortune | ||||
* | Use better assertion methods for testing | Neeraj Singh | 2010-05-19 | 8 | -31/+24 |
| | | | | | | [#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Change on Array extension from rand => random_element [#4555 state:committed] | Santiago Pastorino | 2010-05-16 | 1 | -7/+7 |
| | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Make use of assert_equal to test equallity between object assert expects and ↵ | Santiago Pastorino | 2010-05-16 | 1 | -1/+1 |
| | | | | | | | | object and a message of error [#4611 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix for get_ids when including a belongs_to association on a has_many ↵ | Diego Algorta | 2010-05-15 | 1 | -0/+4 |
| | | | | | | association [#2896 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix eager loading of associations causing table name collisions | Ernie Miller | 2010-04-28 | 1 | -0/+9 |
| | | | | | | [#4463 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | kill warnings on 1.8.7 [#4331 state:resolved] | Aaron Patterson | 2010-04-10 | 1 | -4/+4 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> |