Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'fred/pullable' | Pratik Naik | 2008-12-30 | 5 | -5/+47 |
|\ | |||||
| * | Fix to_sentence being used with options removed by 273c77 | Frederick Cheung | 2008-12-27 | 1 | -1/+1 |
| | | |||||
| * | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵ | Roman Shterenzon | 2008-12-27 | 2 | -1/+10 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| * | Fix :include of has_one with :primary_key option | Frederick Cheung | 2008-12-26 | 2 | -1/+17 |
| | | |||||
| * | Fix :include of has_many associations with :primary_key option | Frederick Cheung | 2008-12-26 | 3 | -2/+19 |
| | | |||||
* | | Fix named scope tests for sqlite3 [#1667 state:resolved] | Mike Gunderloy | 2008-12-30 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Add transaction check to SQLite2 adapter to fix ↵ | Mike Gunderloy | 2008-12-30 | 1 | -0/+4 |
| | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-12-28 | 7 | -68/+116 |
|\ \ | |||||
| * | | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 7 | -68/+116 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵ | Yaroslav Markin | 2008-12-28 | 5 | -1/+72 |
|/ / | | | | | | | | | | | like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed] | Yaroslav Markin | 2008-12-27 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | ActiveRecord::Base#new_record? now returns false for existing records (was ↵ | Yaroslav Markin | 2008-12-27 | 3 | -2/+9 |
|/ | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Preload uses exclusive scope [#643 state:resolved] | Frederick Cheung | 2008-12-26 | 5 | -16/+53 |
| | | | | | | | | | With self referential associations, the scope for the the top level should not affect fetching of associations, for example when doing Person.male.find :all, :include => :friends we should load all of the friends for each male, not just the male friends. | ||||
* | Association preloading no longer stops if it hits a nil object [#1630 ↵ | Pivotal Labs | 2008-12-26 | 2 | -2/+10 |
| | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | ActiveRecord::QueryCache middleware | Joshua Peek | 2008-12-22 | 2 | -14/+26 |
| | |||||
* | Ensure of Model#create support custom updated_at and updated_on attributes ↵ | Luis Hurtado | 2008-12-22 | 2 | -2/+12 |
| | | | | | | [#1612 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure Model#last doesn't affects order for another finders inside the same ↵ | Daniel Luz | 2008-12-21 | 2 | -3/+26 |
| | | | | | | scope [#1499 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix configure_dependency_for_has_many not quoting conditions properly [#1461 ↵ | Frederick Cheung | 2008-12-21 | 3 | -3/+17 |
| | | | | state:resolved] | ||||
* | Use explicit order to stop test failing randomly | Frederick Cheung | 2008-12-21 | 1 | -2/+2 |
| | |||||
* | Remove dead commented out code [#1467 state:resolved] | Yaroslav Markin | 2008-12-21 | 1 | -1/+0 |
| | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | Fix has many through not quoting table names [#1163 state:resolved] | Karthik Krishnan | 2008-12-20 | 3 | -4/+8 |
| | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | Add missing fixture to allow reload models test to run isolated [#1609 ↵ | Emilio Tagua | 2008-12-20 | 1 | -1/+3 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge docrails | Pratik Naik | 2008-12-19 | 5 | -11/+13 |
| | |||||
* | Add repair_helper.rb file I forgot in previous commit 8a92cd | Pratik Naik | 2008-12-19 | 1 | -0/+50 |
| | |||||
* | Add a repair_helper to repair changes to the validations inside ↵ | Murray Steele | 2008-12-19 | 2 | -160/+195 |
| | | | | | | | | | | | | | | validations_test.rb [#674 state:resolved] Many of the tests in validations_test would add a new validation to models. However, only Topic was being reset with a fairly aggressive clearing of all validations. None of the other models being used however were recieving the same treatment. Now we use repair_validations(Topic) for the whole test case because most test cases use Topic and then the block form of repair_validations(<other_models>) inside any tests that use other models. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix preloading of has_one :through associations on belongs_to [#1507 ↵ | Matt Jones | 2008-12-18 | 9 | -6/+52 |
| | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | Free MySQL::Result objects after a call to execute [#1416 state:resolved] | Manfred Stienstra | 2008-12-18 | 1 | -4/+13 |
| | | | | | | | | No freeing Result objects causes the MySQL driver to free result sets at undefined times, this can lead to erratic performance in your application. Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | Don't include table_name twice | Frederick Cheung | 2008-12-18 | 1 | -1/+1 |
| | |||||
* | Ensure :include checks joins when determining if it can preload [#528 ↵ | Frederick Cheung | 2008-12-18 | 2 | -10/+98 |
| | | | | state:resolved] | ||||
* | Add missing model files so tests can run isolated [#1506 state:resolved] | Emilio Tagua | 2008-12-18 | 1 | -0/+3 |
| | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
* | Fix preloading of belongs_to with null foreign key generating useless query ↵ | Frederick Cheung | 2008-12-18 | 2 | -1/+3 |
| | | | | [#1027 state:resolved] | ||||
* | Make exceptions raise from find_by_foo! have a more helpful message [#1567 ↵ | Frederick Cheung | 2008-12-18 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Update documentation for default_scope | Daniel Luz | 2008-12-16 | 1 | -2/+2 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | normalize author names in changelogs [#1495 state:committed] | Xavier Noria | 2008-12-16 | 1 | -392/+392 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Switch to Rack based session stores. | Joshua Peek | 2008-12-15 | 2 | -0/+320 |
| | |||||
* | Require mocha >= 0.9.3, older versions don't work anymore [#1579 state:resolved] | Hongli Lai (Phusion) | 2008-12-15 | 1 | -0/+1 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Don't use the transaction instance method so that people with ↵ | Frederick Cheung | 2008-12-10 | 1 | -2/+2 |
| | | | | | | | | has_one/belongs_to :transaction aren't fubared [#1551 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-10 | 2 | -7/+23 |
|\ | |||||
| * | Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵ | Bruce Krysiak | 2008-12-10 | 2 | -7/+23 |
| | | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Revert "Fix: counter_cache should decrement on deleting associated records." | Jeremy Kemper | 2008-12-10 | 3 | -37/+0 |
|/ | | | | | | [#1196 state:open] This reverts commit 05f2183747c8e75c9e8bbaadb9573b4bdf41ecfc. | ||||
* | Fix test names collision. | Emilio Tagua | 2008-12-10 | 1 | -4/+4 |
| | | | | | | [#1549 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add ActiveRecord::VERSION autoload | Jeremy Kemper | 2008-12-10 | 1 | -0/+2 |
| | |||||
* | Fix: counter_cache should decrement on deleting associated records. | Emilio Tagua | 2008-12-10 | 3 | -0/+37 |
| | | | | | | [#1195 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Rework ActiveSupport::OrderedHash to make lookups faster | Frederick Cheung | 2008-12-10 | 1 | -2/+3 |
| | | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 2 | -7/+7 |
| | |||||
* | Changelog entry for #1294 | Jeremy Kemper | 2008-12-08 | 1 | -0/+2 |
| | |||||
* | Make word separator in AR validation error messages configurable. | Akira Matsuda | 2008-12-08 | 1 | -1/+1 |
| | | | | | | [#1294 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Change field_changed? method to handle the case where a nullable integer ↵ | Ben Symonds | 2008-12-08 | 2 | -2/+14 |
| | | | | | | | | column is changed from 0 to '0' [#1530 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge with docrails | Pratik Naik | 2008-12-07 | 6 | -28/+67 |
| | |||||
* | Make NoMethodError message more descriptive when an undefined message has ↵ | Mike Ferrier | 2008-12-04 | 1 | -1/+4 |
| | | | | | | been sent to an association [#1515 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> |