Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1929 from sobrinho/master | Santiago Pastorino | 2011-07-11 | 1 | -0/+14 |
|\ | | | | | Create a test case for disable_referential_integrity | ||||
| * | Create a test case for disable_referential_integrity | Gabriel Sobrinho | 2011-07-01 | 1 | -0/+14 |
| | | |||||
* | | Merge pull request #1823 from gnarg/master | Santiago Pastorino | 2011-07-10 | 2 | -2/+10 |
|\ \ | | | | | | | Log instrumentation name for exists? queries | ||||
| * | | Log instrumentation name for exists? queries | Jon Guymon | 2011-06-22 | 2 | -2/+10 |
| | | | |||||
* | | | to_key on a destroyed model should return nil | Santiago Pastorino | 2011-07-09 | 2 | -2/+2 |
| | | | |||||
* | | | formats | Akira Matsuda | 2011-07-09 | 1 | -5/+5 |
| | | | |||||
* | | | fix AR having() not to raise NoMethodError when the given argument does not ↵ | Akira Matsuda | 2011-07-09 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | respond to empty? having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs | ||||
* | | | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as ↵ | Jon Leighton | 2011-07-09 | 2 | -1/+19 |
| | | | | | | | | | | | | a join. Related: #1873. | ||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-09 | 4 | -30/+30 |
|\ \ \ | |||||
| * | | | :conditions => where | Akira Matsuda | 2011-07-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | :joins => joins | Akira Matsuda | 2011-07-08 | 1 | -12/+12 |
| | | | | |||||
| * | | | :include => includes | Akira Matsuda | 2011-07-08 | 1 | -7/+7 |
| | | | | |||||
| * | | | find(:first) => first | Akira Matsuda | 2011-07-08 | 2 | -6/+6 |
| | | | | |||||
| * | | | find(:all) => all | Akira Matsuda | 2011-07-08 | 3 | -22/+22 |
| | | | | |||||
* | | | | Merge pull request #2017 from Casecommons/active_record_lint | José Valim | 2011-07-08 | 2 | -0/+12 |
|\ \ \ \ | | | | | | | | | | | ActiveRecord::Base subclasses should pass ActiveModel::Lint. | ||||
| * | | | | ActiveRecord::Base should pass ActiveModel::Lint. | Grant Hutchins & Peter Jaros | 2011-07-08 | 2 | -0/+12 |
| | | | | | |||||
* | | | | | Destroy association habtm record before destroying the record itself. Fixes ↵ | Tomas D'Stefano | 2011-07-08 | 4 | -12/+29 |
| | | | | | | | | | | | | | | | | | | | | issue #402. | ||||
* | | | | | Ensure that the foreign key gets set when doing record.create_association or ↵ | Jon Leighton | 2011-07-08 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | record.create_association. Fixes #1960. | ||||
* | | | | | Refactor PostgreSQLAdapter a bit | Daniel Schierbeck | 2011-07-08 | 2 | -18/+20 |
|/ / / / | | | | | | | | | | | | | | | | | Move the private method #extract_schema_and_table into a separate Utils module so that it can be tested without resorting to #send. | ||||
* | | | | Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II) | Akira Matsuda | 2011-07-08 | 1 | -3/+1 |
| | | | | |||||
* | | | | Use Enumerable#with_index. We're on Ruby > 1.8.7 | Akira Matsuda | 2011-07-08 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #1997 from knapo/master | Santiago Pastorino | 2011-07-07 | 2 | -2/+7 |
|\ \ \ \ | | | | | | | | | | | Make `ActiveRecord::Batches#find_each` to not return `self`. | ||||
| * | | | | Make `ActiveRecord::Batches#find_each` to not return `self`. | knapo | 2011-07-07 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`. | ||||
* | | | | | Add require ActiveSupport delegation to ActiveRecord::Relation class. | Dmitriy Kiriyenko | 2011-07-07 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1120 from lysenko/collection_singular_ids | Santiago Pastorino | 2011-07-06 | 2 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | collection_singular_ids ignores association :include option | ||||
| * | | | | Fix bug in collection_singular_ids on has many through association with ↵ | Anatoliy Lysenko | 2011-07-06 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions and includes, when condtions references tables from includes. Test fail because of invalid sql: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id: SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id" WHERE "readers"."person_id" = 1 AND (comments.id is null) Bug described in github#925 This commit will revert fix from https://github.com/rails/rails/commit/3436fdfc12d58925e3d981e0afa61084ea34736c , but tests is ok. Bug described in #6569 ticket. | ||||
* | | | | | Merge pull request #1989 from simonbaird/master | Santiago Pastorino | 2011-07-06 | 1 | -5/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | rake db:test:purge creates mysql database with wrong charset & collation (master branch) | ||||
| * | | | | | Fix charset/collate in mysql recreate_database | Simon Baird | 2011-07-07 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See new method mysql_creation_options. It is used by both create_database and recreate_database so they are consistent. (Cherry pick of 3ba3125b24b532876c95c8d9d00c9b69faab5a60) | ||||
* | | | | | | Don't construct association scope in initializer. This yields a big ↵ | Jon Leighton | 2011-07-07 | 2 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873. | ||||
* | | | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW. | Ernie Miller | 2011-07-06 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1273 from jeremyf/feature-association-proxy-send | Santiago Pastorino | 2011-07-06 | 3 | -1/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handl | ||||
| * | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ↵ | Jeremy Friesen | 2011-05-24 | 3 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | of dynamic finder methods and the passing of the &block parameter for :find_by_attributes. | ||||
* | | | | | | Merge pull request #1494 from anildigital/master | Santiago Pastorino | 2011-07-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix failing test because of Timezone difference. | ||||
| * | | | | | | Fix failing test because of Timezone difference. | Anil Wadghule | 2011-06-05 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1979 from bogdan/association_sum_array_compatibility | Jon Leighton | 2011-07-06 | 2 | -2/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sum | ||||
| * | | | | | | | Fixed AR::Relation#sum compatibility with Array#sum | Bogdan Gusiev | 2011-07-05 | 2 | -2/+10 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | In order make Relation behavior closer to Array Made Relation#sum to accept block and delegate it to Array#sum | ||||
* | | | | | | | Merge pull request #1968 from bogdan/associations_find_array_compatibility2 | Santiago Pastorino | 2011-07-05 | 2 | -3/+11 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fixed CollectionAssociation#find to be compatible with Array#find | ||||
| * | | | | | | Fixed CollectionAssociation#find to be compatible with Array#find | Bogdan Gusiev | 2011-07-05 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make CollectionAssociation behave closer to Array Add the ability to pass block to #find method just like Array#find does. | ||||
* | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-05 | 2 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "fix a typo" | Vijay Dev | 2011-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: Changelogs are not to be changed in docrails. This reverts commit 0b8cdc16e0b7c3404a0e3470b580235023c53542. | ||||
| * | | | | | | | fix a typo | Ray Baxter | 2011-07-01 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | minor changes | Vijay Dev | 2011-06-27 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | replace find(all) with all | Vijay Dev | 2011-06-26 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | fix typo in method name | Vijay Dev | 2011-06-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Revert "add missing methods supported by reversible migrations using the ↵ | Vijay Dev | 2011-06-25 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change method" This reverts commit 7f91eebae361f2f3a1558f6d899b372524509a2d. Reason: Incorrect documenting. The newly added methods to the list are not actually supported by reversible migrations. | ||||
| * | | | | | | | add missing methods supported by reversible migrations using the change method | Vijay Dev | 2011-06-24 | 1 | -1/+4 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Only call set_owner_attributes for has_one association if target exists. | Dieter Komendera | 2011-07-04 | 2 | -1/+12 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Use an instance variable to store the current masss assignment options | Andrew White | 2011-07-04 | 2 | -13/+18 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Reversing the changes done in c278a2c while still resolving #1857. | Vijay Dev | 2011-07-02 | 2 | -14/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes broke bulk migration tests and were fixed in 4d256bc6; however that brought back the issue of #1857 and so this commit goes back to the original scenario and just adds change_table to the list of methods which are to be recorded in the CommandRecorder. The method_missing now delegates all calls to the underlying connection as before. | ||||
* | | | | | a few minor performance improvements: fewer strings, fewer range objects, ↵ | Aaron Patterson | 2011-07-01 | 2 | -22/+13 |
| | | | | | | | | | | | | | | | | | | | | fewer method calls |