Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added an alias for new to build to the AR collection proxy, this corrects an ↵ | Josh Kalderimis | 2011-06-01 | 4 | -10/+27 |
| | | | | issue where the collection proxies were not consistent | ||||
* | Revert "[activerecord][postgresql] verify if table has a schema(not ↵ | Jon Leighton | 2011-05-31 | 1 | -5/+6 |
| | | | | | | public)". This caused a test breakage. See #1410 for details. This reverts commit c44418ea4e09cc81da47edbc9ac5f31c7e32c1b4. | ||||
* | Ensure that calculations properly override the select value even if it's set ↵ | Jon Leighton | 2011-05-31 | 2 | -2/+7 |
| | | | | in the default scope. Fixes #1395. | ||||
* | Failing test for aggregating on default_scope with select | Erik Fonselius | 2011-05-31 | 2 | -0/+9 |
| | |||||
* | Only save the record once when calling create! on a collection association. ↵ | Jon Leighton | 2011-05-31 | 4 | -25/+45 |
| | | | | Fixes #1360. | ||||
* | Tests for issue #1360 | Farley Knight | 2011-05-31 | 2 | -0/+24 |
| | |||||
* | Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted ↵ | Jon Leighton | 2011-05-31 | 1 | -8/+5 |
| | | | | the branch so I cannot just merge it. | ||||
* | Reduce test noise | Jon Leighton | 2011-05-31 | 1 | -20/+14 |
| | |||||
* | Opening class CascadedEagerLoadingTest at once. | Arun Agrawal | 2011-05-31 | 1 | -7/+3 |
| | |||||
* | Adding comment to work with 1.8.7. Nested Attribute fix. | Arun Agrawal | 2011-05-31 | 1 | -0/+3 |
| | |||||
* | Fix nested attribute for memory record. | Arun Agrawal | 2011-05-31 | 1 | -1/+5 |
| | |||||
* | Merge pull request #1410 from lucasts/pg_schema | Aaron Patterson | 2011-05-30 | 1 | -5/+11 |
|\ | | | | | a little step to better postgresql schema support in rails | ||||
| * | [activerecord][postgresql] verify if table has a schema(not public) | Lucas Stephanou | 2011-05-27 | 1 | -6/+5 |
| | | |||||
| * | find sequences with pg schemas properly | Lucas Stephanou | 2011-05-27 | 1 | -4/+11 |
| | | |||||
* | | Corrected some typos and American vs. Queen's English issues | Lee Reilly | 2011-05-29 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #1384 from amatsuda/simplify_drop_table | Aaron Patterson | 2011-05-28 | 3 | -10/+2 |
|\ \ | | | | | | | Remove unused options from drop_table | ||||
| * | | No need to pass options which is never used | Akira Matsuda | 2011-05-29 | 1 | -2/+2 |
| | | | |||||
| * | | No need to override for just calling super | Akira Matsuda | 2011-05-29 | 2 | -8/+0 |
| | | | |||||
* | | | Use change in place of up and down in sessions table migration | Vijay Dev | 2011-05-28 | 1 | -5/+1 |
|/ / | |||||
* | | Disable IdentityMap by default for ActiveRecord testing | Akira Matsuda | 2011-05-28 | 1 | -2/+2 |
| | | | | | | | | because enabling IM by default will possibly hide some bugs on 3.1 default behavior | ||||
* | | stop using boolean expressions because of the side effects | Aaron Patterson | 2011-05-27 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #1365 from gnufied/sqlite3 | Aaron Patterson | 2011-05-27 | 2 | -2/+2 |
|\ \ | | | | | | | close statment only if its not closed | ||||
| * | | delegate connection and column_hash calls directly to model | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | close statment only if its not closed | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1229 from workmad3/master | Aaron Patterson | 2011-05-27 | 2 | -2/+16 |
|\ \ \ | |/ / |/| | | Fix for Issue #1205 | ||||
| * | | Added a test to check for correct behaviour with no options in add_index ↵ | David Workman | 2011-05-24 | 1 | -0/+6 |
| | | | | | | | | | | | | command recorder | ||||
| * | | Using .try to test for the existence of a method option in a nil-resistent ↵ | David Workman | 2011-05-23 | 1 | -5/+2 |
| | | | | | | | | | | | | manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat | ||||
| * | | Neatened up the invert_add_index method as per suggeston | David Workman | 2011-05-23 | 1 | -2/+3 |
| | | | |||||
| * | | Simple fix for correctly inverting an add_index migration when a name has ↵ | David Workman | 2011-05-23 | 2 | -2/+12 |
| | | | | | | | | | | | | been provided | ||||
* | | | work around bug in the sqlite3 bindings. fixes #1289 | Aaron Patterson | 2011-05-27 | 1 | -0/+1 |
| | | | |||||
* | | | fixing test for mysql2 | Aaron Patterson | 2011-05-27 | 1 | -5/+2 |
| |/ |/| | |||||
* | | adding a test for #1322 | Aaron Patterson | 2011-05-26 | 1 | -0/+15 |
| | | |||||
* | | Merge pull request #1323 from fx/association_primary_key | Jon Leighton | 2011-05-26 | 2 | -1/+11 |
|\ \ | | | | | | | use association_primary_key in AssociationScope#add_constraints | ||||
| * | | added assertion for non-standard primary_key on models used in the ↵ | Marian Rudzynski | 2011-05-26 | 1 | -0/+3 |
| | | | | | | | | | | | | primary_key test | ||||
| * | | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 2 | -1/+8 |
| | | | |||||
* | | | Merge pull request #1318 from TheEmpty/master | Jon Leighton | 2011-05-26 | 3 | -19/+0 |
|\ \ \ | | | | | | | | | Resolve issue #534 | ||||
| * | | | Removes a now needless test - via Github | Mohammad Typaldos | 2011-05-26 | 1 | -8/+0 |
| | | | | |||||
| * | | | Removes the restriction on primary key when joining in a habtm && test that ↵ | Mohammad El-Abid | 2011-05-26 | 3 | -15/+4 |
| |/ / | | | | | | | | | | it was properly removed | ||||
* | | | Don't merge base opts into includes when serializing ARs | John Mileham | 2011-05-26 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/serialization.rb | ||||
* | | | Failing test - JSON serialization shouldn't merge base opts into include opts. | John Mileham | 2011-05-26 | 1 | -0/+9 |
|/ / | |||||
* | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-05-25 | 12 | -162/+4 |
|\ \ | |||||
| * \ | Merge pull request #1285 from joshk/remove_active_record_deprecations | Aaron Patterson | 2011-05-25 | 12 | -162/+4 |
| |\ \ | | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord | ||||
| | * | | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 12 | -162/+4 |
| | | | | |||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 29 | -83/+87 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| * | | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme ↵ | Karunakar (Ruby) | 2011-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | files | ||||
| * | | | Remove extra white spaces on ActiveRecord docs. | Sebastian Martinez | 2011-05-23 | 25 | -51/+51 |
| | | | | |||||
| * | | | has_many :dependent => :restrict raises an exception but is not documented ↵ | Aditya Sanghi | 2011-05-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | appropriately. has_one also has :dependent => :restrict but is not documented at all. | ||||
| * | | | Add more doc to #update_column. | Sebastian Martinez | 2011-05-20 | 1 | -0/+2 |
| | | | | |||||
| * | | | Changing examples: use 'each' instead of 'for in' | Guillermo Iguaran | 2011-05-19 | 1 | -4/+4 |
| | | | | |||||
| * | | | Remove extra white-spaces. | Sebastian Martinez | 2011-05-19 | 1 | -24/+24 |
| | | | |