Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure engine migrations are copied in the same sequence that they are required. | Brian Quinn | 2011-06-10 | 1 | -1/+1 |
| | |||||
* | don't reinitialize the arel_table unless the table_name changes | Damien Mathieu | 2011-06-09 | 1 | -1/+2 |
| | |||||
* | Merge pull request #1591 from smartinez87/unused | José Valim | 2011-06-08 | 1 | -1/+1 |
|\ | | | | | Fix "warning: assigned but unused variable" on AR tests | ||||
| * | Remove unused 'quoted_column_names' variable. | Sebastian Martinez | 2011-06-08 | 1 | -1/+1 |
| | | |||||
* | | No need to create a new Arel::Table, as the arel_table method already ↵ | Rodrigo Navarro | 2011-06-08 | 1 | -1/+0 |
|/ | | | | creates a new one | ||||
* | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 2 | -2/+2 |
| | |||||
* | Allow polymorphic has_one to work when the association is set before the ↵ | Jon Leighton | 2011-06-08 | 1 | -3/+1 |
| | | | | owner has been saved. Fixes #1524. | ||||
* | When you add a record to a polymorphic has_one, you should be able to access ↵ | Jon Leighton | 2011-06-08 | 2 | -2/+2 |
| | | | | the owner from the associated record | ||||
* | Do not use default_scope in ActiveRecord::Persistence#touch. | Dmitriy Kiriyenko | 2011-06-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 5 | -13/+13 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | comment the recorder methods | Vijay Dev | 2011-06-07 | 1 | -3/+3 |
| | | |||||
| * | up and down are no longer class methods in a migration | Vijay Dev | 2011-06-07 | 1 | -1/+1 |
| | | |||||
| * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 1 | -1/+1 |
| | | |||||
| * | styling changes | Vijay Dev | 2011-06-02 | 1 | -3/+3 |
| | | |||||
| * | Edited activerecord/lib/active_record/transactions.rb via GitHub | Ayose | 2011-06-01 | 1 | -1/+1 |
| | | |||||
| * | The URL http://dev.mysql.com/doc/refman/5.0/en/savepoints.html is no longer ↵ | Ayose | 2011-06-01 | 1 | -1/+1 |
| | | | | | | | | available | ||||
| * | Fix font styling on associations.rb | Sebastian Martinez | 2011-05-26 | 1 | -4/+4 |
| | | |||||
* | | Don't double assign attributes - closes #1467. | Andrew White | 2011-06-03 | 1 | -1/+0 |
| | | |||||
* | | Fix issue #1272 | Brian Mathiyakom | 2011-06-01 | 2 | -9/+8 |
| | | | | | | | | | | Set reverse_order_value when asked to reverse_order(). Do the actual reversal in build_arel. | ||||
* | | Raise NameError instead of ArgumentError in ActiveSupport::Dependencies | Andrew White | 2011-06-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. Closes #1423 | ||||
* | | added an alias for new to build to the AR collection proxy, this corrects an ↵ | Josh Kalderimis | 2011-06-01 | 2 | -10/+2 |
| | | | | | | | | 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 | 1 | -2/+2 |
| | | | | | | | | in the default scope. Fixes #1395. | ||||
* | | Only save the record once when calling create! on a collection association. ↵ | Jon Leighton | 2011-05-31 | 4 | -25/+45 |
| | | | | | | | | Fixes #1360. | ||||
* | | 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. | ||||
* | | 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 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | 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 | 1 | -2/+4 |
|\ \ \ \ | |/ / / |/| | | | Fix for Issue #1205 | ||||
| * | | | 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 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | been provided | ||||
* | | | | work around bug in the sqlite3 bindings. fixes #1289 | Aaron Patterson | 2011-05-27 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1323 from fx/association_primary_key | Jon Leighton | 2011-05-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | use association_primary_key in AssociationScope#add_constraints | ||||
| * | | | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1318 from TheEmpty/master | Jon Leighton | 2011-05-26 | 2 | -10/+0 |
|\ \ \ | | | | | | | | | Resolve issue #534 | ||||
| * | | | Removes the restriction on primary key when joining in a habtm && test that ↵ | Mohammad El-Abid | 2011-05-26 | 2 | -10/+0 |
| |/ / | | | | | | | | | | 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 | ||||
* | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-05-25 | 8 | -127/+4 |
|\ \ | |||||
| * \ | Merge pull request #1285 from joshk/remove_active_record_deprecations | Aaron Patterson | 2011-05-25 | 8 | -127/+4 |
| |\ \ | | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord | ||||
| | * | | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 8 | -127/+4 |
| | | | |