Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4828 from railsaholic/fix_error_message | José Valim | 2012-02-01 | 4 | -4/+7 |
|\ | | | | | fix has_one, has_many restrict error message | ||||
| * | fix has_one, has_many restrict error message | Manoj | 2012-02-01 | 4 | -4/+7 |
| | | |||||
* | | Merge pull request #4806 from KL-7/do-not-serialize-nil | Aaron Patterson | 2012-02-01 | 2 | -2/+15 |
|\ \ | | | | | | | Do not serialize nil in serialized attribute. | ||||
| * | | Do not serialize nil in serialized attribute. | Kirill Lashuk | 2012-01-31 | 2 | -2/+15 |
| | | | |||||
* | | | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-01 | 3 | -17/+3 |
|\ \ \ | |_|/ |/| | | Fix for SQLite binary data corrupter (to master branch) | ||||
| * | | Fixed issue with SQLite adapter corrupting binary data | Chris Feist | 2012-01-31 | 1 | -16/+1 |
| | | | |||||
| * | | Added test to illustrate bad binary blobs. | Chris Feist | 2012-01-31 | 2 | -1/+2 |
| | | | |||||
* | | | document the AR none method [ci skip] | Vijay Dev | 2012-02-01 | 1 | -7/+7 |
| | | | |||||
* | | | fix a typo [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-01 | 1 | -4/+6 |
|\ \ \ | |||||
| * | | | Improve readonly examples and optimistic locking docs | Carlos Antonio da Silva | 2012-01-31 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Relation#order can receive order attributes as different arguments, add example; * Readonly does not handle deletion of records, only modification; * locking_version column does not need to default to 0, Rails handles nil values; * Change references from "set_locking_column" to "self.locking_column". | ||||
* | | | | Merge pull request #4799 from arunagw/warning_fixed_for_indentations | Aaron Patterson | 2012-01-31 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | warning removed: mismatched indentations | ||||
| * | | | warning removed: mismatched indentations | Arun Agrawal | 2012-01-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "Merge pull request #4746 from jenslukowski/issue4718" | Aaron Patterson | 2012-01-31 | 2 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68. | ||||
* | | | | Merge pull request #4805 from xuanxu/none_and_null_object_pattern | Jon Leighton | 2012-01-31 | 6 | -1/+71 |
|\ \ \ \ | |_|_|/ |/| | | | Added `none` query method to return zero records. | ||||
| * | | | Added `none` query method to return zero records. | Juanjo Bazán | 2012-01-31 | 6 | -1/+71 |
| | | | | | | | | | | | | And added NullRelation class implementing the null object pattern for the `Relation` class. | ||||
* | | | | QueryCache will just dup an AR::Result, AR::Result can deep copy | Aaron Patterson | 2012-01-31 | 2 | -9/+21 |
| | | | | |||||
* | | | | always return the result set from select_all | Aaron Patterson | 2012-01-31 | 2 | -2/+2 |
| | | | | |||||
* | | | | made the result set object act more like an array | Aaron Patterson | 2012-01-31 | 5 | -4/+24 |
| | | | | |||||
* | | | | Merge pull request #4742 from petervandenabeele/master | Aaron Patterson | 2012-01-31 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Set the timezone correctly for a test in activerecord/../base_test.rb | ||||
| * | | | | Set default_timezone explicitly for a test in activerecord/../base_test.rb | Peter Vandenabeele | 2012-01-29 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge pull request #4746 from jenslukowski/issue4718 | Aaron Patterson | 2012-01-31 | 2 | -1/+16 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Test and fix for issue 4718 | ||||
| * | | | | fix for Issue 4718 | Jens Lukowski | 2012-01-29 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | failing test case for Issue 4718 | Jens Lukowski | 2012-01-28 | 1 | -0/+8 |
| |/ / / | |||||
* | | | | Merge pull request #4791 from gregolsen/reflection_test_fixed | José Valim | 2012-01-31 | 3 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | reflection test fixed | ||||
| * | | | | test_get_ids_for_ordered_association fixed | gregolsen | 2012-01-31 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | reflection test fixed | gregolsen | 2012-01-31 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Remove deprecation warnings from tests | Rafael Mendonça França | 2012-01-31 | 3 | -13/+28 |
| | | | | |||||
* | | | | Put spaces between the words at deprecation warning | Rafael Mendonça França | 2012-01-31 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 3 | -1/+6 |
|\ \ \ | | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL) | ||||
| * | | | ids_reader method fixed, test added to has_many association | gregolsen | 2012-01-31 | 3 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error | Jon Leighton | 2012-01-31 | 9 | -35/+147 |
|\ \ \ \ | | | | | | | | | | | has_many/has_one, :dependent => :restrict, deprecation added | ||||
| * | | | | suggested fixes for :dependent => :restrict deprecation. | Manoj | 2012-01-31 | 5 | -36/+16 |
| | | | | | |||||
| * | | | | Same method for has_many and has_one associations | Paco Guzman | 2012-01-31 | 3 | -30/+17 |
| | | | | | |||||
| * | | | | Easy dependent_restrict error message | Paco Guzman | 2012-01-31 | 2 | -4/+2 |
| | | | | | |||||
| * | | | | has_many/has_one, :dependent => :restrict, deprecation added. | Manoj | 2012-01-29 | 9 | -21/+168 |
| | |/ / | |/| | | |||||
* | | | | warning removed: shadowing outer local variable - klass | Arun Agrawal | 2012-01-31 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #4763 from kennyj/fix_4754 | Jon Leighton | 2012-01-31 | 2 | -1/+17 |
|\ \ \ | | | | | | | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES | ||||
| * | | | Fix GH #4754. Remove double-quote when using ANSI_QUOTES | kennyj | 2012-01-31 | 2 | -1/+17 |
| | | | | |||||
* | | | | Merge pull request #4732 from pwim/refactor-dynamic-match | Jon Leighton | 2012-01-30 | 3 | -28/+60 |
|\ \ \ \ | | | | | | | | | | | Refactor dynamic match | ||||
| * | | | | Use conditional instead of try | Paul McMahon | 2012-01-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Decouple finding matching class from instantiation | Paul McMahon | 2012-01-29 | 1 | -22/+29 |
| | | | | | |||||
| * | | | | Move argument validation into match | Paul McMahon | 2012-01-28 | 3 | -1/+13 |
| | | | | | |||||
| * | | | | Extract different DynamicFinderMatch subclasses | Paul McMahon | 2012-01-28 | 1 | -26/+39 |
| | |/ / | |/| | | |||||
* | | | | query cache instrumentation should included the bindings in the payload ↵ | Xavier Noria | 2012-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [closes #4750] | ||||
* | | | | rewrites a couple of alternations in regexps as character classes | Xavier Noria | 2012-01-30 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters. | ||||
* | | | Use block form of 'File.open' so that File object is auto closed at end | Nathan Broadbent | 2012-01-30 | 1 | -7/+7 |
| | | | |||||
* | | | Replaced all 'for' loops with Enumerable#each | Nathan Broadbent | 2012-01-30 | 4 | -6/+6 |
| | | | |||||
* | | | Remove initialize variable columnn, not needed | Paco Guzman | 2012-01-29 | 1 | -2/+1 |
|/ / | |||||
* | | Add `create_join_table` migration helper to create HABTM join tables | Rafael Mendonça França | 2012-01-27 | 7 | -5/+164 |
| | |