Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | attributes should be constructed with table objects | Aaron Patterson | 2010-09-07 | 1 | -1/+1 |
| | |||||
* | attributes should be associated with tables | Aaron Patterson | 2010-09-07 | 1 | -1/+1 |
| | |||||
* | serialized attributes should be serialized before validation [#5525 ↵ | Aaron Patterson | 2010-09-07 | 2 | -2/+7 |
| | | | | state:resolved] | ||||
* | no need to freeze this string | Aaron Patterson | 2010-09-07 | 1 | -1/+1 |
| | |||||
* | fixed some issues with JSON encoding | Jakub Suder | 2010-09-07 | 2 | -2/+4 |
| | | | | | | | | | | | - as_json in ActiveModel should return a hash and handle :only/:except/:methods options - Array and Hash should call as_json on their elements - json methods should not modify options argument [#5374 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | removing useless code, cleaning variable names | Aaron Patterson | 2010-09-07 | 1 | -6/+2 |
| | |||||
* | select should raise error when no block or no parameter is passed | Aaron Patterson | 2010-09-07 | 1 | -3/+3 |
| | |||||
* | select does not need a *args | Aaron Patterson | 2010-09-07 | 1 | -2/+2 |
| | |||||
* | unscoped has nothing so merging with a relation just returns the relation | Santiago Pastorino | 2010-09-07 | 1 | -1/+1 |
| | |||||
* | cleaning up confusing logic | Aaron Patterson | 2010-09-06 | 1 | -3/+6 |
| | |||||
* | Use railties:copy_migrations instead of db:copy_migrations | Piotr Sarnacki | 2010-09-06 | 1 | -1/+5 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Refactor AR validations a bit | Carlos Antonio da Silva | 2010-09-06 | 1 | -5/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Cleanup deprecation warnings in active record | Carlos Antonio da Silva | 2010-09-06 | 4 | -56/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Improved indentation | Pratik Naik | 2010-09-06 | 1 | -7/+3 |
| | |||||
* | Use scoped here to get the scoped where | Santiago Pastorino | 2010-09-05 | 1 | -5/+3 |
| | |||||
* | Make scoped reorder override previous applied orders | Santiago Pastorino | 2010-09-05 | 2 | -3/+15 |
| | | | | [5528 state:committed] | ||||
* | order should always be concatenated. | Neeraj Singh | 2010-09-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | order that is declared first has highest priority in all cases. Here are some examples. Car.order('name desc').find(:first, :order => 'id').name Car.named_scope_with_order.named_scope_with_another_order Car.order('id DESC').scoping do Car.find(:first, :order => 'id asc') end No special treatment to with_scope or scoping. Also note that if default_scope declares an order then the order declared in default_scope has the highest priority unless with_exclusive_scope is used. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fix copying migrations to empty directory | Piotr Sarnacki | 2010-09-03 | 1 | -1/+1 |
| | |||||
* | rake db:copy_migrations task, which copies railties migrations into ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -0/+22 |
| | | | | application's db/migrate directory | ||||
* | Implemented ActiveRecord::Migrations#copy based on James Adam's idea | Piotr Sarnacki | 2010-09-03 | 2 | -25/+67 |
| | | | | | | | | | | | | | | | ActiveRecord::Migration#copy allows to copy migrations from one place to another, changing migrations versions and adding scope to filename. For example: ActiveRecord::Migration.copy("db/migrate", :blog_engine => "vendor/gems/blog/db/migrate") will copy all migrations from vendor/gems/blog/db/migrate to db/migrate with such format: Versions of copied migrations will be reversioned to be appended after migrations that already exists in db/migrate | ||||
* | Added Rails.application.config.paths.db.migrate to remove hardcoded ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -10/+13 |
| | | | | db/migrate paths | ||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-09-03 | 5 | -23/+23 |
|\ | |||||
| * | Use new finders syntax in docs. | Emilio Tagua | 2010-09-01 | 5 | -23/+23 |
| | | |||||
* | | Revert "Setup explicit requires for files with exceptions. Removed them from ↵ | José Valim | 2010-09-02 | 4 | -5/+0 |
| | | | | | | | | | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6. | ||||
* | | Setup explicit requires for files with exceptions. Removed them from ↵ | Łukasz Strzałkowski | 2010-09-02 | 4 | -0/+5 |
| | | | | | | | | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Reset default scope in Thread.current when class is unloaded [#5497 ↵ | Andrew White | 2010-09-01 | 1 | -0/+8 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | split out active_record migration logic so others can easily reuse [#5389 ↵ | Jack Dempsey | 2010-09-01 | 2 | -10/+17 |
|/ | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make all the Relation finder methods consistent | Pratik Naik | 2010-08-31 | 1 | -32/+67 |
| | |||||
* | Merge remote branch 'miloops/rails_master_fixes' | Pratik Naik | 2010-08-31 | 1 | -15/+26 |
|\ | |||||
| * | Avoid calling build_where is no argument is given. | Emilio Tagua | 2010-08-31 | 1 | -1/+1 |
| | | |||||
| * | Improved conditionals usage to prevent calling methods. | Emilio Tagua | 2010-08-31 | 1 | -8/+19 |
| | | |||||
| * | Don't test conditional in iteration if it is not present just clone it. | Emilio Tagua | 2010-08-31 | 1 | -9/+9 |
| | | |||||
* | | Remove default values for Relation#limit/offset/from/create_with | Pratik Naik | 2010-08-31 | 1 | -4/+4 |
| | | |||||
* | | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 1 | -7/+10 |
|/ | |||||
* | replacing superclass_delegating_accessor with class_attribute | Neeraj Singh | 2010-08-31 | 1 | -6/+6 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Replacing superclass_delegating_accessoror with class_attribute. | Neeraj Singh | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | :store_full_sti_class will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Replacing superclass_delegating_accessoror with class_attribute. | Neeraj Singh | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | :partial_attributes will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | resolves merge conflict | Xavier Noria | 2010-08-31 | 1 | -3/+0 |
|\ | |||||
| * | The call-seq directive has no useful effect on our documentation and is not ↵ | Joost Baaij | 2010-08-28 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner. | ||||
* | | PERF: Avoid two method calls | Santiago Pastorino | 2010-08-28 | 1 | -1/+1 |
|/ | |||||
* | Fix em_mysql2 error in rake db:create | Sam Aarons | 2010-08-27 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | lifecycle should be two words, life cycle | Jaime Iniesta | 2010-08-26 | 3 | -4/+4 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-26 | 1 | -8/+6 |
|\ | |||||
| * | minor formatting fixes | Neeraj Singh | 2010-08-25 | 1 | -8/+6 |
| | | |||||
* | | Catch mysql2 access denied errors in rake db:create [#5432 state:resolved] | Andrew White | 2010-08-25 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | use blank? instead of present?, mark SQL literals as SQL literals | Aaron Patterson | 2010-08-25 | 1 | -5/+5 |
| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
* | | no need to send on a public method | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
| | | |||||
* | | refactor select { is_a? } to grep() | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
| | | |||||
* | | mark SQL literals as SQL literals | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
|/ | |||||
* | :nodoc:s #unscoped until its behavior is more clear, now sometimes works, ↵ | Xavier Noria | 2010-08-25 | 1 | -1/+1 |
| | | | | sometimes not |